[Scummvm-cvs-logs] SF.net SVN: scummvm: [31792] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Wed Apr 30 22:07:33 CEST 2008


Revision: 31792
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31792&view=rev
Author:   drmccoy
Date:     2008-04-30 13:07:33 -0700 (Wed, 30 Apr 2008)

Log Message:
-----------
Changed signess of some drawing order related vars, fixing a drawing glitch in Gob3

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_v2.cpp
    scummvm/trunk/engines/gob/mult.h
    scummvm/trunk/engines/gob/mult_v2.cpp

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2008-04-30 18:07:22 UTC (rev 31791)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2008-04-30 20:07:33 UTC (rev 31792)
@@ -896,7 +896,7 @@
 		if (_terminate)
 			return;
 
-		_vm->_mult->_orderArray = new int8[_vm->_mult->_objCount];
+		_vm->_mult->_orderArray = new uint8[_vm->_mult->_objCount];
 		memset(_vm->_mult->_orderArray, 0, _vm->_mult->_objCount * sizeof(int8));
 		_vm->_mult->_objects = new Mult::Mult_Object[_vm->_mult->_objCount];
 		memset(_vm->_mult->_objects, 0,

Modified: scummvm/trunk/engines/gob/mult.h
===================================================================
--- scummvm/trunk/engines/gob/mult.h	2008-04-30 18:07:22 UTC (rev 31791)
+++ scummvm/trunk/engines/gob/mult.h	2008-04-30 20:07:33 UTC (rev 31792)
@@ -40,12 +40,12 @@
 		uint8 layer;
 		uint8 frame;
 		int8 animType;
-		int8 order;
+		uint8 order;
 		int8 isPaused;
 		int8 isStatic;
 		int8 maxTick;
 		int8 maxFrame;
-		int8 newLayer;
+		uint8 newLayer;
 		int8 newAnimation;
 		byte intersected;
 		uint8 newCycle;
@@ -61,7 +61,7 @@
 		int8 stateType;
 		int8 animTypeBak;
 		int8 redrawAnimation;
-		int8 redrawLayer;
+		uint8 redrawLayer;
 		uint8 redrawFrame;
 	} PACKED_STRUCT;
 
@@ -86,10 +86,10 @@
 		int16 lastTop;
 		int16 lastBottom;
 		Mult_GobState **goblinStates;
-		int8 goblinX;
-		int8 goblinY;
-		int8 destX;
-		int8 destY;
+		uint8 goblinX;
+		uint8 goblinY;
+		uint8 destX;
+		uint8 destY;
 		int8 gobDestX;
 		int8 gobDestY;
 		uint8 nearestWayPoint;
@@ -229,7 +229,7 @@
 	int16 *_renderData;
 	Mult_Object **_renderObjs;
 
-	int8 *_orderArray;
+	uint8 *_orderArray;
 
 	SurfaceDesc::Ptr _animSurf;
 	int16 _animLeft;

Modified: scummvm/trunk/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v2.cpp	2008-04-30 18:07:22 UTC (rev 31791)
+++ scummvm/trunk/engines/gob/mult_v2.cpp	2008-04-30 20:07:33 UTC (rev 31792)
@@ -526,7 +526,7 @@
 		delete[] _animArrayData;
 
 		_objects = new Mult_Object[_objCount];
-		_orderArray = new int8[_objCount];
+		_orderArray = new uint8[_objCount];
 		_renderObjs = new Mult_Object*[_objCount];
 		_animArrayX = new int32[_objCount];
 		_animArrayY = new int32[_objCount];
@@ -768,9 +768,9 @@
 }
 
 void Mult_v2::animate() {
-	int8 minOrder = 100;
-	int8 maxOrder = 0;
-	int8 *orderArray;
+	uint8 minOrder = 100;
+	uint8 maxOrder = 0;
+	uint8 *orderArray;
 	int orderArrayPos = 0;
 	int8 animIndices[150];
 	int numAnims = 0;


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