libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 02:17:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SUPERNOVA: Renames INT32_MAX to kMaxTimerValue

Browse Source 
Prevents collision with stdint.h INT32_MAX
This commit is contained in:
Joseph-Eugene Winzer 2018-01-08 00:51:03 +01:00 committed by Thierry Crozat
parent 32e8d22c14
commit b937268e61
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/supernova/rooms.cpp
View File

@ -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) &&

4
engines/supernova/state.cpp
View File

@ -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;

2
engines/supernova/state.h
View File

@ -29,7 +29,7 @@
namespace Supernova {
const int32 INT32_MAX = 0x7FFFFFFF;
const int32 kMaxTimerValue = 0x7FFFFFFF;
enum EventFunction { kNoFn, kSupernovaFn, kGuardReturnedFn, kGuardWalkFn, kTaxiFn, kSearchStartFn };

2
engines/supernova/supernova.cpp
View File

@ -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) {