[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.3,1.4 insane.h,1.2,1.3
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Dec 8 00:48:01 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv24551
Modified Files:
insane.cpp insane.h
Log Message:
fixed warnings
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- insane.cpp 8 Dec 2003 04:16:41 -0000 1.3
+++ insane.cpp 8 Dec 2003 08:47:21 -0000 1.4
@@ -538,9 +538,9 @@
_fluConf[n].numFrames = numFrames;
}
-void Insane::init_scenePropStruct(int32 n, int32 n1, int actornum, int32 sound, int32 trsId,
+void Insane::init_scenePropStruct(int32 n, int32 n1, int32 actornum, int32 sound, int32 trsId,
byte r, byte g, byte b, int32 counter, int32 maxCounter,
- int index) {
+ int32 index) {
_sceneProp[n].actor = actornum; // main actor number, -1 if not applicable
_sceneProp[n].sound = sound;
_sceneProp[n].trsId = trsId;
@@ -1480,12 +1480,12 @@
}
void Insane::readState(void) {
- _actor[0].inventory[INV_CHAIN] = readArray(_numberArray, 50); // Chain
- _actor[0].inventory[INV_CHAINSAW] = readArray(_numberArray, 51); // Chainsaw
- _actor[0].inventory[INV_MACE] = readArray(_numberArray, 52); // Mace
- _actor[0].inventory[INV_2X4] = readArray(_numberArray, 53); // 2x4
- _actor[0].inventory[INV_WRENCH] = readArray(_numberArray, 54); // Wrench
- _actor[0].inventory[INV_DUST] = readArray(_numberArray, 55); // Dust
+ _actor[0].inventory[INV_CHAIN] = readArray(_numberArray, 50) != 0; // Chain
+ _actor[0].inventory[INV_CHAINSAW] = readArray(_numberArray, 51) != 0; // Chainsaw
+ _actor[0].inventory[INV_MACE] = readArray(_numberArray, 52) != 0; // Mace
+ _actor[0].inventory[INV_2X4] = readArray(_numberArray, 53) != 0; // 2x4
+ _actor[0].inventory[INV_WRENCH] = readArray(_numberArray, 54) != 0; // Wrench
+ _actor[0].inventory[INV_DUST] = readArray(_numberArray, 55) != 0; // Dust
_actor[0].inventory[INV_HAND] = 1; // Boot
_actor[0].inventory[INV_BOOT] = 1; // Hand
_smlayer_room = readArray(_numberArray, 320);
@@ -2612,7 +2612,7 @@
void Insane::postCase2(byte *renderBitmap, int32 codecparam, int32 setupsan12,
int32 setupsan13, int32 curFrame, int32 maxFrame) {
- actorsReaction(_val39d);
+ actorsReaction(_val39d != 0);
checkEnemyLoose(1);
if (!curFrame)
@@ -4750,7 +4750,7 @@
bool Insane::loadScenePropSounds(int32 scenePropNum) {
int32 num = 0;
- bool res = 1;
+ int32 res = 1;
if (_sceneProp[scenePropNum + num].index != 1) {
while (num < 12) {
@@ -4762,7 +4762,7 @@
}
}
- return res;
+ return res != 0;
}
int32 Insane::setProperActorState(void) {
@@ -5097,7 +5097,7 @@
}
bool Insane::smlayer_isSoundRunning(int32 sound) {
- return _scumm->_sound->isSoundRunning(readArray(_numberArray, sound));;
+ return _scumm->_sound->isSoundRunning(readArray(_numberArray, sound)) != 0;
}
bool Insane::smlayer_startSound1(int32 sound) {
Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- insane.h 8 Dec 2003 04:16:41 -0000 1.2
+++ insane.h 8 Dec 2003 08:47:21 -0000 1.3
@@ -346,7 +346,7 @@
void smlayer_putActor(int actornum, int act, int x, int y, byte room);
void smlayer_setActorLayer(int actornum, int act, int layer);
void smlayer_setFluPalette(byte *pal, int shut_flag);
- int readArray (int field, int number);
+ int32 readArray (int field, int number);
void setWordInString(int field, int number, int value);
int smlayer_mainLoop(void);
void mainLoop(void);
@@ -450,7 +450,7 @@
void checkEnemyLoose(int);
int32 processBattle(void);
void proc12(int arg_0);
- void setEnemyAnimation(int actornum, int arg_4);
+ void setEnemyAnimation(int32 actornum, int32 arg_4);
int speedTranslator(int value);
bool smush_eitherNotStartNewFrame(void);
void smlayer_setActorFacing(int actornum, int actnum, int frame, int direction);
More information about the Scummvm-git-logs
mailing list