[Scummvm-cvs-logs] CVS: scummvm/kyra debugger.cpp,1.3,1.4 kyra.cpp,1.104,1.105 sprites.cpp,1.15,1.16

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 1 02:50:02 CET 2006


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32290/kyra

Modified Files:
	debugger.cpp kyra.cpp sprites.cpp 
Log Message:
fixed warnings

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/debugger.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debugger.cpp	31 Dec 2005 15:41:37 -0000	1.3
+++ debugger.cpp	1 Jan 2006 10:49:27 -0000	1.4
@@ -57,7 +57,7 @@
 bool Debugger::cmd_enterRoom(int argc, const char **argv) {
 	uint direction = 0;
 	if (argc > 1) {
-		uint room = atoi(argv[1]);
+		int room = atoi(argv[1]);
 
 		// game will crash if entering a non-existent room
 		if (room >= _vm->_roomTableSize) {

Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- kyra.cpp	31 Dec 2005 17:25:47 -0000	1.104
+++ kyra.cpp	1 Jan 2006 10:49:27 -0000	1.105
@@ -2646,7 +2646,7 @@
 		if (curItem != 0xFF) {
 			curAnimState->drawY = curRoom->itemsYPos[i];
 			curAnimState->sceneAnimPtr = _shapes[220+curItem];
-			curAnimState->animFrameNumber = 0xFFFF;
+			curAnimState->animFrameNumber = (int16)0xFFFF;
 			curAnimState->y1 = curRoom->itemsYPos[i];
 			curAnimState->x1 = curRoom->itemsXPos[i];
 			

Index: sprites.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/sprites.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sprites.cpp	24 Dec 2005 18:00:35 -0000	1.15
+++ sprites.cpp	1 Jan 2006 10:49:27 -0000	1.16
@@ -93,15 +93,15 @@
 			data += 4;
 			_anims[i].sprite = READ_LE_UINT16(data);
 			data += 4;
-			_anims[i].flipX = READ_LE_UINT16(data);
+			_anims[i].flipX = READ_LE_UINT16(data) != 0;
 			data += 4;
 			_anims[i].width2 = *(data);
 			data += 4;
 			_anims[i].height2 = *(data);
 			data += 4;
-			_anims[i].unk1 = READ_LE_UINT16(data);
+			_anims[i].unk1 = READ_LE_UINT16(data) != 0;
 			data += 4;
-			_anims[i].play = READ_LE_UINT16(data);
+			_anims[i].play = READ_LE_UINT16(data) != 0;
 			data += 2;
 
 			_anims[i].script = data;
@@ -162,7 +162,7 @@
 				_anims[i].y = READ_LE_UINT16(data);
 				data += 2;
 				_anims[i].flipX = false;
-				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1);
+				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0);
 				break;
 			case 0xFF8D:
 				data += 2;
@@ -179,7 +179,7 @@
 				_anims[i].y = READ_LE_UINT16(data);
 				data += 2;
 				_anims[i].flipX = true;
-				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1);
+				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0);
 				break;
 			case 0xFF8A:
 				data += 2;
@@ -258,7 +258,7 @@
 				_anims[i].sprite = READ_LE_UINT16(data);
 				_anims[i].flipX = false;
 				data += 2;
-				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1);
+				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0);
 				break;
 			case 0xFF91:
 				data += 2;
@@ -267,7 +267,7 @@
 				_anims[i].sprite = READ_LE_UINT16(data);
 				_anims[i].flipX = true;
 				data += 2;
-				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1);
+				refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0);
 				break;
 			case 0xFF92:
 				data += 2;





More information about the Scummvm-git-logs mailing list