thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPERNOVA: Introduces INT32_MAX for eventTime

Browse source
This commit is contained in:
Joseph-Eugene Winzer 2017-12-24 12:12:40 +01:00 • committed by Thierry Crozat
parent b6bb1f9709
commit 6e7da43889
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/supernova/rooms.cpp
View file

@ -2745,7 +2745,7 @@ bool AxacussBcorridor::interact(Action verb, Object &obj1, Object &obj2) {
if (!_gm->_rooms[OFFICE_L1 + obj1._id - DOOR1]->isSectionVisible(4)) if (!_gm->_rooms[OFFICE_L1 + obj1._id - DOOR1]->isSectionVisible(4))
_gm->search(180); _gm->search(180);
else else
_gm->_state._eventTime = 0x7FFFFFF; _gm->_state._eventTime = INT32_MAX;
} }
} else if (((verb == ACTION_WALK) || ((verb == ACTION_OPEN) && !obj1.hasProperty(OPENED))) && } else if (((verb == ACTION_WALK) || ((verb == ACTION_OPEN) && !obj1.hasProperty(OPENED))) &&
(obj1._id >= DOOR1) && (obj1._id <= DOOR4) && (obj1._id >= DOOR1) && (obj1._id <= DOOR4) &&

4
engines/supernova/state.cpp
View file

@ -368,7 +368,7 @@ void GameManager::initState() {
_state._time = ticksToMsec(916364); // 2 pm _state._time = ticksToMsec(916364); // 2 pm
_state._timeSleep = 0; _state._timeSleep = 0;
_state._timeAlarm = ticksToMsec(458182); // 7 am _state._timeAlarm = ticksToMsec(458182); // 7 am
_state._eventTime = 0x7FFFFFFF; _state._eventTime = INT32_MAX;
_state._eventCallback = kNoFn; _state._eventCallback = kNoFn;
_state._arrivalDaysLeft = 2840; _state._arrivalDaysLeft = 2840;
_state._shipEnergyDaysLeft = 2135; _state._shipEnergyDaysLeft = 2135;
@ -849,7 +849,7 @@ void GameManager::telomat(int nr) {
} }
_rooms[BCORRIDOR]->setSectionVisible(7, true); _rooms[BCORRIDOR]->setSectionVisible(7, true);
_rooms[BCORRIDOR]->setSectionVisible(i + 1, true); _rooms[BCORRIDOR]->setSectionVisible(i + 1, true);
_state._eventTime = 0x7FFFFFFF; _state._eventTime = INT32_MAX;
_currentRoom->addSentence(0, 1); _currentRoom->addSentence(0, 1);
} }
_guiEnabled = true; _guiEnabled = true;

2
engines/supernova/state.h
View file

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

2
engines/supernova/supernova.cpp
View file

@ -186,7 +186,7 @@ void SupernovaEngine::updateEvents() {
if (_gm->_state._eventCallback != kNoFn && _gm->_state._time >= _gm->_state._eventTime) { if (_gm->_state._eventCallback != kNoFn && _gm->_state._time >= _gm->_state._eventTime) {
_allowLoadGame = false; _allowLoadGame = false;
_allowSaveGame = false; _allowSaveGame = false;
_gm->_state._eventTime = 0x7FFFFFFF; _gm->_state._eventTime = INT32_MAX;
EventFunction fn = _gm->_state._eventCallback; EventFunction fn = _gm->_state._eventCallback;
_gm->_state._eventCallback = kNoFn; _gm->_state._eventCallback = kNoFn;
switch (fn) { switch (fn) {