diff options
| author | Strangerke | 2016-08-22 23:24:49 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | fecb869af99927326b6cb6689c0e8e6d499a5977 (patch) | |
| tree | 553ff1dbe6fe57c7e178c863869528fc9df8455b /engines/dm/group.cpp | |
| parent | 2bdabc3b7afe9ba857bfc2be7ac638a566d09bf4 (diff) | |
| download | scummvm-rg350-fecb869af99927326b6cb6689c0e8e6d499a5977.tar.gz scummvm-rg350-fecb869af99927326b6cb6689c0e8e6d499a5977.tar.bz2 scummvm-rg350-fecb869af99927326b6cb6689c0e8e6d499a5977.zip | |
DM: Fix some more GCC warnings, move some globals to MenuMan
Diffstat (limited to 'engines/dm/group.cpp')
| -rw-r--r-- | engines/dm/group.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp index 22915a9daa..c9f7e30958 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -256,9 +256,9 @@ void GroupMan::f186_dropCreatureFixedPossessions(uint16 creatureType, int16 mapX return; } - uint16 currFixedPossession; + uint16 currFixedPossession = *fixedPossessions++; bool weaponDropped = false; - while (currFixedPossession = *fixedPossessions++) { + while (currFixedPossession) { if (getFlag(currFixedPossession, k0x8000_randomDrop) && _vm->getRandomNumber(2)) continue; @@ -285,6 +285,7 @@ void GroupMan::f186_dropCreatureFixedPossessions(uint16 creatureType, int16 mapX currWeapon->setCursed(cursedPossessions); nextUnusedThing = M15_thingWithNewCell(nextUnusedThing, ((cell == k255_CreatureTypeSingleCenteredCreature) || !_vm->getRandomNumber(4)) ? _vm->getRandomNumber(4) : cell); _vm->_moveSens->f267_getMoveResult(nextUnusedThing, kM1_MapXNotOnASquare, 0, mapX, mapY); + currFixedPossession = *fixedPossessions++; } _vm->_sound->f064_SOUND_RequestPlay_CPSD(weaponDropped ? k00_soundMETALLIC_THUD : k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM, mapX, mapY, mode); } |