[Scummvm-git-logs] scummvm master -> 10f1eab3c9f07390eb0e437948e4dfb3a927c93e

csnover csnover at users.noreply.github.com
Fri Jan 12 07:45:12 CET 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
10f1eab3c9 CRYO: Stop packing struct containing pointers


Commit: 10f1eab3c9f07390eb0e437948e4dfb3a927c93e
    https://github.com/scummvm/scummvm/commit/10f1eab3c9f07390eb0e437948e4dfb3a927c93e
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-01-12T00:44:48-06:00

Commit Message:
CRYO: Stop packing struct containing pointers

This struct packing causes the pointer-to-member-function to become
unaligned, and does not seem necessary in any way.

Closes gh-1081.

Changed paths:
    engines/cryo/eden.cpp


diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 78dd622..103d9fd 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -3126,13 +3126,11 @@ void EdenGame::tyranDies(perso_t *perso) {
 }
 
 void EdenGame::specialObjects(perso_t *perso, char objid) {
-#pragma pack(push, 1)
 	struct SpecialObject {
 		int8  _characterType;
 		int8  _objectId;
 		void  (EdenGame::*dispFct)(perso_t *perso);
 	};
-#pragma pack(pop)
 
 	static SpecialObject kSpecialObjectActions[] = {
 		//    persoType, objectId, dispFct





More information about the Scummvm-git-logs mailing list