diff options
| author | Joseph-Eugene Winzer | 2018-01-08 00:51:03 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:15:46 +0000 |
| commit | b937268e61a041bd1578f250be39b85e75b40e67 (patch) | |
| tree | e223be42ef8c313d7aee0c45fdab0505f6585b64 | |
| parent | 32e8d22c14bae56f08a79e3cb5cf07573fbc4791 (diff) | |
| download | scummvm-rg350-b937268e61a041bd1578f250be39b85e75b40e67.tar.gz scummvm-rg350-b937268e61a041bd1578f250be39b85e75b40e67.tar.bz2 scummvm-rg350-b937268e61a041bd1578f250be39b85e75b40e67.zip | |
SUPERNOVA: Renames INT32_MAX to kMaxTimerValue
Prevents collision with stdint.h INT32_MAX
| -rw-r--r-- | engines/supernova/rooms.cpp | 2 | ||||
| -rw-r--r-- | engines/supernova/state.cpp | 4 | ||||
| -rw-r--r-- | engines/supernova/state.h | 2 | ||||
| -rw-r--r-- | engines/supernova/supernova.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 4c35e27e1b..480f74353d 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -2750,7 +2750,7 @@ bool AxacussBcorridor::interact(Action verb, Object &obj1, Object &obj2) { if (!_gm->_rooms[OFFICE_L1 + obj1._id - DOOR1]->isSectionVisible(4)) _gm->search(180); else - _gm->_state._eventTime = INT32_MAX; + _gm->_state._eventTime = kMaxTimerValue; } } else if (((verb == ACTION_WALK) || ((verb == ACTION_OPEN) && !obj1.hasProperty(OPENED))) && (obj1._id >= DOOR1) && (obj1._id <= DOOR4) && diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index 6a57610504..50a7fd2223 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -382,7 +382,7 @@ void GameManager::initState() { _state._time = ticksToMsec(916364); // 2 pm _state._timeSleep = 0; _state._timeAlarm = ticksToMsec(458182); // 7 am - _state._eventTime = INT32_MAX; + _state._eventTime = kMaxTimerValue; _state._eventCallback = kNoFn; _state._arrivalDaysLeft = 2840; _state._shipEnergyDaysLeft = 2135; @@ -863,7 +863,7 @@ void GameManager::telomat(int nr) { } _rooms[BCORRIDOR]->setSectionVisible(7, true); _rooms[BCORRIDOR]->setSectionVisible(i + 1, true); - _state._eventTime = INT32_MAX; + _state._eventTime = kMaxTimerValue; _currentRoom->addSentence(0, 1); } _guiEnabled = true; diff --git a/engines/supernova/state.h b/engines/supernova/state.h index 17d11e0533..bb0b933b00 100644 --- a/engines/supernova/state.h +++ b/engines/supernova/state.h @@ -29,7 +29,7 @@ namespace Supernova { -const int32 INT32_MAX = 0x7FFFFFFF; +const int32 kMaxTimerValue = 0x7FFFFFFF; enum EventFunction { kNoFn, kSupernovaFn, kGuardReturnedFn, kGuardWalkFn, kTaxiFn, kSearchStartFn }; diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index a3e939f33d..94fcdf0fad 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -185,7 +185,7 @@ void SupernovaEngine::updateEvents() { if (_gm->_state._eventCallback != kNoFn && _gm->_state._time >= _gm->_state._eventTime) { _allowLoadGame = false; _allowSaveGame = false; - _gm->_state._eventTime = INT32_MAX; + _gm->_state._eventTime = kMaxTimerValue; EventFunction fn = _gm->_state._eventCallback; _gm->_state._eventCallback = kNoFn; switch (fn) { |