diff options
author | Paweł Kołodziejski | 2003-12-08 08:47:21 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2003-12-08 08:47:21 +0000 |
commit | aa6fee4bbd00363f73fa135df09d360a4f378246 (patch) | |
tree | c6e3292b1a2851c8b97104a6eaf3104c5d4ca8ab /scumm | |
parent | 5c539040e426e915a6834d72f8521376a2e965ac (diff) | |
download | scummvm-rg350-aa6fee4bbd00363f73fa135df09d360a4f378246.tar.gz scummvm-rg350-aa6fee4bbd00363f73fa135df09d360a4f378246.tar.bz2 scummvm-rg350-aa6fee4bbd00363f73fa135df09d360a4f378246.zip |
fixed warnings
svn-id: r11529
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/smush/insane.cpp | 24 | ||||
-rw-r--r-- | scumm/smush/insane.h | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/scumm/smush/insane.cpp b/scumm/smush/insane.cpp index bd3e604444..87adfe93c9 100644 --- a/scumm/smush/insane.cpp +++ b/scumm/smush/insane.cpp @@ -538,9 +538,9 @@ void Insane::init_fluConfStruct(int n, int sceneId, byte *fluPtr, _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::putActors(void) { } 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::postCase1(byte *renderBitmap, int32 codecparam, int32 setupsan12, 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 @@ void Insane::enemyOuchSound(void) { 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 @@ bool Insane::loadScenePropSounds(int32 scenePropNum) { } } - return res; + return res != 0; } int32 Insane::setProperActorState(void) { @@ -5097,7 +5097,7 @@ void Insane::smlayer_setFluPalette(byte *pal, int shut_flag) { } 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) { diff --git a/scumm/smush/insane.h b/scumm/smush/insane.h index c3751b4f14..85cdcf44c3 100644 --- a/scumm/smush/insane.h +++ b/scumm/smush/insane.h @@ -346,7 +346,7 @@ class Insane { 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 @@ class Insane { 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); |