[Scummvm-cvs-logs] scummvm master -> 4b6907141b82b2f38fab5d13ffab4081a8d2264d

[bluegr]

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:
4b6907141b TINSEL: Fix incorrect byte swapping on BE systems (bug #3614416)


Commit: 4b6907141b82b2f38fab5d13ffab4081a8d2264d
    https://github.com/scummvm/scummvm/commit/4b6907141b82b2f38fab5d13ffab4081a8d2264d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-06-17T11:08:29-07:00

Commit Message:
TINSEL: Fix incorrect byte swapping on BE systems (bug #3614416)

This is a regression from commit c90d56355fa0bbcdd3122f3e376e5609422338b3
Thanks to canavan for his testing and bisecting work

Changed paths:
    engines/tinsel/scene.cpp



diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index b652e39..17cb23b 100644
--- a/engines/tinsel/scene.cpp
+++ b/engines/tinsel/scene.cpp
@@ -130,14 +130,14 @@ const SCENE_STRUC *GetSceneStruc(const byte *pStruc) {
 	const byte *p = pStruc;
 	memset(&g_tempStruc, 0, sizeof(SCENE_STRUC));
 
-	g_tempStruc.numEntrance    = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.numPoly        = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.numTaggedActor = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.defRefer       = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.hSceneScript   = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.hEntrance      = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.hPoly          = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
-	g_tempStruc.hTaggedActor   = FROM_LE_32(READ_32(p)); p += sizeof(uint32);
+	g_tempStruc.numEntrance    = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.numPoly        = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.numTaggedActor = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.defRefer       = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.hSceneScript   = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.hEntrance      = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.hPoly          = READ_32(p); p += sizeof(uint32);
+	g_tempStruc.hTaggedActor   = READ_32(p); p += sizeof(uint32);
 	
 	return &g_tempStruc;
 }