[Scummvm-cvs-logs] SF.net SVN: scummvm: [25672] scummvm/trunk/engines/parallaction/graphics. cpp

[peres001 at users.sourceforge.net]

Revision: 25672
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25672&view=rev
Author:   peres001
Date:     2007-02-18 01:26:20 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
more big-endianness fixes

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/graphics.cpp

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-02-18 09:10:50 UTC (rev 25671)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-02-18 09:26:20 UTC (rev 25672)
@@ -467,7 +467,7 @@
 void jobDisplayLabel(void *parm, Job *j) {
 
 	ZoneLabel *label = (ZoneLabel*)parm;
-	debugC(1, kDebugLocation, "jobDisplayLabel (%p)", (const void*) label);
+	debugC(1, kDebugJobs, "jobDisplayLabel (%p)", (const void*) label);
 
 	if (label->_cnv._width == 0)
 		return;
@@ -479,7 +479,7 @@
 void jobEraseLabel(void *parm, Job *j) {
 	ZoneLabel *label = (ZoneLabel*)parm;
 
-	debugC(1, kDebugLocation, "jobEraseLabel (%p)", (const void*) label);
+	debugC(1, kDebugJobs, "jobEraseLabel (%p)", (const void*) label);
 
 	int16 _si, _di;
 
@@ -1031,8 +1031,10 @@
 
 	byte unk;
 	readArchivedFile(file, &unk, 1);
-	readArchivedFile(file, &cnv->_width, 1);
-	readArchivedFile(file, &cnv->_height, 1);
+	readArchivedFile(file, &unk, 1);
+	cnv->_width = unk;
+	readArchivedFile(file, &unk, 1);
+	cnv->_height = unk;
 
 	uint16 compressedsize = getArchivedFileLength(path) - 3;
 	byte *compressed = (byte*)memAlloc(compressedsize);
@@ -1067,10 +1069,15 @@
 
 	cnv->_count = cnv->_width = cnv->_height = 0;
 
-	readArchivedFile(file, &cnv->_count, 1);
-	readArchivedFile(file, &cnv->_width, 1);
-	readArchivedFile(file, &cnv->_height, 1);
+	byte unk;
 
+	readArchivedFile(file, &unk, 1);
+	cnv->_count = unk;
+	readArchivedFile(file, &unk, 1);
+	cnv->_width = unk;
+	readArchivedFile(file, &unk, 1);
+	cnv->_height = unk;
+
 	uint16 framesize = cnv->_width*cnv->_height;
 
 	cnv->_array = (byte**)memAlloc(cnv->_count * sizeof(byte*));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.