aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2009-04-29 11:33:43 +0000
committerPaul Gilbert2009-04-29 11:33:43 +0000
commit7dbfb326cc0bf6fa8ba417e57ae5b7de1db0069c (patch)
treeac06cccdc3ab2265f782b964b25d0a5449a9f105
parent4f9ea1c920390bfe4e24012b5718a860cf4c3c03 (diff)
downloadscummvm-rg350-7dbfb326cc0bf6fa8ba417e57ae5b7de1db0069c.tar.gz
scummvm-rg350-7dbfb326cc0bf6fa8ba417e57ae5b7de1db0069c.tar.bz2
scummvm-rg350-7dbfb326cc0bf6fa8ba417e57ae5b7de1db0069c.zip
Fixed dword alignment warning (as reported by salty-horse)
svn-id: r40198
-rw-r--r--engines/tinsel/scene.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index 1b8195a836..0b563376f8 100644
--- a/engines/tinsel/scene.cpp
+++ b/engines/tinsel/scene.cpp
@@ -131,17 +131,17 @@ const SCENE_STRUC *GetSceneStruc(const byte *pStruc) {
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;
}