[Scummvm-cvs-logs] SF.net SVN: scummvm:[40198] scummvm/trunk/engines/tinsel/scene.cpp
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Wed Apr 29 13:33:43 CEST 2009
Revision: 40198
http://scummvm.svn.sourceforge.net/scummvm/?rev=40198&view=rev
Author: dreammaster
Date: 2009-04-29 11:33:43 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
Fixed dword alignment warning (as reported by salty-horse)
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/scene.cpp
Modified: scummvm/trunk/engines/tinsel/scene.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/scene.cpp 2009-04-29 11:31:59 UTC (rev 40197)
+++ scummvm/trunk/engines/tinsel/scene.cpp 2009-04-29 11:33:43 UTC (rev 40198)
@@ -131,17 +131,17 @@
return (const SCENE_STRUC *)pStruc;
// Copy appropriate fields into tempStruc, and return a pointer to it
- const uint32 *p = (const uint32 *)pStruc;
+ const byte *p = pStruc;
memset(&tempStruc, sizeof(SCENE_STRUC), 0);
- tempStruc.numEntrance = *p++;
- tempStruc.numPoly = *p++;
- tempStruc.numTaggedActor = *p++;
- tempStruc.defRefer = *p++;
- tempStruc.hSceneScript = *p++;
- tempStruc.hEntrance = *p++;
- tempStruc.hPoly = *p++;
- tempStruc.hTaggedActor = *p++;
+ tempStruc.numEntrance = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.numPoly = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.numTaggedActor = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.defRefer = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.hSceneScript = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.hEntrance = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.hPoly = READ_UINT32(p); p += sizeof(uint32);
+ tempStruc.hTaggedActor = READ_UINT32(p); p += sizeof(uint32);
return &tempStruc;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list