diff options
| author | D G Turner | 2018-07-30 14:07:23 +0100 |
|---|---|---|
| committer | D G Turner | 2018-07-30 14:07:23 +0100 |
| commit | 3f91accbd74b3fae474f22e114c73308fd954fef (patch) | |
| tree | 33a05df970146b0897ff272fec152a594bd05354 | |
| parent | 941fe1dd7e8aaaff7f5f0126799abee71726cfc5 (diff) | |
| download | scummvm-rg350-3f91accbd74b3fae474f22e114c73308fd954fef.tar.gz scummvm-rg350-3f91accbd74b3fae474f22e114c73308fd954fef.tar.bz2 scummvm-rg350-3f91accbd74b3fae474f22e114c73308fd954fef.zip | |
DM: Fix Possible Uninitialized Variable Usage Compiler Warnings.
| -rw-r--r-- | engines/dm/gfx.cpp | 2 | ||||
| -rw-r--r-- | engines/dm/projexpl.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index f75e7eb170..f728ffd88a 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -3203,6 +3203,7 @@ void DisplayMan::drawObjectsCreaturesProjectilesExplosions(Thing thingParam, Dir byte *bitmapGreenAnt = nullptr; do { /* Draw objects */ + ActiveGroup *activeGroup = nullptr; if (L0135_B_DrawAlcoveObjects) { AL_2_viewCell = kDMViewCellAlcove; /* Index of coordinates to draw objects in alcoves */ cellYellowBear = _vm->returnOppositeDir(directionParam); /* Alcove is on the opposite direction of the viewing direction */ @@ -3360,7 +3361,6 @@ T0115015_DrawProjectileAsObject: if ((groupThing == _vm->_thingNone) || drawCreaturesCompleted) goto T0115129_DrawProjectiles; /* Skip code to draw creatures */ - ActiveGroup *activeGroup; if (group == nullptr) { /* If all creature data and info has not already been gathered */ group = (Group *)dungeon.getThingData(groupThing); activeGroup = &_vm->_groupMan->_activeGroups[group->getActiveGroupIndex()]; diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index 0738cf64ba..312cdc0043 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -482,6 +482,7 @@ void ProjExpl::processEvent25(TimelineEvent *event) { CreatureInfo *creatureInfo = nullptr; CreatureType creatureType; + creatureType = kDMCreatureTypeGiantScorpion; // Value of 0 as default to avoid possible uninitialized usage if (groupThing != _vm->_thingEndOfList) { group = (Group *)_vm->_dungeonMan->getThingData(groupThing); creatureType = group->_type; |