aboutsummaryrefslogtreecommitdiff
path: root/engines/dm
diff options
context:
space:
mode:
authorStrangerke2016-06-23 23:22:50 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commitc1abeffecccf5cd6096f3a780f17e1327ee744da (patch)
treefdf8d550e3f50ae94f3634ed1f12cc69791c1735 /engines/dm
parent45461a4908bfab95fa41ff90aba2e697b2581c96 (diff)
downloadscummvm-rg350-c1abeffecccf5cd6096f3a780f17e1327ee744da.tar.gz
scummvm-rg350-c1abeffecccf5cd6096f3a780f17e1327ee744da.tar.bz2
scummvm-rg350-c1abeffecccf5cd6096f3a780f17e1327ee744da.zip
DM: Fix some GCC warnings
Diffstat (limited to 'engines/dm')
-rw-r--r--engines/dm/champion.cpp3
-rw-r--r--engines/dm/dungeonman.cpp7
-rw-r--r--engines/dm/eventman.cpp6
-rw-r--r--engines/dm/objectman.cpp2
4 files changed, 18 insertions, 0 deletions
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index 8579fb63a5..b246eccbac 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -312,6 +312,9 @@ T0280046:
slotIndex_Green = AL_0_slotIndex_Red++;
}
break;
+
+ default:
+ break;
}
T0280048:
if (champ->getSlot((ChampionSlot)slotIndex_Green) != Thing::_thingNone) {
diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
index d9480820ae..ac38a07438 100644
--- a/engines/dm/dungeonman.cpp
+++ b/engines/dm/dungeonman.cpp
@@ -842,6 +842,8 @@ void DungeonMan::setSquareAspect(uint16 *aspectArray, direction dir, int16 mapX,
frontOrnAllowed = square.get(kWallEastRandOrnAllowed);
rightOrnAllowed = square.get(kWallSouthRandOrnAllowed);
break;
+ default:
+ break;
}
T0172010_ClosedFakeWall:
@@ -925,6 +927,9 @@ T0172049_Footprints:
unsigned char scentOrdinal; // see next line comment
if (footPrintsAllowed) // TODO: I skipped some party query code, must come back later and complete
aspectArray[kFloorOrnOrdAspect] &= kFootprintsAspect;
+ break;
+ default:
+ break;
}
aspectArray[kFirstGroupOrObjectAspect] = thing.toUint16();
}
@@ -1205,6 +1210,8 @@ uint16 DungeonMan::getObjectWeight(Thing thing) {
}
case kScrollThingType:
return 1;
+ default:
+ break;
}
assert(false); // this should never be taken
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index 0b76af34ef..680c621434 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -340,6 +340,8 @@ void EventManager::processInput() {
if (_dummyMapIndex > 0)
dungeonMan.setCurrentMapAndPartyMap(--_dummyMapIndex);
break;
+ default:
+ break;
}
case Common::EVENT_MOUSEMOVE:
_mousePos = event.mouse;
@@ -350,6 +352,8 @@ void EventManager::processInput() {
_pendingClickPos = _mousePos;
_pendingClickButton = (event.type == Common::EVENT_LBUTTONDOWN) ? kLeftMouseButton : kRightMouseButton;
break;
+ default:
+ break;
}
}
}
@@ -471,6 +475,8 @@ void EventManager::commandMoveParty(CommandType cmdType) {
case kCommandMoveRight:
dungeonMan.mapCoordsAfterRelMovement(dungeonMan._currMap._partyDir, 0, 1, currMap._partyPosX, currMap._partyPosY);
break;
+ default:
+ break;
}
// MISSING CODE: Lots of code
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp
index 4099b33b77..d20c235aa0 100644
--- a/engines/dm/objectman.cpp
+++ b/engines/dm/objectman.cpp
@@ -146,6 +146,8 @@ IconIndice ObjectMan::getIconIndex(Thing thing) {
iconIndex = (IconIndice)(iconIndex + 1);
}
break;
+ default:
+ break;
}
}