diff options
| author | Strangerke | 2016-09-16 23:43:27 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-16 23:43:27 +0200 |
| commit | 314d52dbc1fb31fd55fe8d87fcbcf76859e28f5f (patch) | |
| tree | ac2ee85da0ba500d268744fab02c56bcbc74bd01 | |
| parent | 421d47db85f1efb7744734ef41ffd213f3ab4bca (diff) | |
| download | scummvm-rg350-314d52dbc1fb31fd55fe8d87fcbcf76859e28f5f.tar.gz scummvm-rg350-314d52dbc1fb31fd55fe8d87fcbcf76859e28f5f.tar.bz2 scummvm-rg350-314d52dbc1fb31fd55fe8d87fcbcf76859e28f5f.zip | |
DM: Fix some more warnings
| -rw-r--r-- | engines/dm/gfx.cpp | 12 | ||||
| -rw-r--r-- | engines/dm/gfx.h | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 08d5de4db8..c716545951 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -1337,7 +1337,7 @@ void DisplayMan::drawSquareD3R(Direction dir, int16 posX, int16 posY) { Frame(180, 197, 28, 67, 24, 41, 24, 0) /* Right Horizontal Closed three fourth */ ); - CellOrder order; + CellOrder order = kDMCellOrderNone; uint16 squareAspect[5]; bool skip = false; @@ -2890,9 +2890,9 @@ void DisplayMan::drawObjectsCreaturesProjectilesExplosions(Thing thingParam, Dir #define AL_8_shiftSetIndex L0150_ui_Multiple #define AL_8_projectileScaleIndex L0150_ui_Multiple CreatureAspect* creatureAspectStruct; - int16 creatureSize; + int16 creatureSize = 0; int16 creatureDirectionDelta; - int16 creatureGraphicInfoGreen; + int16 creatureGraphicInfoGreen = 0; int16 creatureGraphicInfoRed; int16 creatureAspectInt; int16 creatureIndexGreen; @@ -2906,7 +2906,7 @@ void DisplayMan::drawObjectsCreaturesProjectilesExplosions(Thing thingParam, Dir bool useFlippedHorizontallyCreatureFrontImage; bool drawCreaturesCompleted; /* Set to true when the last creature that the function should draw is being drawn. This is used to avoid processing the code to draw creatures for the remaining square cells */ int16 doorFrontViewDrawingPass; /* Value 0, 1 or 2 */ - int16 projectilePosX; + int16 projectilePosX = 0; int16 projectileDirection; int16 projectileAspectType; int16 projectileBitmapIndexDelta; @@ -3115,8 +3115,8 @@ void DisplayMan::drawObjectsCreaturesProjectilesExplosions(Thing thingParam, Dir AL_10_viewSquareIndexBackup = viewSquareIndex; viewLane = (ViewLane)((viewSquareIndex + 3) % 3); bool twoHalfSquareCreaturesFrontView; - byte *bitmapRedBanana; - byte *bitmapGreenAnt; + byte *bitmapRedBanana = nullptr; + byte *bitmapGreenAnt = nullptr; do { /* Draw objects */ if (L0135_B_DrawAlcoveObjects) { diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 6fc6253a9e..9df6ad1c3a 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -111,6 +111,7 @@ enum ViewWall { }; enum CellOrder { + kDMCellOrderNone = 0xFFFF, kDMCellOrderAlcove = 0x0000, // @ C0000_CELL_ORDER_ALCOVE kDMCellOrderBackLeft = 0x0001, // @ C0001_CELL_ORDER_BACKLEFT kDMCellOrderBackRight = 0x0002, // @ C0002_CELL_ORDER_BACKRIGHT |