diff options
| author | Strangerke | 2016-06-22 00:37:58 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | f46a588164f7a49767ed75cd108d16cfc6cf7410 (patch) | |
| tree | ed9283c140e1859a2f5f6e8f9753cd767dbe5010 | |
| parent | f1ef774a285844edd3a01c7d21e41e957a175ba8 (diff) | |
| download | scummvm-rg350-f46a588164f7a49767ed75cd108d16cfc6cf7410.tar.gz scummvm-rg350-f46a588164f7a49767ed75cd108d16cfc6cf7410.tar.bz2 scummvm-rg350-f46a588164f7a49767ed75cd108d16cfc6cf7410.zip | |
DM: Silent two more GCC warnings
| -rw-r--r-- | engines/dm/gfx.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 8027425fa5..1af0a03c0b 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -1362,7 +1362,8 @@ bool DisplayMan::isDrawnWallOrnAnAlcove(int16 wallOrnOrd, ViewWall viewWallIndex uint16 *coordinateSetA = gWallOrnCoordSets[_currMapWallOrnInfo[wallOrnIndex][kNativeCoordinateSet]][viewWallIndex]; isAlcove = _vm->_dungeonMan->isWallOrnAnAlcove(wallOrnIndex); - if (isInscription = (wallOrnIndex == _vm->_dungeonMan->_currMapInscriptionWallOrnIndex)) { + isInscription = (wallOrnIndex == _vm->_dungeonMan->_currMapInscriptionWallOrnIndex); + if (isInscription) { _vm->_dungeonMan->decodeText((char*)inscriptionString, _inscriptionThing, kTextTypeInscription); } @@ -1416,7 +1417,8 @@ bool DisplayMan::isDrawnWallOrnAnAlcove(int16 wallOrnOrd, ViewWall viewWallIndex coordinateSetOffset = 0; uint16 *coordSetB; int16 wallOrnCoordSetIndex = _currMapWallOrnInfo[wallOrnIndex][kNativeCoordinateSet]; - if (flipHorizontal = (viewWallIndex == kViewWall_D2R_LEFT) || (viewWallIndex == kViewWall_D3R_LEFT)) { + flipHorizontal = (viewWallIndex == kViewWall_D2R_LEFT) || (viewWallIndex == kViewWall_D3R_LEFT); + if (flipHorizontal) { coordSetB = gWallOrnCoordSets[wallOrnCoordSetIndex][kViewWall_D1R_LEFT]; } else if ((viewWallIndex == kViewWall_D2L_RIGHT) || (viewWallIndex == kViewWall_D3L_RIGHT)) { coordSetB = gWallOrnCoordSets[wallOrnCoordSetIndex][kViewWall_D1L_RIGHT]; |