diff options
| author | Strangerke | 2014-01-06 07:47:47 +0100 |
|---|---|---|
| committer | Strangerke | 2014-01-06 07:47:47 +0100 |
| commit | 996b2aa43ca5615001d5aa0004a71612cc677eac (patch) | |
| tree | 566d01ea150aee01fb102c0576cd8f1af4a19a9e /engines/voyeur | |
| parent | 1fb73446e3358a2fe045647c8cb5d1b621d43ce7 (diff) | |
| download | scummvm-rg350-996b2aa43ca5615001d5aa0004a71612cc677eac.tar.gz scummvm-rg350-996b2aa43ca5615001d5aa0004a71612cc677eac.tar.bz2 scummvm-rg350-996b2aa43ca5615001d5aa0004a71612cc677eac.zip | |
VOYEUR: Use boolean for _isAM instead of int
Diffstat (limited to 'engines/voyeur')
| -rw-r--r-- | engines/voyeur/debugger.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/events.h | 2 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/voyeur_game.cpp | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index f97e73a5ce..c437bff03d 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -61,7 +61,7 @@ bool Debugger::Cmd_Time(int argc, const char **argv) { _vm->_voy._transitionId = timeId; _vm->_gameHour = LEVEL_H[timeId - 1]; _vm->_gameMinute = LEVEL_M[timeId - 1]; - _vm->_voy._isAM = timeId == 6; + _vm->_voy._isAM = (timeId == 6); // Camera back to full charge _vm->_voy._RTVNum = 0; diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h index bd119f2fb8..a8ef89aaee 100644 --- a/engines/voyeur/events.h +++ b/engines/voyeur/events.h @@ -67,7 +67,7 @@ struct VoyeurEvent { class SVoy { public: - int _isAM; + bool _isAM; int _RTANum; int _RTVNum; int _switchBGNum; diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 20d781457d..dc46b789ec 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -546,7 +546,7 @@ void ThreadResource::parsePlayCommands() { _vm->_voy._RTANum = 255; } - _vm->_voy._isAM = _vm->_voy._transitionId == 6; + _vm->_voy._isAM = (_vm->_voy._transitionId == 6); } dataP += 6; diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index e6f8d612f3..251772e200 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -38,7 +38,7 @@ void VoyeurEngine::playStamp() { ThreadResource *threadP = threadsList->_entries[0]->_threadResource; threadP->initThreadStruct(0, 0); - _voy._isAM = 0; + _voy._isAM = false; _gameHour = 9; _gameMinute = 0; _eventsManager._v2A0A2 = 0; @@ -1121,8 +1121,7 @@ Common::String VoyeurEngine::getTimeOfDay() { if (_voy._transitionId == 17) return ""; - const char *amPm = _voy._isAM ? AM : PM; - return Common::String::format("%d:%02d%s", _gameHour, _gameMinute, amPm); + return Common::String::format("%d:%02d%s", _gameHour, _gameMinute, _voy._isAM ? AM : PM); } bool VoyeurEngine::doComputerText(int maxLen) { |