libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 03:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DM: Fix some more warnings

Browse Source
This commit is contained in:
Strangerke 2016-09-16 23:43:27 +02:00
parent 421d47db85
commit 314d52dbc1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/dm/gfx.cpp
View File

@ -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) {

1
engines/dm/gfx.h
View File

@ -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