diff options
| -rw-r--r-- | engines/cryomni3d/versailles/engine.cpp | 3 | ||||
| -rw-r--r-- | engines/cryomni3d/versailles/engine.h | 85 |
2 files changed, 42 insertions, 46 deletions
diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp index e3e91b8d9d..07fcd9c7cf 100644 --- a/engines/cryomni3d/versailles/engine.cpp +++ b/engines/cryomni3d/versailles/engine.cpp @@ -795,10 +795,8 @@ void CryOmni3DEngine_Versailles::setGameTime(unsigned int newTime, unsigned int void CryOmni3DEngine_Versailles::gameStep() { while (!_abortCommand) { if (_nextPlaceId != -1u) { - // TODO: check selected object == -2 if needed if (_placeStates[_nextPlaceId].initPlace) { (this->*_placeStates[_nextPlaceId].initPlace)(); - // TODO: check selected object == -2 if needed } doPlaceChange(); musicUpdate(); @@ -871,7 +869,6 @@ void CryOmni3DEngine_Versailles::gameStep() { // Click on nothing with an object: deselect it _inventory.setSelectedObject(nullptr); } - // TODO: selected_object == -2 if needed } } diff --git a/engines/cryomni3d/versailles/engine.h b/engines/cryomni3d/versailles/engine.h index 0b60dceb75..fc94787d9b 100644 --- a/engines/cryomni3d/versailles/engine.h +++ b/engines/cryomni3d/versailles/engine.h @@ -111,51 +111,50 @@ enum AbortCommand { struct GameVariables { enum Var { - // TODO: make these enum members more correct - kCollectScore = 0, // OK // 0 - kUnlockHiddenDoor, // OK - kAlreadyWent3_19, // OK - kMedalsDrawerStatus, // OK - kCurrentTime, // OK - kGotMedalsSolution, // OK - kCabinetDrawerStatus, // OK - kDecipherScore, // OK - kCollectLampoonArchitecture, // OK - kGotRevealedPaper, // OK - kCollectKey, // OK // 10 - kCollectPortfolio, // OK - kSketchState, // OK - kFakeSketchChatState, // OK - kCollectFood, // OK - kCollectQuill, // OK - kStateLampoonReligion, // OK - kCollectSmallKey3, // OK - kCollectEngraving, // OK - kCollectCord, // OK - kCollectVaubanBlueprint1, // OK// 20 - kCollectVaubanBlueprint2, // OK - kLadderState, // OK - kOpenedCurtain, // OK - kLoweredChandelier, // OK - kCombedOrangeTree, // OK - kMaineTalked, // OK - kUsedLitCandle, // OK - kBombState, // OK - kInkSpilled, // OK - kCollectedPaperOnTable, // OK // 30 - kSafeUnlocked, // OK + kCollectScore = 0, // 0 + kUnlockHiddenDoor, + kAlreadyWent3_19, + kMedalsDrawerStatus, + kCurrentTime, + kGotMedalsSolution, + kCabinetDrawerStatus, + kDecipherScore, + kCollectLampoonArchitecture, + kGotRevealedPaper, + kCollectKey, // 10 + kCollectPortfolio, + kSketchState, + kFakeSketchChatState, + kCollectFood, + kCollectQuill, + kStateLampoonReligion, + kCollectSmallKey3, + kCollectEngraving, + kCollectCord, + kCollectVaubanBlueprint1, // 20 + kCollectVaubanBlueprint2, + kLadderState, + kOpenedCurtain, + kLoweredChandelier, + kCombedOrangeTree, + kMaineTalked, + kUsedLitCandle, + kBombState, + kInkSpilled, + kCollectedPaperOnTable, // 30 + kSafeUnlocked, //kUselessVar, - kCollectedPaperInTrunk = 33, // OK - kBrushColor, // OK - kUsedScissors, // OK - kUnlockedAttic, // OK - kHasPlayedLebrun, // OK + kCollectedPaperInTrunk = 33, + kBrushColor, + kUsedScissors, + kUnlockedAttic, + kHasPlayedLebrun, kWarnedIncomplete, - kUsedVaubanBlueprint1, // OK - kUsedVaubanBlueprint2, // OK // 40 - kSeenMemorandum, // OK - kCollectScissors, // OK - kSavedCountdown, // OK + kUsedVaubanBlueprint1, + kUsedVaubanBlueprint2, // 40 + kSeenMemorandum, + kCollectScissors, + kSavedCountdown, kMax }; }; |