[Scummvm-git-logs] scummvm master -> b6d61b71d92e4cc292497d418b25eed2809850e1
AndywinXp
noreply at scummvm.org
Thu Jun 26 22:17:59 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
b6d61b71d9 LASTEXPRESS: Relabel all globals
Commit: b6d61b71d92e4cc292497d418b25eed2809850e1
https://github.com/scummvm/scummvm/commit/b6d61b71d92e4cc292497d418b25eed2809850e1
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-27T00:17:47+02:00
Commit Message:
LASTEXPRESS: Relabel all globals
Changed paths:
engines/lastexpress/characters/alexei.cpp
engines/lastexpress/characters/anna.cpp
engines/lastexpress/characters/august.cpp
engines/lastexpress/characters/clerk.cpp
engines/lastexpress/characters/cond1.cpp
engines/lastexpress/characters/cond2.cpp
engines/lastexpress/characters/cook.cpp
engines/lastexpress/characters/demo/demo_anna.cpp
engines/lastexpress/characters/demo/demo_master.cpp
engines/lastexpress/characters/demo/demo_vesna.cpp
engines/lastexpress/characters/francois.cpp
engines/lastexpress/characters/headwait.cpp
engines/lastexpress/characters/kahina.cpp
engines/lastexpress/characters/kronos.cpp
engines/lastexpress/characters/madame.cpp
engines/lastexpress/characters/mahmud.cpp
engines/lastexpress/characters/master.cpp
engines/lastexpress/characters/max.cpp
engines/lastexpress/characters/milos.cpp
engines/lastexpress/characters/monsieur.cpp
engines/lastexpress/characters/police.cpp
engines/lastexpress/characters/rebecca.cpp
engines/lastexpress/characters/tablec.cpp
engines/lastexpress/characters/tatiana.cpp
engines/lastexpress/characters/trainm.cpp
engines/lastexpress/characters/vassili.cpp
engines/lastexpress/characters/vesna.cpp
engines/lastexpress/characters/waiter1.cpp
engines/lastexpress/debug.cpp
engines/lastexpress/fight/fight.cpp
engines/lastexpress/game/action.cpp
engines/lastexpress/game/logic.cpp
engines/lastexpress/game/navigation.cpp
engines/lastexpress/game/savegame.cpp
engines/lastexpress/game/vcr.cpp
engines/lastexpress/lastexpress.cpp
engines/lastexpress/menu/menu.cpp
engines/lastexpress/shared.h
diff --git a/engines/lastexpress/characters/alexei.cpp b/engines/lastexpress/characters/alexei.cpp
index 37a62776b56..6ae4035d756 100644
--- a/engines/lastexpress/characters/alexei.cpp
+++ b/engines/lastexpress/characters/alexei.cpp
@@ -838,7 +838,7 @@ void LogicManager::HAND_Alexei_AtDinner(HAND_PARAMS) {
releaseView(kCharacterAlexei, kCarRestaurant, 63);
CONS_Alexei_ReturnComp(0, 0, 0, 0);
} else if (getCharacter(kCharacterAlexei).callbacks[getCharacter(kCharacterAlexei).currentCall + 8] == 2) {
- if (_globals[kProgressJacket] == 2)
+ if (_globals[kGlobalJacket] == 2)
playNIS(kEventAlexeiDiner);
else
playNIS(kEventAlexeiDinerOriginalJacket);
@@ -1468,7 +1468,7 @@ void LogicManager::HAND_Alexei_AtBreakfast(HAND_PARAMS) {
startCycOtis(kCharacterAlexei, "018E");
if (inDiningRoom(kCharacterCath))
- _globals[kProgressField68] = 1;
+ _globals[kGlobalOverheardTatianaAndAlexeiAtBreakfast] = 1;
getCharacter(kCharacterAlexei).callbacks[getCharacter(kCharacterAlexei).currentCall + 8] = 2;
AlexeiCall(&LogicManager::CONS_Alexei_DoDialog, "TAT2116", 0, 0, 0);
diff --git a/engines/lastexpress/characters/anna.cpp b/engines/lastexpress/characters/anna.cpp
index 399737429bd..6ecbfcfbf99 100644
--- a/engines/lastexpress/characters/anna.cpp
+++ b/engines/lastexpress/characters/anna.cpp
@@ -372,7 +372,7 @@ void LogicManager::HAND_Anna_DoWalk(HAND_PARAMS) {
break;
case 5:
- if (_doneNIS[kEventAugustPresentAnna] || _doneNIS[kEventAugustPresentAnnaFirstIntroduction] || _globals[kProgressChapter] >= 2) {
+ if (_doneNIS[kEventAugustPresentAnna] || _doneNIS[kEventAugustPresentAnnaFirstIntroduction] || _globals[kGlobalChapter] >= 2) {
playDialog(kCharacterCath, "CAT1001", -1, 0);
} else {
playCathExcuseMe();
@@ -925,7 +925,7 @@ void LogicManager::HAND_Anna_DoWalkP1(HAND_PARAMS) {
break;
case 5:
- if (_doneNIS[kEventAugustPresentAnna] || _doneNIS[kEventAugustPresentAnnaFirstIntroduction] || _globals[kProgressChapter] >= 2) {
+ if (_doneNIS[kEventAugustPresentAnna] || _doneNIS[kEventAugustPresentAnnaFirstIntroduction] || _globals[kGlobalChapter] >= 2) {
playDialog(kCharacterCath, "CAT1001", -1, 0);
} else {
playCathExcuseMe();
@@ -937,11 +937,11 @@ void LogicManager::HAND_Anna_DoWalkP1(HAND_PARAMS) {
break;
case 12:
getCharacter(kCharacterAnna).inventoryItem = 0;
- if (_globals[kProgressJacket] == 2 && !_doneNIS[kEventGotALight] && !_doneNIS[kEventGotALightD] && !_doneNIS[kEventAugustPresentAnna] && !_doneNIS[kEventAugustPresentAnnaFirstIntroduction]) {
+ if (_globals[kGlobalJacket] == 2 && !_doneNIS[kEventGotALight] && !_doneNIS[kEventGotALightD] && !_doneNIS[kEventAugustPresentAnna] && !_doneNIS[kEventAugustPresentAnnaFirstIntroduction]) {
getCharacterCurrentParams(kCharacterAnna)[2] = 128;
}
- if (_globals[kProgressJacket] == 2 && !getCharacterCurrentParams(kCharacterAnna)[2] && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
+ if (_globals[kGlobalJacket] == 2 && !getCharacterCurrentParams(kCharacterAnna)[2] && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
getCharacterCurrentParams(kCharacterAnna)[2] = 8;
}
@@ -979,7 +979,7 @@ void LogicManager::HAND_Anna_DoWalkP1(HAND_PARAMS) {
int32 tmp = getCharacterCurrentParams(kCharacterAnna)[2] & 0xFFFFFF7F;
getCharacterCurrentParams(kCharacterAnna)[2] = tmp;
- if (_globals[kProgressJacket] == 2 && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk])
+ if (_globals[kGlobalJacket] == 2 && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk])
getCharacterCurrentParams(kCharacterAnna)[2] = tmp | 8;
if (getCharacter(kCharacterAnna).direction != 1) {
@@ -1069,11 +1069,11 @@ void LogicManager::HAND_Anna_DiningLogic(HAND_PARAMS) {
break;
case 12:
- if (_globals[kProgressJacket] == 2 && !_doneNIS[kEventDinerMindJoin] && !_doneNIS[kEventAugustPresentAnna] && !_doneNIS[kEventAugustPresentAnnaFirstIntroduction]) {
+ if (_globals[kGlobalJacket] == 2 && !_doneNIS[kEventDinerMindJoin] && !_doneNIS[kEventAugustPresentAnna] && !_doneNIS[kEventAugustPresentAnnaFirstIntroduction]) {
getCharacterCurrentParams(kCharacterAnna)[1] |= 0x80;
}
- if (_globals[kProgressJacket] == 2 && !getCharacterCurrentParams(kCharacterAnna)[1] && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
+ if (_globals[kGlobalJacket] == 2 && !getCharacterCurrentParams(kCharacterAnna)[1] && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
getCharacterCurrentParams(kCharacterAnna)[1] = 8;
}
@@ -1104,7 +1104,7 @@ void LogicManager::HAND_Anna_DiningLogic(HAND_PARAMS) {
int32 tmp = getCharacterCurrentParams(kCharacterAnna)[1] & 0xFFFFFF7F;
getCharacterCurrentParams(kCharacterAnna)[1] = tmp;
- if (_globals[kProgressJacket] == 2 && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
+ if (_globals[kGlobalJacket] == 2 && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
getCharacterCurrentParams(kCharacterAnna)[1] = tmp | 8;
}
@@ -1378,7 +1378,7 @@ void LogicManager::HAND_Anna_EatingDinner(HAND_PARAMS) {
switch (msg->action) {
case 12:
startCycOtis(kCharacterAnna, "001J");
- _globals[kProgressField28] = 1;
+ _globals[kGlobalAnnaIsEating] = 1;
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] = 1;
AnnaCall(&LogicManager::CONS_Anna_DiningLogic, 0, 0, 0, 0);
@@ -1480,7 +1480,7 @@ void LogicManager::HAND_Anna_FreshenUp(HAND_PARAMS) {
case 18:
if (getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] == 1 ||
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] == 2) {
- if (_globals[kProgressField14] == 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice) {
getCharacterCurrentParams(kCharacterAnna)[0] = _gameTime + 900;
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] = 2;
AnnaCall(&LogicManager::CONS_Anna_CompLogic, getCharacterCurrentParams(kCharacterAnna)[0], "NONE", 0, 0);
@@ -1610,10 +1610,10 @@ void LogicManager::HAND_Anna_WaitAugust(HAND_PARAMS) {
case 12:
getCharacter(kCharacterAnna).inventoryItem = 0;
- if (_globals[kProgressJacket] == 2 && !_doneNIS[kEventAnnaConversationGoodNight] && !_doneNIS[kEventAnnaIntroductionRejected])
+ if (_globals[kGlobalJacket] == 2 && !_doneNIS[kEventAnnaConversationGoodNight] && !_doneNIS[kEventAnnaIntroductionRejected])
getCharacter(kCharacterAnna).inventoryItem = 0x80;
- if (_globals[kProgressJacket] == 2 && !getCharacter(kCharacterAnna).inventoryItem && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
+ if (_globals[kGlobalJacket] == 2 && !getCharacter(kCharacterAnna).inventoryItem && !_doneNIS[kEventAnnaGiveScarfAsk] && !_doneNIS[kEventAnnaGiveScarfDinerAsk] && !_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
getCharacter(kCharacterAnna).inventoryItem = 8;
}
@@ -1651,7 +1651,7 @@ void LogicManager::HAND_Anna_WaitAugust(HAND_PARAMS) {
}
getCharacter(kCharacterAnna).inventoryItem &= ~0x80;
- if (_globals[kProgressJacket] == 2 &&
+ if (_globals[kGlobalJacket] == 2 &&
!_doneNIS[kEventAnnaGiveScarfAsk] &&
!_doneNIS[kEventAnnaGiveScarfDinerAsk] &&
!_doneNIS[kEventAnnaGiveScarfSalonAsk]) {
@@ -2994,7 +2994,7 @@ void LogicManager::HAND_Anna_Dressing(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressField48] != 0 && getCharacterCurrentParams(kCharacterAnna)[4] != 0x7FFFFFFF && _gameTime != 0) {
+ if (_globals[kGlobalMaxHasToStayInBaggage] != 0 && getCharacterCurrentParams(kCharacterAnna)[4] != 0x7FFFFFFF && _gameTime != 0) {
if (_gameTime > 2065500) {
getCharacterCurrentParams(kCharacterAnna)[4] = 0x7FFFFFFF;
CONS_Anna_GiveMaxToCond2(0, 0, 0, 0);
@@ -3889,7 +3889,7 @@ void LogicManager::HAND_Anna_InBagg(HAND_PARAMS) {
break;
case 12:
getCharacter(kCharacterAnna).characterPosition.car = kCarBaggage;
- _globals[kProgressField54] = 1;
+ _globals[kGlobalAnnaIsInBaggageCar] = 1;
break;
case 235856512:
getCharacterCurrentParams(kCharacterAnna)[0] = 1;
@@ -3964,13 +3964,13 @@ void LogicManager::HAND_Anna_BaggageFight(HAND_PARAMS) {
} else {
_gameTime += 1800;
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] = 3;
- AnnaCall(&LogicManager::CONS_Anna_SaveGame, 2, kEventAnnaBagagePart2, 0, 0);
+ AnnaCall(&LogicManager::CONS_Anna_SaveGame, 2, kEventAnnaBaggagePart2, 0, 0);
}
break;
case 3:
- playNIS(kEventAnnaBagagePart2);
+ playNIS(kEventAnnaBaggagePart2);
bumpCath(kCarBaggage, 96, 255);
- _globals[kProgressField54] = 0;
+ _globals[kGlobalAnnaIsInBaggageCar] = 0;
forceJump(kCharacterVesna, &LogicManager::CONS_Vesna_InComp);
_gameTime = 2266200;
CONS_Anna_PrepareVienna(0, 0, 0, 0);
@@ -4583,7 +4583,7 @@ void LogicManager::HAND_Anna_TiedUp(HAND_PARAMS) {
switch (msg->action) {
case 18:
if (getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] == 1) {
- if (_globals[kProgressFieldC]) {
+ if (_globals[kGlobalReadLetterInAugustSuitcase]) {
if (_doneNIS[kEventAnnaKissTrainHijacked]) {
playNIS(kEventAnnaBaggageTies2);
} else {
@@ -4852,7 +4852,7 @@ void LogicManager::HAND_Anna_FinalSequence(HAND_PARAMS) {
endGame(0, 1, 0, true);
break;
case 3:
- _globals[kProgressIsEggOpen] = 1;
+ _globals[kGlobalEggIsOpen] = 1;
if (whoRunningDialog(kCharacterAnna))
fadeDialog(kCharacterAnna);
@@ -4915,13 +4915,13 @@ void LogicManager::HAND_Anna_OpenFirebird(HAND_PARAMS) {
break;
case 224309120:
- _globals[kProgressIsEggOpen] = 0;
+ _globals[kGlobalEggIsOpen] = 0;
_gameTime = 4941000;
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] = 1;
AnnaCall(&LogicManager::CONS_Anna_SaveGame, 2, kEventKronosGiveFirebird, 0, 0);
break;
case 270751616:
- _globals[kProgressIsEggOpen] = 0;
+ _globals[kGlobalEggIsOpen] = 0;
killGracePeriod();
_gameTime = 4941000;
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] = 2;
diff --git a/engines/lastexpress/characters/august.cpp b/engines/lastexpress/characters/august.cpp
index a6058aeb6c8..45556fee9c6 100644
--- a/engines/lastexpress/characters/august.cpp
+++ b/engines/lastexpress/characters/august.cpp
@@ -583,7 +583,7 @@ void LogicManager::HAND_August_DoWalk(HAND_PARAMS) {
break;
case 5:
- if (_globals[kProgressEventMetAugust]) {
+ if (_globals[kGlobalMetAugust]) {
if (rnd(2) == 0) {
playDialog(kCharacterCath, "CAT1002A", -1, 0);
} else {
@@ -756,7 +756,7 @@ void LogicManager::HAND_August_EnterComp(HAND_PARAMS) {
break;
case 12:
getCharacter(kCharacterAugust).inventoryItem = 0;
- switch (_globals[kProgressChapter]) {
+ switch (_globals[kGlobalChapter]) {
case 1:
Common::strcpy_s((char *)&getCharacterCurrentParams(kCharacterAugust)[2], 12, "626");
break;
@@ -845,7 +845,7 @@ void LogicManager::CONS_August_ExitComp(CONS_PARAMS) {
void LogicManager::HAND_August_ExitComp(HAND_PARAMS) {
switch (msg->action) {
case 12:
- switch (_globals[kProgressChapter]) {
+ switch (_globals[kGlobalChapter]) {
case 1:
Common::strcpy_s((char *)&getCharacterCurrentParams(kCharacterAugust)[1], 12, "626");
break;
@@ -884,7 +884,7 @@ void LogicManager::HAND_August_ExitComp(HAND_PARAMS) {
Common::strcat_s((char *)&getCharacterCurrentParams(kCharacterAugust)[4], 12, "Pc");
startCycOtis(kCharacterAugust, (char *)&getCharacterCurrentParams(kCharacterAugust)[4]);
softBlockAtDoor(kCharacterAugust, 3);
- if (_globals[kProgressChapter] == 3 && _gameTime < 1998000) {
+ if (_globals[kGlobalChapter] == 3 && _gameTime < 1998000) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 2;
AugustCall(&LogicManager::CONS_August_DoDialog, "AUG2094", 0, 0, 0);
} else {
@@ -941,14 +941,14 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterAugust)[7] ||
(getCharacterCurrentParams(kCharacterAugust)[7] = _realTime + 75, _realTime != -75)) {
if (getCharacterCurrentParams(kCharacterAugust)[7] >= _realTime) {
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
if (getCharacterCurrentParams(kCharacterAugust)[5] != 0) {
if (getCharacterCurrentParams(kCharacterAugust)[8] ||
(getCharacterCurrentParams(kCharacterAugust)[8] = _gameTime + 6300, _gameTime != -6300)) {
if (getCharacterCurrentParams(kCharacterAugust)[8] >= _gameTime) {
- if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kProgressEventMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kProgressField14]) {
- _globals[kProgressField14] = 2;
+ if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kGlobalMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kGlobalCharacterSearchingForCath]) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterAugust;
getCharacter(kCharacterAugust).characterPosition.location = 0;
getCharacter(kCharacterAugust).characterPosition.position = 8200;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 1;
@@ -965,8 +965,8 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[8] = 0;
}
- if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kProgressEventMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kProgressField14]) {
- _globals[kProgressField14] = 2;
+ if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kGlobalMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kGlobalCharacterSearchingForCath]) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterAugust;
getCharacter(kCharacterAugust).characterPosition.location = 0;
getCharacter(kCharacterAugust).characterPosition.position = 8200;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 1;
@@ -983,7 +983,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[1] = 0;
getCharacterCurrentParams(kCharacterAugust)[2] = 1;
- if (_globals[kProgressEventMetAugust] || _globals[kProgressJacket] != 2) {
+ if (_globals[kGlobalMetAugust] || _globals[kGlobalJacket] != 2) {
setDoor(3, kCharacterAugust, 1, 0, 0);
} else {
setDoor(3, kCharacterAugust, 1, 0, 9);
@@ -992,14 +992,14 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[7] = 0;
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
if (getCharacterCurrentParams(kCharacterAugust)[5] != 0) {
if (getCharacterCurrentParams(kCharacterAugust)[8] ||
(getCharacterCurrentParams(kCharacterAugust)[8] = _gameTime + 6300, _gameTime != -6300)) {
if (getCharacterCurrentParams(kCharacterAugust)[8] >= _gameTime) {
- if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kProgressEventMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kProgressField14]) {
- _globals[kProgressField14] = 2;
+ if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kGlobalMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kGlobalCharacterSearchingForCath]) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterAugust;
getCharacter(kCharacterAugust).characterPosition.location = 0;
getCharacter(kCharacterAugust).characterPosition.position = 8200;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 1;
@@ -1016,8 +1016,8 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[8] = 0;
}
- if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kProgressEventMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kProgressField14]) {
- _globals[kProgressField14] = 2;
+ if (!getCharacterCurrentParams(kCharacterAugust)[3] && !_globals[kGlobalMetAugust] && !getCharacterCurrentParams(kCharacterAugust)[5] && getCharacterCurrentParams(kCharacterAugust)[0] - 4500 > _gameTime && !_globals[kGlobalCharacterSearchingForCath]) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterAugust;
getCharacter(kCharacterAugust).characterPosition.location = 0;
getCharacter(kCharacterAugust).characterPosition.position = 8200;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 1;
@@ -1028,7 +1028,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
break;
case 8:
case 9:
- if (msg->action == 9 && _globals[kProgressChapter] == 1 && !_globals[kProgressEventMetAugust] && _globals[kProgressJacket] == 2) {
+ if (msg->action == 9 && _globals[kGlobalChapter] == 1 && !_globals[kGlobalMetAugust] && _globals[kGlobalJacket] == 2) {
setDoor(9, kCharacterCath, 0, 255, 255);
getCharacter(kCharacterCath).characterPosition.location = 1;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 6;
@@ -1093,8 +1093,9 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
AugustCall(&LogicManager::CONS_August_EnterComp, 0, 0, 0, 0);
break;
case 5:
- if (_globals[kProgressField14] == 2)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterAugust)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
+
getCharacterCurrentParams(kCharacterAugust)[5] = 1;
getCharacterCurrentParams(kCharacterAugust)[1] = 0;
getCharacterCurrentParams(kCharacterAugust)[2] = 0;
@@ -1108,7 +1109,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
else
playNIS(kEventMeetAugustHisCompartment);
- _globals[kProgressEventMetAugust] = 1;
+ _globals[kGlobalMetAugust] = 1;
setDoor(3, 2, 1, 0, 0);
getCharacterCurrentParams(kCharacterAugust)[1] = 0;
getCharacterCurrentParams(kCharacterAugust)[2] = 1;
@@ -1129,7 +1130,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
break;
case 2:
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 10;
- if (!_globals[kProgressEventMetAugust]) {
+ if (!_globals[kGlobalMetAugust]) {
AugustCall(&LogicManager::CONS_August_DoDialog, "AUG1128G", 0, 0, 0);
} else {
AugustCall(&LogicManager::CONS_August_DoDialog, "AUG1128E", 0, 0, 0);
@@ -1138,7 +1139,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
break;
case 3:
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 11;
- if (!_globals[kProgressEventMetAugust]) {
+ if (!_globals[kGlobalMetAugust]) {
AugustCall(&LogicManager::CONS_August_DoDialog, "AUG1128H", 0, 0, 0);
} else {
AugustCall(&LogicManager::CONS_August_DoDialog, "AUG1128F", 0, 0, 0);
@@ -1146,7 +1147,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
break;
default:
- if (_globals[kProgressEventMetAugust] || _globals[kProgressJacket] != 2) {
+ if (_globals[kGlobalMetAugust] || _globals[kGlobalJacket] != 2) {
setDoor(3, kCharacterAugust, 1, 14, 0);
} else {
setDoor(3, kCharacterAugust, 1, 14, 9);
@@ -1160,7 +1161,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
case 9:
case 10:
case 11:
- if (_globals[kProgressEventMetAugust] || _globals[kProgressJacket] != 2) {
+ if (_globals[kGlobalMetAugust] || _globals[kGlobalJacket] != 2) {
setDoor(3, kCharacterAugust, 1, 14, 0);
} else {
setDoor(3, kCharacterAugust, 1, 14, 9);
@@ -1170,7 +1171,7 @@ void LogicManager::HAND_August_CompLogic(HAND_PARAMS) {
break;
case 12:
case 13:
- if (_globals[kProgressEventMetAugust] || _globals[kProgressJacket] != 2) {
+ if (_globals[kGlobalMetAugust] || _globals[kGlobalJacket] != 2) {
setDoor(3, kCharacterAugust, 1, 0, 0);
} else {
setDoor(3, kCharacterAugust, 1, 0, 9);
@@ -1254,7 +1255,7 @@ void LogicManager::HAND_August_Birth(HAND_PARAMS) {
getCharacter(kCharacterAugust).characterPosition.location = 1;
getCharacter(kCharacterAugust).characterPosition.car = kCarRestaurant;
getCharacter(kCharacterAugust).clothes = 0;
- _globals[kProgressEventMetAugust] = 0;
+ _globals[kGlobalMetAugust] = 0;
break;
default:
break;
@@ -1276,7 +1277,7 @@ void LogicManager::CONS_August_KnockTyler(CONS_PARAMS) {
void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressField14] == 29 || _globals[kProgressField14] == 3) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice || _globals[kGlobalCharacterSearchingForCath] == kCharacterCond1) {
if (getCharacterCurrentParams(kCharacterAugust)[2]) {
getCharacter(kCharacterAugust).characterPosition.location = 0;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 2;
@@ -1307,7 +1308,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[11] = _realTime + 75;
if (_realTime == -75) {
softReleaseAtDoor(kCharacterAugust, 1);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 9;
AugustCall(&LogicManager::CONS_August_DoCorrOtis, "626Da", 1, 0, 0);
} else if (checkLoc(kCharacterCath, kCarGreenSleeping)) {
@@ -1327,7 +1328,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterAugust)[11] < _realTime) {
getCharacterCurrentParams(kCharacterAugust)[11] = 0x7FFFFFFF;
softReleaseAtDoor(kCharacterAugust, 1);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 9;
AugustCall(&LogicManager::CONS_August_DoCorrOtis, "626Da", 1, 0, 0);
} else if (checkLoc(kCharacterCath, kCarGreenSleeping)) {
@@ -1392,7 +1393,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
setDoor(1, kCharacterAugust, checkDoor(1), getCharacterCurrentParams(kCharacterAugust)[3] == 0 ? 14 : 0, 9);
getCharacterCurrentParams(kCharacterAugust)[9] = 0;
- } else if (!_globals[kProgressEventCorpseMovedFromFloor] || _globals[kProgressJacket] == 1) {
+ } else if (!_globals[kGlobalCorpseMovedFromFloor] || _globals[kGlobalJacket] == 1) {
setDoor(9, 0, 0, 255, 255);
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 3;
AugustCall(&LogicManager::CONS_August_SaveGame, 2, kEventAugustFindCorpse, 0, 0);
@@ -1420,7 +1421,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
break;
case 9:
- if (!_globals[kProgressEventCorpseMovedFromFloor] || _globals[kProgressJacket] == 1) {
+ if (!_globals[kGlobalCorpseMovedFromFloor] || _globals[kGlobalJacket] == 1) {
setDoor(9, kCharacterCath, 0, 255, 255);
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 13;
AugustCall(&LogicManager::CONS_August_SaveGame, 2, kEventAugustFindCorpse, 0, 0);
@@ -1475,11 +1476,11 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
playNIS(kEventAugustFindCorpse);
if (_doneNIS[kEventDinerAugustOriginalJacket]) {
- endGame(3, 4, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
- } else if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ endGame(3, 4, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
+ } else if (_globals[kGlobalCorpseMovedFromFloor]) {
endGame(0, 1, 55, true);
} else {
- endGame(0, 1, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
+ endGame(0, 1, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
}
break;
@@ -1490,7 +1491,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
getCharacter(kCharacterAugust).characterPosition.location = 1;
playNIS(getCharacterCurrentParams(kCharacterAugust)[6]);
playDialog(0, "LIB015", -1, 0);
- _globals[kProgressEventMetAugust] = 1;
+ _globals[kGlobalMetAugust] = 1;
getCharacter(kCharacterAugust).characterPosition.location = 0;
bumpCathTylerComp();
@@ -1513,7 +1514,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[11] = _realTime + 75;
if (_realTime == -75) {
softReleaseAtDoor(kCharacterAugust, 1);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 9;
AugustCall(&LogicManager::CONS_August_DoCorrOtis, "626Da", 1, 0, 0);
} else if (checkLoc(kCharacterCath, kCarGreenSleeping)) {
@@ -1533,7 +1534,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterAugust)[11] < _realTime) {
getCharacterCurrentParams(kCharacterAugust)[11] = 0x7FFFFFFF;
softReleaseAtDoor(kCharacterAugust, 1);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 9;
AugustCall(&LogicManager::CONS_August_DoCorrOtis, "626Da", 1, 0, 0);
} else if (checkLoc(kCharacterCath, kCarGreenSleeping)) {
@@ -1578,9 +1579,9 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
case 11:
playNIS(kEventAugustFindCorpse);
if (_doneNIS[kEventDinerAugustOriginalJacket]) {
- endGame(3, 4, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
+ endGame(3, 4, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
} else {
- endGame(0, 1, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
+ endGame(0, 1, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
}
break;
@@ -1601,11 +1602,11 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
playNIS(kEventAugustFindCorpse);
if (_doneNIS[kEventDinerAugustOriginalJacket]) {
- endGame(3, 4, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
- } else if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ endGame(3, 4, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
+ } else if (_globals[kGlobalCorpseMovedFromFloor]) {
endGame(0, 1, 55, true);
} else {
- endGame(0, 1, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
+ endGame(0, 1, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
}
break;
@@ -1621,7 +1622,7 @@ void LogicManager::HAND_August_KnockTyler(HAND_PARAMS) {
setDoor(1, kCharacterCath, 0, 10, 9);
setDoor(9, kCharacterCath, 0, 255, 255);
playNIS(getCharacterCurrentParams(kCharacterAugust)[6]);
- _globals[kProgressEventMetAugust] = 1;
+ _globals[kGlobalMetAugust] = 1;
getCharacter(kCharacterAugust).characterPosition.location = 0;
bumpCathTylerComp();
@@ -1673,7 +1674,7 @@ void LogicManager::HAND_August_DoNIS1006(HAND_PARAMS) {
else
playNIS(kEventDinerAugust);
- _globals[kProgressEventMetAugust] = 1;
+ _globals[kGlobalMetAugust] = 1;
bumpCath(kCarRestaurant, 61, 255);
getCharacter(kCharacterAugust).currentCall--;
@@ -1700,7 +1701,7 @@ void LogicManager::CONS_August_WaitTyler(CONS_PARAMS) {
void LogicManager::HAND_August_WaitTyler(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (!getCharacterCurrentParams(kCharacterAugust)[0] && _globals[kProgressEventFoundCorpse]) {
+ if (!getCharacterCurrentParams(kCharacterAugust)[0] && _globals[kGlobalFoundCorpse]) {
send(kCharacterAugust, kCharacterHeadWait, 239072064, 0);
getCharacterCurrentParams(kCharacterAugust)[0] = 1;
}
@@ -1725,7 +1726,7 @@ void LogicManager::HAND_August_WaitTyler(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[1] = 0;
getCharacter(kCharacterAugust).inventoryItem = 0;
send(kCharacterAugust, kCharacterHeadWait, 191604416, 0);
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 3;
AugustCall(&LogicManager::CONS_August_DoNIS1006, 0, 0, 0, 0);
} else {
@@ -1738,7 +1739,7 @@ void LogicManager::HAND_August_WaitTyler(HAND_PARAMS) {
send(kCharacterAugust, kCharacterTableD, 136455232, 0);
startCycOtis(kCharacterAugust, "010B");
- if (!_globals[kProgressEventMetAugust])
+ if (!_globals[kGlobalMetAugust])
getCharacterCurrentParams(kCharacterAugust)[1] = 128;
getCharacter(kCharacterAugust).inventoryItem = getCharacterCurrentParams(kCharacterAugust)[1];
@@ -1781,7 +1782,7 @@ void LogicManager::HAND_August_WaitTyler(HAND_PARAMS) {
AugustCall(&LogicManager::CONS_August_FinishSeqOtis, 0, 0, 0, 0);
break;
case 6:
- _globals[kProgressField14] = 2;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterAugust;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 7;
AugustCall(&LogicManager::CONS_August_DoWalk, 3, 8200, 0, 0);
break;
@@ -1821,11 +1822,11 @@ void LogicManager::CONS_August_SeekTyler(CONS_PARAMS) {
void LogicManager::HAND_August_SeekTyler(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressEventMetAugust] || _globals[kProgressField14]) {
+ if (_globals[kGlobalMetAugust] || _globals[kGlobalCharacterSearchingForCath]) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 5;
AugustCall(&LogicManager::CONS_August_DoWalk, 3, 6470, 0, 0);
} else {
- _globals[kProgressField14] = 2;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterAugust;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 1;
AugustCall(&LogicManager::CONS_August_DoWalk, 3, 8200, 0, 0);
}
@@ -1846,8 +1847,8 @@ void LogicManager::HAND_August_SeekTyler(HAND_PARAMS) {
AugustCall(&LogicManager::CONS_August_EnterComp, 0, 0, 0, 0);
break;
case 4:
- if (_globals[kProgressField14] == 2)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterAugust)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 7;
AugustCall(&LogicManager::CONS_August_CompLogic, _gameTime + 900, 0, 0, 0);
@@ -1945,7 +1946,7 @@ void LogicManager::HAND_August_OrderDinner(HAND_PARAMS) {
AugustCall(&LogicManager::CONS_August_DoNIS1006, 0, 0, 0, 0);
break;
case 12:
- if (!_globals[kProgressEventMetAugust] && _globals[kProgressJacket] == 2)
+ if (!_globals[kGlobalMetAugust] && _globals[kGlobalJacket] == 2)
getCharacterCurrentParams(kCharacterAugust)[0] = 128;
startCycOtis(kCharacterAugust, "010B");
@@ -2001,13 +2002,13 @@ void LogicManager::CONS_August_EatingDinner(CONS_PARAMS) {
void LogicManager::HAND_August_EatingDinner(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressField28] && !getCharacterCurrentParams(kCharacterAugust)[1] && getCharacterCurrentParams(kCharacterAugust)[2] != 0x7FFFFFFF && _gameTime) {
+ if (_globals[kGlobalAnnaIsEating] && !getCharacterCurrentParams(kCharacterAugust)[1] && getCharacterCurrentParams(kCharacterAugust)[2] != 0x7FFFFFFF && _gameTime) {
if (_gameTime <= 1134000) {
if (!inDiningRoom(kCharacterCath) || dialogRunning("MRB1076") || dialogRunning("MRB1078") || dialogRunning("MRB1078A") || !getCharacterCurrentParams(kCharacterAugust)[2]) {
getCharacterCurrentParams(kCharacterAugust)[2] = _gameTime + 225;
if (_gameTime == -225) {
getCharacter(kCharacterAugust).inventoryItem = 0;
- _globals[kProgressField28] = 0;
+ _globals[kGlobalAnnaIsEating] = 0;
CONS_August_GreetAnna(0, 0, 0, 0);
break;
}
@@ -2019,7 +2020,7 @@ void LogicManager::HAND_August_EatingDinner(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterAugust)[2] = 0x7FFFFFFF;
getCharacter(kCharacterAugust).inventoryItem = 0;
- _globals[kProgressField28] = 0;
+ _globals[kGlobalAnnaIsEating] = 0;
CONS_August_GreetAnna(0, 0, 0, 0);
}
@@ -2031,7 +2032,7 @@ void LogicManager::HAND_August_EatingDinner(HAND_PARAMS) {
AugustCall(&LogicManager::CONS_August_DoNIS1006, 0, 0, 0, 0);
break;
case 12:
- if (!_globals[kProgressEventMetAugust] && _globals[kProgressJacket] == 2)
+ if (!_globals[kGlobalMetAugust] && _globals[kGlobalJacket] == 2)
getCharacterCurrentParams(kCharacterAugust)[0] = 128;
getCharacter(kCharacterAugust).inventoryItem = getCharacterCurrentParams(kCharacterAugust)[0];
@@ -2093,7 +2094,7 @@ void LogicManager::HAND_August_GreetAnna(HAND_PARAMS) {
} else if (getCharacterCurrentParams(kCharacterAugust)[1]) {
getCharacterCurrentParams(kCharacterAugust)[1] = 0;
- if (_globals[kProgressEventMetAugust])
+ if (_globals[kGlobalMetAugust])
getCharacter(kCharacterAugust).inventoryItem = 0;
playDialog(kCharacterAugust, "AUG1003A", -1, 0);
@@ -2129,12 +2130,12 @@ void LogicManager::HAND_August_GreetAnna(HAND_PARAMS) {
playDialog(kCharacterAugust, "AUG1003", -1, 0);
if (inDiningRoom(kCharacterCath))
- _globals[kProgressField60] = 1;
+ _globals[kGlobalOverheardAugustInterruptingAnnaAtDinner] = 1;
getCharacterCurrentParams(kCharacterAugust)[1] = 1;
break;
case 4:
- if (_globals[kProgressEventMetAugust]) {
+ if (_globals[kGlobalMetAugust]) {
playNIS(kEventAugustPresentAnna);
send(kCharacterAugust, kCharacterAnna, 201437056, 0);
startSeqOtis(kCharacterAugust, "803GS");
@@ -2212,7 +2213,7 @@ void LogicManager::HAND_August_ReturnFromDinner(HAND_PARAMS) {
break;
case 3:
case 4:
- if (_globals[kProgressField14] == 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 4;
AugustCall(&LogicManager::CONS_August_CompLogic, _gameTime + 900, 0, 0, 0);
} else {
@@ -2394,7 +2395,7 @@ void LogicManager::CONS_August_BackFromSalon(CONS_PARAMS) {
void LogicManager::HAND_August_BackFromSalon(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressEventMetAugust]) {
+ if (_globals[kGlobalMetAugust]) {
getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] = 1;
AugustCall(&LogicManager::CONS_August_CompLogic, _gameTime + 9000, 0, 0, 0);
} else {
@@ -2428,7 +2429,7 @@ void LogicManager::CONS_August_Asleep(CONS_PARAMS) {
void LogicManager::HAND_August_Asleep(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (!whoRunningDialog(kCharacterAugust) && _globals[kProgressField18] != 4) {
+ if (!whoRunningDialog(kCharacterAugust) && _globals[kGlobalPhaseOfTheNight] != 4) {
playDialog(kCharacterAugust, "AUG1057", -1, 0);
}
@@ -2840,7 +2841,7 @@ void LogicManager::HAND_August_DoWalkP3A(HAND_PARAMS) {
break;
case 5:
- if (_globals[kProgressEventMetAugust]) {
+ if (_globals[kGlobalMetAugust]) {
if (rnd(2) == 0) {
playDialog(kCharacterCath, "CAT1002A", -1, 0);
} else {
@@ -3530,7 +3531,7 @@ void LogicManager::CONS_August_InSalon3(CONS_PARAMS) {
void LogicManager::HAND_August_InSalon3(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (!getCharacterCurrentParams(kCharacterAugust)[3] || getCharacterCurrentParams(kCharacterAugust)[1] || _globals[kProgressField44]) {
+ if (!getCharacterCurrentParams(kCharacterAugust)[3] || getCharacterCurrentParams(kCharacterAugust)[1] || _globals[kGlobalKahinaKillTimeoutActive]) {
getCharacter(kCharacterAugust).inventoryItem = 0;
} else {
getCharacter(kCharacterAugust).inventoryItem = 0x80;
@@ -4368,7 +4369,7 @@ void LogicManager::HAND_August_CutLoose(HAND_PARAMS) {
break;
case 18:
if (getCharacter(kCharacterAugust).callbacks[getCharacter(kCharacterAugust).currentCall + 8] == 1) {
- if (_globals[kProgressFieldC])
+ if (_globals[kGlobalReadLetterInAugustSuitcase])
playNIS(kEventAugustUnhookCarsBetrayal);
else
playNIS(kEventAugustUnhookCars);
diff --git a/engines/lastexpress/characters/clerk.cpp b/engines/lastexpress/characters/clerk.cpp
index b1865ea6d3f..3d622685599 100644
--- a/engines/lastexpress/characters/clerk.cpp
+++ b/engines/lastexpress/characters/clerk.cpp
@@ -266,8 +266,8 @@ void LogicManager::HAND_Clerk_DoHaremKnock(HAND_PARAMS) {
break;
}
- _globals[kProgressFieldDC] = 1;
- _globals[kProgressFieldE0] = 1;
+ _globals[kGlobalMetAlouan] = 1;
+ _globals[kGlobalMetFatima] = 1;
} else {
if (getCharacterCurrentParams(kCharacterClerk)[5] && getCharacterCurrentParams(kCharacterClerk)[6]) {
getCharacterParams(kCharacterClerk, 8)[5]++;
@@ -296,7 +296,7 @@ void LogicManager::HAND_Clerk_DoHaremKnock(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterClerk)[7] = 1;
}
- _globals[kProgressFieldE0] = 1;
+ _globals[kGlobalMetFatima] = 1;
} else {
if (getCharacterCurrentParams(kCharacterClerk)[5]) {
@@ -319,7 +319,7 @@ void LogicManager::HAND_Clerk_DoHaremKnock(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterClerk)[7] = 1;
}
- _globals[kProgressFieldDC] = 1;
+ _globals[kGlobalMetAlouan] = 1;
} else {
if (getCharacterCurrentParams(kCharacterClerk)[6]) {
getCharacterParams(kCharacterClerk, 8)[3]++;
@@ -374,7 +374,7 @@ void LogicManager::HAND_Clerk_Processing(HAND_PARAMS) {
if (!getCharacterCurrentParams(kCharacterClerk)[4]) {
getCharacterCurrentParams(kCharacterClerk)[3]--;
- if (!getCharacterCurrentParams(kCharacterClerk)[3] && _globals[kProgressJacket] == 2) {
+ if (!getCharacterCurrentParams(kCharacterClerk)[3] && _globals[kGlobalJacket] == 2) {
if (isNight()) {
playNIS(kEventCathSmokeNight);
} else {
@@ -490,7 +490,7 @@ void LogicManager::HAND_Clerk_Processing(HAND_PARAMS) {
break;
case 12:
getCharacterCurrentParams(kCharacterClerk)[2] = 1;
- if (_globals[kProgressChapter] < 5) {
+ if (_globals[kGlobalChapter] < 5) {
setDoor(5, kCharacterClerk, 3, 10, 9);
setDoor(6, kCharacterClerk, 3, 10, 9);
setDoor(7, kCharacterClerk, 3, 10, 9);
@@ -518,7 +518,7 @@ void LogicManager::HAND_Clerk_Processing(HAND_PARAMS) {
switch (getCharacter(kCharacterCath).characterPosition.car) {
case 1:
case 6:
- if (_globals[kProgressIsDayTime]) {
+ if (_globals[kGlobalIsDayTime]) {
startCycOtis(kCharacterClerk, "B1WNM");
} else if (isNight()) {
startCycOtis(kCharacterClerk, "B1WNN");
@@ -529,7 +529,7 @@ void LogicManager::HAND_Clerk_Processing(HAND_PARAMS) {
break;
case 3:
case 4:
- if (_globals[kProgressIsDayTime]) {
+ if (_globals[kGlobalIsDayTime]) {
startCycOtis(kCharacterClerk, "S1WNM");
} else if (isNight()) {
startCycOtis(kCharacterClerk, "S1WNN");
@@ -539,7 +539,7 @@ void LogicManager::HAND_Clerk_Processing(HAND_PARAMS) {
break;
case 5:
- if (_globals[kProgressIsDayTime]) {
+ if (_globals[kGlobalIsDayTime]) {
startCycOtis(kCharacterClerk, "RCWNM");
} else if (isNight()) {
startCycOtis(kCharacterClerk, "RCWNN");
@@ -562,7 +562,7 @@ void LogicManager::HAND_Clerk_Processing(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterClerk)[4] = 0;
}
- if (_globals[kProgressJacket] != 1) {
+ if (_globals[kGlobalJacket] != 1) {
if (getCharacterCurrentParams(kCharacterClerk)[7] && !inComp(kCharacterCath, getCharacterCurrentParams(kCharacterClerk)[8], getCharacterCurrentParams(kCharacterClerk)[9]) && !inComp(kCharacterCath, getCharacterCurrentParams(kCharacterClerk)[8], getCharacterCurrentParams(kCharacterClerk)[10])) {
if (dialogRunning((char *)&getCharacterCurrentParams(kCharacterClerk)[11]))
fadeDialog((char *)&getCharacterCurrentParams(kCharacterClerk)[11]);
diff --git a/engines/lastexpress/characters/cond1.cpp b/engines/lastexpress/characters/cond1.cpp
index 79004412700..4de5a51f096 100644
--- a/engines/lastexpress/characters/cond1.cpp
+++ b/engines/lastexpress/characters/cond1.cpp
@@ -106,7 +106,7 @@ void LogicManager::CONS_Cond1_DoSeqOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoSeqOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -152,7 +152,7 @@ void LogicManager::CONS_Cond1_DoCorrOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoCorrOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -200,7 +200,7 @@ void LogicManager::CONS_Cond1_DoBriefCorrOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoBriefCorrOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -251,7 +251,7 @@ void LogicManager::CONS_Cond1_DoEnterCorrOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoEnterCorrOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
@@ -311,7 +311,7 @@ void LogicManager::HAND_Cond1_FinishSeqOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
if (getCharacter(kCharacterCond1).direction == 4) {
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -357,7 +357,7 @@ void LogicManager::CONS_Cond1_DoDialog(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoDialog(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -401,7 +401,7 @@ void LogicManager::CONS_Cond1_DoDialogFullVol(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoDialogFullVol(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -500,13 +500,13 @@ void LogicManager::HAND_Cond1_DoWalk(HAND_PARAMS) {
break;
}
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
- } else if ((getCharacterParams(kCharacterCond1, 8)[5] || getCharacterParams(kCharacterCond1, 8)[6]) && !_doneNIS[kEventKronosConversation] && _globals[kProgressJacket] == 2) {
+ } else if ((getCharacterParams(kCharacterCond1, 8)[5] || getCharacterParams(kCharacterCond1, 8)[6]) && !_doneNIS[kEventKronosConversation] && _globals[kGlobalJacket] == 2) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 2;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensKronosInvitation, 0, 0);
- } else if (getCharacterParams(kCharacterCond1, 8)[9] && _globals[kProgressJacket] == 2 && !_globals[kProgressEventMetAugust]) {
+ } else if (getCharacterParams(kCharacterCond1, 8)[9] && _globals[kGlobalJacket] == 2 && !_globals[kGlobalMetAugust]) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 3;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensAugustWaiting, 0, 0);
} else {
@@ -530,8 +530,8 @@ void LogicManager::HAND_Cond1_DoWalk(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterCond1)[2] = 0;
getCharacter(kCharacterCond1).inventoryItem = kItemNone;
- if (_globals[kProgressEventFoundCorpse] || _doneNIS[kEventMertensAskTylerCompartment] || _doneNIS[kEventMertensAskTylerCompartmentD]) {
- if (getCharacterParams(kCharacterCond1, 8)[3] && _globals[kProgressJacket] == 2 && !_doneNIS[kEventMertensDontMakeBed] && !_globals[kProgressEventCorpseThrown]) {
+ if (_globals[kGlobalFoundCorpse] || _doneNIS[kEventMertensAskTylerCompartment] || _doneNIS[kEventMertensAskTylerCompartmentD]) {
+ if (getCharacterParams(kCharacterCond1, 8)[3] && _globals[kGlobalJacket] == 2 && !_doneNIS[kEventMertensDontMakeBed] && !_globals[kGlobalCorpseHasBeenThrown]) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 6;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensDontMakeBed, 0, 0);
}
@@ -548,7 +548,7 @@ void LogicManager::HAND_Cond1_DoWalk(HAND_PARAMS) {
playChrExcuseMe(kCharacterCond1, kCharacterCath, 0);
break;
case 12:
- if ((!_globals[kProgressEventFoundCorpse] && !_doneNIS[kEventMertensAskTylerCompartment] && !_doneNIS[kEventMertensAskTylerCompartmentD]) || (getCharacterParams(kCharacterCond1, 8)[3] && _globals[kProgressJacket] == 2 && !_doneNIS[kEventMertensDontMakeBed] && !_globals[kProgressEventCorpseThrown])) {
+ if ((!_globals[kGlobalFoundCorpse] && !_doneNIS[kEventMertensAskTylerCompartment] && !_doneNIS[kEventMertensAskTylerCompartmentD]) || (getCharacterParams(kCharacterCond1, 8)[3] && _globals[kGlobalJacket] == 2 && !_doneNIS[kEventMertensDontMakeBed] && !_globals[kGlobalCorpseHasBeenThrown])) {
getCharacterCurrentParams(kCharacterCond1)[2] = 1;
}
@@ -572,7 +572,7 @@ void LogicManager::HAND_Cond1_DoWalk(HAND_PARAMS) {
playNIS(kEventMertensKronosInvitationClosedWindows);
}
- _globals[kProgressEventMertensChronosInvitation] = 1;
+ _globals[kGlobalKnowAboutKronos] = 1;
getCharacterParams(kCharacterCond1, 8)[6] = 0;
getCharacterParams(kCharacterCond1, 8)[5] = 0;
@@ -599,7 +599,7 @@ void LogicManager::HAND_Cond1_DoWalk(HAND_PARAMS) {
break;
case 3:
playNIS(kEventMertensAugustWaiting);
- _globals[kProgressEventMertensAugustWaiting] = 1;
+ _globals[kGlobalKnowAboutAugust] = 1;
getCharacterParams(kCharacterCond1, 8)[9] = 0;
if (getCharacterCurrentParams(kCharacterCond1)[0] == 3 && getCharacterCurrentParams(kCharacterCond1)[1] == 8200) {
@@ -684,7 +684,7 @@ void LogicManager::CONS_Cond1_DoWait(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DoWait(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
@@ -735,7 +735,7 @@ void LogicManager::HAND_Cond1_StandAsideDialog(HAND_PARAMS) {
if (!whoRunningDialog(kCharacterCond1)) {
if (isNight()) {
if (!isFemale(getCharacterCurrentParams(kCharacterCond1)[0])) {
- if (getCharacterCurrentParams(kCharacterCond1)[0] || _globals[kProgressField18] != 2) {
+ if (getCharacterCurrentParams(kCharacterCond1)[0] || _globals[kGlobalPhaseOfTheNight] != 2) {
playDialog(kCharacterCond1, "CON1112F", -1, 0);
} else {
switch (rnd(3)) {
@@ -804,7 +804,7 @@ void LogicManager::CONS_Cond1_Passing(CONS_PARAMS) {
void LogicManager::HAND_Cond1_Passing(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 4;
@@ -842,7 +842,7 @@ void LogicManager::HAND_Cond1_Passing(HAND_PARAMS) {
}
if (getCharacterCurrentParams(kCharacterCond1)[4] >= _realTime) {
- getCharacter(kCharacterCond1).inventoryItem = _globals[kProgressChapter] == 1 && !getCharacterParams(kCharacterCond1, 8)[16] && !_globals[kProgressEventFoundCorpse] && !_doneNIS[kEventMertensAskTylerCompartment] && !_doneNIS[kEventMertensAskTylerCompartmentD];
+ getCharacter(kCharacterCond1).inventoryItem = _globals[kGlobalChapter] == 1 && !getCharacterParams(kCharacterCond1, 8)[16] && !_globals[kGlobalFoundCorpse] && !_doneNIS[kEventMertensAskTylerCompartment] && !_doneNIS[kEventMertensAskTylerCompartmentD];
} else {
getCharacterCurrentParams(kCharacterCond1)[4] = 0x7FFFFFFF;
getCharacter(kCharacterCond1).inventoryItem = kItemNone;
@@ -871,7 +871,7 @@ void LogicManager::HAND_Cond1_Passing(HAND_PARAMS) {
break;
}
- if (_globals[kProgressChapter] == 3 && !getCharacterCurrentParams(kCharacterCond1)[0] && _gameTime < 2173500 && (_gameTime > 2106000 || (getCharacterCurrentParams(kCharacterCond1)[1] && _gameTime > 2079000))) {
+ if (_globals[kGlobalChapter] == 3 && !getCharacterCurrentParams(kCharacterCond1)[0] && _gameTime < 2173500 && (_gameTime > 2106000 || (getCharacterCurrentParams(kCharacterCond1)[1] && _gameTime > 2079000))) {
if (getCharacterCurrentParams(kCharacterCond1)[1] == 2) {
playDialog(kCharacterCond1, "CON3052", -1, 0);
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 3;
@@ -886,7 +886,7 @@ void LogicManager::HAND_Cond1_Passing(HAND_PARAMS) {
break;
}
if (!getCharacterCurrentParams(kCharacterCond1)[1]) {
- if (_globals[kProgressField40])
+ if (_globals[kGlobalConcertIsHappening])
playDialog(kCharacterCond1, "CON3054", -1, 0);
else
playDialog(kCharacterCond1, "CON3053", -1, 0);
@@ -913,7 +913,7 @@ void LogicManager::HAND_Cond1_Passing(HAND_PARAMS) {
}
return;
case 17:
- if (checkCathDir(kCarGreenSleeping, 23) && getCharacterParams(kCharacterCond1, 8)[6] && !_doneNIS[kProgressFieldCC]) {
+ if (checkCathDir(kCarGreenSleeping, 23) && getCharacterParams(kCharacterCond1, 8)[6] && !_doneNIS[kEventKronosConversation]) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 8;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensKronosInvitation, 0, 0);
} else {
@@ -994,7 +994,7 @@ void LogicManager::CONS_Cond1_Listen(CONS_PARAMS) {
void LogicManager::HAND_Cond1_Listen(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 &&
+ if (_globals[kGlobalJacket] == 1 &&
nearChar(kCharacterCond1, kCharacterCath, 1000) &&
!inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 4;
@@ -1863,10 +1863,10 @@ void LogicManager::HAND_Cond1_MakeBedAlexei(HAND_PARAMS) {
getCharacter(kCharacterCond1).characterPosition.location = 1;
endGraphics(kCharacterCond1);
- if (_globals[kProgressChapter] == 1 &&
+ if (_globals[kGlobalChapter] == 1 &&
getCharacterParams(kCharacterCond1, 8)[3] &&
- _globals[kProgressField14] != 29) {
- _globals[kProgressField14] = 3;
+ _globals[kGlobalCharacterSearchingForCath] != kCharacterPolice) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterCond1;
}
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 4;
@@ -1888,10 +1888,10 @@ void LogicManager::HAND_Cond1_MakeBedAlexei(HAND_PARAMS) {
getCharacter(kCharacterCond1).characterPosition.location = 1;
endGraphics(kCharacterCond1);
- if (_globals[kProgressChapter] == 1 &&
+ if (_globals[kGlobalChapter] == 1 &&
getCharacterParams(kCharacterCond1, 8)[3] &&
- _globals[kProgressField14] != 29) {
- _globals[kProgressField14] = 3;
+ _globals[kGlobalCharacterSearchingForCath] != kCharacterPolice) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterCond1;
}
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 7;
@@ -1946,9 +1946,9 @@ void LogicManager::CONS_Cond1_SubMakeBed(CONS_PARAMS) {
void LogicManager::HAND_Cond1_SubMakeBed(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (!_globals[kProgressEventCorpseThrown] &&
+ if (!_globals[kGlobalCorpseHasBeenThrown] &&
getCharacterCurrentParams(kCharacterCond1)[0] &&
- _globals[kProgressChapter] == 1 && _globals[kProgressJacket] == 2) {
+ _globals[kGlobalChapter] == 1 && _globals[kGlobalJacket] == 2) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 1, 0, 0, 0);
} else {
@@ -1975,10 +1975,10 @@ void LogicManager::HAND_Cond1_SubMakeBed(HAND_PARAMS) {
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
break;
case 3:
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 4;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
- } else if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ } else if (_globals[kGlobalCorpseMovedFromFloor]) {
blockAtDoor(kCharacterCond1, 1);
startSeqOtis(kCharacterCond1, "601Ra");
bumpCath(kCarGreenSleeping, 16, 255);
@@ -1996,7 +1996,7 @@ void LogicManager::HAND_Cond1_SubMakeBed(HAND_PARAMS) {
break;
case 5:
playNIS(kEventMertensCorpseFloor);
- endGame(0, 1, _globals[kProgressEventFoundCorpse] == kProgressField0 ? 56 : 50, true);
+ endGame(0, 1, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
break;
case 6:
releaseAtDoor(kCharacterCond1, 1);
@@ -2006,7 +2006,7 @@ void LogicManager::HAND_Cond1_SubMakeBed(HAND_PARAMS) {
Cond1Call(&LogicManager::CONS_Cond1_MakeBed, 1, 17, 0, 0);
break;
case 7:
- if (_globals[kProgressEventCorpseThrown] || _globals[kProgressChapter] != 1) {
+ if (_globals[kGlobalCorpseHasBeenThrown] || _globals[kGlobalChapter] != 1) {
if (nearChar(kCharacterCond1, kCharacterCath, 1000) && !whoOutside(kCharacterCath))
playDialog(kCharacterCond1, "CON1061", -1, 0);
@@ -2060,7 +2060,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
case 0:
case 10:
if (msg->action == 0) {
- if (_globals[kProgressField14] == 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice) {
getCharacter(kCharacterCond1).currentCall--;
_engine->getMessageManager()->setMessageHandle(kCharacterCond1, _functionsCond1[getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall]]);
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
@@ -2097,8 +2097,8 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
Cond1Call(&LogicManager::CONS_Cond1_DoDialogFullVol, "CON1018B", 0, 0, 0);
} else {
playDialog(0, "LIB014", -1, 0);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 13;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
} else if (getCharacterCurrentParams(kCharacterCond1)[0]) {
@@ -2162,8 +2162,8 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
playDialog(0, "LIB033", -1, 0);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 18;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
} else if (getCharacterCurrentParams(kCharacterCond1)[0]) {
@@ -2222,8 +2222,8 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
Cond1Call(&LogicManager::CONS_Cond1_DoDialogFullVol, "CON1018B", 0, 0, 0);
} else {
playDialog(0, "LIB014", -1, 0);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 13;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
} else if (getCharacterCurrentParams(kCharacterCond1)[0]) {
@@ -2310,8 +2310,8 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
playDialog(0, "LIB032", -1, 0);
}
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 27;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
} else if (getCharacterCurrentParams(kCharacterCond1)[0]) {
@@ -2378,7 +2378,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
case 18:
switch (getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8]) {
case 1:
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 4;
Cond1Call(&LogicManager::CONS_Cond1_DoCorrOtis, "601Ra", 1, 0, 0);
} else if (checkLoc(kCharacterCath, 3)) {
@@ -2400,7 +2400,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
case 17:
case 26:
playNIS(kEventMertensCorpseFloor);
- endGame(0, 1, _globals[kProgressEventFoundCorpse] == 0 ? 56 : 50, true);
+ endGame(0, 1, _globals[kGlobalFoundCorpse] == 0 ? 56 : 50, true);
return;
case 4:
setDoor(1, kCharacterCath, 1, 0, 0);
@@ -2413,7 +2413,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
}
- if (_globals[kProgressEventCorpseThrown] || _globals[kProgressChapter] != 1) {
+ if (_globals[kGlobalCorpseHasBeenThrown] || _globals[kGlobalChapter] != 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 6;
Cond1Call(&LogicManager::CONS_Cond1_MakeBed, 1, 17, 0, 0);
} else {
@@ -2463,8 +2463,8 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
playDialog(0, "LIB033", -1, 0);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 18;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
} else if (getCharacterCurrentParams(kCharacterCond1)[0]) {
@@ -2526,7 +2526,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
case 15:
playNIS(kEventMertensAugustWaitingCompartment);
- _globals[kProgressEventMertensAugustWaiting] = 1;
+ _globals[kGlobalKnowAboutAugust] = 1;
playDialog(0, "LIB015", -1, 0);
bumpCathTylerComp();
@@ -2536,7 +2536,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
case 16:
playNIS(kEventMertensKronosInvitationCompartment);
- _globals[kProgressEventMertensChronosInvitation] = 1;
+ _globals[kGlobalKnowAboutKronos] = 1;
playDialog(0, "LIB015", -1, 0);
bumpCathTylerComp();
@@ -2551,7 +2551,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
case 20:
playNIS(kEventMertensAugustWaitingCompartment);
- _globals[kProgressEventMertensAugustWaiting] = 1;
+ _globals[kGlobalKnowAboutAugust] = 1;
playDialog(0, "LIB015", -1, 0);
bumpCathTylerComp();
@@ -2561,7 +2561,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
case 21:
playNIS(kEventMertensKronosInvitationCompartment);
- _globals[kProgressEventMertensChronosInvitation] = 1;
+ _globals[kGlobalKnowAboutKronos] = 1;
playDialog(0, "LIB015", -1, 0);
bumpCathTylerComp();
@@ -2570,7 +2570,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
break;
case 23:
- _globals[kProgressEventMertensAugustWaiting] = 1;
+ _globals[kGlobalKnowAboutAugust] = 1;
setDoor(1, kCharacterCath, checkDoor(1), 10, 9);
getCharacter(kCharacterCond1).currentCall--;
@@ -2578,7 +2578,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
break;
case 24:
- _globals[kProgressEventMertensChronosInvitation] = 1;
+ _globals[kGlobalKnowAboutKronos] = 1;
setDoor(1, kCharacterCath, checkDoor(1), 10, 9);
getCharacter(kCharacterCond1).currentCall--;
@@ -2594,7 +2594,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
case 29:
playNIS(kEventMertensAugustWaitingCompartment);
- _globals[kProgressEventMertensAugustWaiting] = 1;
+ _globals[kGlobalKnowAboutAugust] = 1;
playDialog(0, "LIB015", -1, 0);
bumpCathTylerComp();
@@ -2604,7 +2604,7 @@ void LogicManager::HAND_Cond1_EnterTyler(HAND_PARAMS) {
break;
case 30:
playNIS(kEventMertensKronosInvitationCompartment);
- _globals[kProgressEventMertensChronosInvitation] = 1;
+ _globals[kGlobalKnowAboutKronos] = 1;
playDialog(0, "LIB015", -1, 0);
bumpCathTylerComp();
@@ -2785,14 +2785,14 @@ void LogicManager::HAND_Cond1_CathBuzzing(HAND_PARAMS) {
}
if (getCharacterCurrentParams(kCharacterCond1)[0] == 1) {
- if (_globals[kProgressField14]) {
+ if (_globals[kGlobalCharacterSearchingForCath]) {
getCharacter(kCharacterCond1).currentCall--;
_engine->getMessageManager()->setMessageHandle(kCharacterCond1, _functionsCond1[getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall]]);
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
break;
}
- _globals[kProgressField14] = 3;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterCond1;
}
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
@@ -2806,7 +2806,7 @@ void LogicManager::HAND_Cond1_CathBuzzing(HAND_PARAMS) {
return;
case 2:
if (getCharacterCurrentParams(kCharacterCond1)[0] == 1) {
- if (_globals[kProgressChapter] == 4)
+ if (_globals[kGlobalChapter] == 4)
send(kCharacterCond1, kCharacterTatiana, 238790488, 0);
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 3;
Cond1Call(&LogicManager::CONS_Cond1_EnterTyler, 3, 0, 0, 0);
@@ -2826,8 +2826,8 @@ void LogicManager::HAND_Cond1_CathBuzzing(HAND_PARAMS) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 6;
Cond1Call(&LogicManager::CONS_Cond1_DoCorrOtis, "601Mc", 3, 0, 0);
} else {
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 8;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -2835,8 +2835,8 @@ void LogicManager::HAND_Cond1_CathBuzzing(HAND_PARAMS) {
break;
case 3:
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 8;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -2853,8 +2853,8 @@ void LogicManager::HAND_Cond1_CathBuzzing(HAND_PARAMS) {
}
softReleaseAtDoor(kCharacterCond1, 2);
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 8;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -2871,8 +2871,8 @@ void LogicManager::HAND_Cond1_CathBuzzing(HAND_PARAMS) {
}
softReleaseAtDoor(kCharacterCond1, 3);
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 8;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -3205,12 +3205,12 @@ void LogicManager::CONS_Cond1_DeliverAugustMessage(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DeliverAugustMessage(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressField14] == 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice) {
getCharacter(kCharacterCond1).currentCall--;
_engine->getMessageManager()->setMessageHandle(kCharacterCond1, _functionsCond1[getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall]]);
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
} else {
- _globals[kProgressField14] = 3;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterCond1;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
Cond1Call(&LogicManager::CONS_Cond1_GetUp, 0, 0, 0, 0);
}
@@ -3224,11 +3224,11 @@ void LogicManager::HAND_Cond1_DeliverAugustMessage(HAND_PARAMS) {
break;
case 2:
if (!getCharacterParams(kCharacterCond1, 8)[9] ||
- _globals[kProgressEventMetAugust]) {
+ _globals[kGlobalMetAugust]) {
getCharacterParams(kCharacterCond1, 8)[9] = 0;
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 3;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -3249,10 +3249,10 @@ void LogicManager::HAND_Cond1_DeliverAugustMessage(HAND_PARAMS) {
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
break;
case 5:
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
- if (_globals[kProgressEventMertensAugustWaiting])
+ if (_globals[kGlobalKnowAboutAugust])
getCharacterParams(kCharacterCond1, 8)[9] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 6;
@@ -3286,12 +3286,12 @@ void LogicManager::CONS_Cond1_DeliverKronosMessage(CONS_PARAMS) {
void LogicManager::HAND_Cond1_DeliverKronosMessage(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressField14] == 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice) {
getCharacter(kCharacterCond1).currentCall--;
_engine->getMessageManager()->setMessageHandle(kCharacterCond1, _functionsCond1[getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall]]);
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
} else {
- _globals[kProgressField14] = 3;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterCond1;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
Cond1Call(&LogicManager::CONS_Cond1_GetUp, 0, 0, 0, 0);
}
@@ -3308,8 +3308,8 @@ void LogicManager::HAND_Cond1_DeliverKronosMessage(HAND_PARAMS) {
getCharacterParams(kCharacterCond1, 8)[5] = 0;
getCharacterParams(kCharacterCond1, 8)[6] = 0;
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 5;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -3328,8 +3328,8 @@ void LogicManager::HAND_Cond1_DeliverKronosMessage(HAND_PARAMS) {
getCharacterParams(kCharacterCond1, 8)[5] = 0;
getCharacterParams(kCharacterCond1, 8)[6] = 0;
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 5;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -3348,8 +3348,8 @@ void LogicManager::HAND_Cond1_DeliverKronosMessage(HAND_PARAMS) {
} else {
getCharacterParams(kCharacterCond1, 8)[5] = 0;
getCharacterParams(kCharacterCond1, 8)[6] = 0;
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 5;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
}
@@ -3366,10 +3366,10 @@ void LogicManager::HAND_Cond1_DeliverKronosMessage(HAND_PARAMS) {
fedEx(kCharacterCond1, kCharacterCond1, 18, 0);
break;
case 7:
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
- if (!_globals[kProgressEventMertensChronosInvitation])
+ if (!_globals[kGlobalKnowAboutKronos])
getCharacterParams(kCharacterCond1, 8)[6] = 1;
getCharacterParams(kCharacterCond1, 8)[5] = 0;
@@ -3473,7 +3473,7 @@ void LogicManager::CONS_Cond1_MakeBedTyler(CONS_PARAMS) {
void LogicManager::HAND_Cond1_MakeBedTyler(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (getCharacterParams(kCharacterCond1, 8)[3] && _globals[kProgressField14] != 29) {
+ if (getCharacterParams(kCharacterCond1, 8)[3] && _globals[kGlobalCharacterSearchingForCath] != kCharacterPolice) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 8200, 0, 0);
} else {
@@ -3558,8 +3558,8 @@ void LogicManager::HAND_Cond1_MakeAllBeds(HAND_PARAMS) {
Cond1Call(&LogicManager::CONS_Cond1_MakeBedTyler, 0, 0, 0, 0);
break;
case 8:
- if (_globals[kProgressField14] == 3)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterCond1)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 9;
Cond1Call(&LogicManager::CONS_Cond1_DoWalk, 3, 2000, 0, 0);
@@ -3700,7 +3700,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
}
if (getCharacterParams(kCharacterCond1, 8)[16] ||
- _globals[kProgressEventFoundCorpse] ||
+ _globals[kGlobalFoundCorpse] ||
_doneNIS[kEventMertensAskTylerCompartment] ||
_doneNIS[kEventMertensAskTylerCompartmentD]) {
getCharacter(kCharacterCond1).inventoryItem = kItemNone;
@@ -3775,7 +3775,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
break;
}
- if (_globals[kProgressField14] != 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] != kCharacterPolice) {
if (getCharacterParams(kCharacterCond1, 8)[13]) {
getCharacter(kCharacterCond1).inventoryItem = kItemNone;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 10;
@@ -3844,7 +3844,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterCond1)[0] || !getCharacterParams(kCharacterCond1, 8)[4]) {
if (getCharacterParams(kCharacterCond1, 8)[0] &&
- !whoRunningDialog(kCharacterCond1) && _globals[kProgressField18] != 4) {
+ !whoRunningDialog(kCharacterCond1) && _globals[kGlobalPhaseOfTheNight] != 4) {
playDialog(kCharacterCond1, "CON1505", -1, 0);
}
@@ -3881,7 +3881,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
if (checkCathDir(kCarGreenSleeping, 23) && getCharacterParams(kCharacterCond1, 8)[6] && !_doneNIS[kEventKronosConversation]) {
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 1;
Cond1Call(&LogicManager::CONS_Cond1_SaveGame, 2, kEventMertensKronosInvitation, 0, 0);
- } else if (!checkCathDir(kCarGreenSleeping, 23) || _globals[kProgressEventMertensChronosInvitation] || _doneNIS[kEventMertensLastCar] || _doneNIS[kEventMertensLastCarOriginalJacket]) {
+ } else if (!checkCathDir(kCarGreenSleeping, 23) || _globals[kGlobalKnowAboutKronos] || _doneNIS[kEventMertensLastCar] || _doneNIS[kEventMertensLastCarOriginalJacket]) {
if ((!checkCathDir(kCarGreenSleeping, 1) && !checkCathDir(kCarGreenSleeping, 23)) || getCharacterParams(kCharacterCond1, 8)[0] || getCharacterParams(kCharacterCond1, 8)[16]) {
if (cathInCorridor(kCarGreenSleeping) && getCharacter(kCharacterCond1).characterPosition.position < getCharacter(kCharacterCath).characterPosition.position && (_globals[1] == 1 || getCharacterParams(kCharacterCond1, 8)[6])) {
getCharacter(kCharacterCond1).inventoryItem = kItemNone;
@@ -3909,7 +3909,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
switch (getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8]) {
case 1:
playNIS(kEventMertensKronosInvitation);
- _globals[kProgressEventMertensChronosInvitation] = 1;
+ _globals[kGlobalKnowAboutKronos] = 1;
getCharacterParams(kCharacterCond1, 8)[5] = 0;
getCharacterParams(kCharacterCond1, 8)[6] = 0;
startSeqOtis(kCharacterCond1, "601A");
@@ -3941,7 +3941,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
break;
case 3:
- playNIS((kEventMertensLastCarOriginalJacket - (_globals[kProgressJacket] == 2)));
+ playNIS((kEventMertensLastCarOriginalJacket - (_globals[kGlobalJacket] == 2)));
startSeqOtis(kCharacterCond1, "601A");
bumpCath(kCarGreenSleeping, 6, 255);
takeItem(kItem7);
@@ -3991,7 +3991,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
// fall through
case 9:
- if (_globals[kProgressField14] != 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] != kCharacterPolice) {
if (getCharacterParams(kCharacterCond1, 8)[13]) {
getCharacter(kCharacterCond1).inventoryItem = kItemNone;
getCharacter(kCharacterCond1).callbacks[getCharacter(kCharacterCond1).currentCall + 8] = 10;
@@ -4060,7 +4060,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterCond1)[0] || !getCharacterParams(kCharacterCond1, 8)[4]) {
if (getCharacterParams(kCharacterCond1, 8)[0] &&
- !whoRunningDialog(kCharacterCond1) && _globals[kProgressField18] != 4) {
+ !whoRunningDialog(kCharacterCond1) && _globals[kGlobalPhaseOfTheNight] != 4) {
playDialog(kCharacterCond1, "CON1505", -1, 0);
}
@@ -4149,7 +4149,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
case 18:
if (getCharacterCurrentParams(kCharacterCond1)[0] || !getCharacterParams(kCharacterCond1, 8)[4]) {
if (getCharacterParams(kCharacterCond1, 8)[0] &&
- !whoRunningDialog(kCharacterCond1) && _globals[kProgressField18] != 4) {
+ !whoRunningDialog(kCharacterCond1) && _globals[kGlobalPhaseOfTheNight] != 4) {
playDialog(kCharacterCond1, "CON1505", -1, 0);
}
} else {
@@ -4162,7 +4162,7 @@ void LogicManager::HAND_Cond1_Sitting(HAND_PARAMS) {
case 19:
getCharacterCurrentParams(kCharacterCond1)[0] = 1;
if (getCharacterParams(kCharacterCond1, 8)[0] &&
- !whoRunningDialog(kCharacterCond1) && _globals[kProgressField18] != 4) {
+ !whoRunningDialog(kCharacterCond1) && _globals[kGlobalPhaseOfTheNight] != 4) {
playDialog(kCharacterCond1, "CON1505", -1, 0);
}
diff --git a/engines/lastexpress/characters/cond2.cpp b/engines/lastexpress/characters/cond2.cpp
index a6bb5db9fbe..f8b6dc679f6 100644
--- a/engines/lastexpress/characters/cond2.cpp
+++ b/engines/lastexpress/characters/cond2.cpp
@@ -113,7 +113,7 @@ void LogicManager::CONS_Cond2_DoSeqOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoSeqOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
}
@@ -156,7 +156,7 @@ void LogicManager::CONS_Cond2_DoCorrOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoCorrOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
}
@@ -202,7 +202,7 @@ void LogicManager::HAND_Cond2_FinishSeqOtis(HAND_PARAMS) {
getCharacter(kCharacterCond2).currentCall--;
_engine->getMessageManager()->setMessageHandle(kCharacterCond2, _functionsCond2[getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall]]);
fedEx(kCharacterCond2, kCharacterCond2, 18, 0);
- } else if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ } else if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
}
@@ -244,7 +244,7 @@ void LogicManager::CONS_Cond2_DoEnterCorrOtis(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoEnterCorrOtis(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
}
@@ -301,7 +301,7 @@ void LogicManager::CONS_Cond2_DoDialog(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoDialog(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
}
@@ -342,7 +342,7 @@ void LogicManager::CONS_Cond2_DoDialogFullVol(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoDialogFullVol(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
}
@@ -426,7 +426,7 @@ void LogicManager::HAND_Cond2_DoWalk(HAND_PARAMS) {
getCharacter(kCharacterCond2).inventoryItem = 0;
}
- if (_globals[kProgressJacket] != 1 || !nearChar(kCharacterCond2, kCharacterCath, 1000) || inComp(kCharacterCath) || whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] != 1 || !nearChar(kCharacterCond2, kCharacterCath, 1000) || inComp(kCharacterCath) || whoOutside(kCharacterCath)) {
if (walk(kCharacterCond2, getCharacterCurrentParams(kCharacterCond2)[0], getCharacterCurrentParams(kCharacterCond2)[1])) {
getCharacter(kCharacterCond2).inventoryItem = 0;
@@ -463,7 +463,7 @@ void LogicManager::HAND_Cond2_DoWalk(HAND_PARAMS) {
break;
case 12:
- if (!_globals[kProgressEventFoundCorpse] && !_doneNIS[kEventCoudertAskTylerCompartment])
+ if (!_globals[kGlobalFoundCorpse] && !_doneNIS[kEventCoudertAskTylerCompartment])
getCharacterCurrentParams(kCharacterCond2)[2] = 128;
if (walk(kCharacterCond2, getCharacterCurrentParams(kCharacterCond2)[0], getCharacterCurrentParams(kCharacterCond2)[1])) {
@@ -507,7 +507,7 @@ void LogicManager::CONS_Cond2_DoWait(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoWait(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
break;
@@ -552,7 +552,7 @@ void LogicManager::CONS_Cond2_DoWaitReal(CONS_PARAMS) {
void LogicManager::HAND_Cond2_DoWaitReal(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
break;
@@ -604,7 +604,7 @@ void LogicManager::HAND_Cond2_StandAsideDialog(HAND_PARAMS) {
playDialog(kCharacterCond2, "JAC1112F", -1, 0);
else
playDialog(kCharacterCond2, "JAC1112C", -1, 0);
- } else if (getCharacterCurrentParams(kCharacterCond2)[0] || _globals[kProgressField18] != 2) {
+ } else if (getCharacterCurrentParams(kCharacterCond2)[0] || _globals[kGlobalPhaseOfTheNight] != 2) {
playDialog(kCharacterCond2, "JAC1112D", -1, 0);
} else {
switch (rnd(4)) {
@@ -659,7 +659,7 @@ void LogicManager::CONS_Cond2_Passing(CONS_PARAMS) {
void LogicManager::HAND_Cond2_Passing(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 3;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
break;
@@ -740,7 +740,7 @@ void LogicManager::HAND_Cond2_Passing(HAND_PARAMS) {
Cond2Call(&LogicManager::CONS_Cond2_GetUpListen, 1, 0, 0, 0);
break;
case 2:
- if (_globals[kProgressChapter] == 1 && !_globals[kProgressEventFoundCorpse] && !_doneNIS[kEventCoudertAskTylerCompartment]) {
+ if (_globals[kGlobalChapter] == 1 && !_globals[kGlobalFoundCorpse] && !_doneNIS[kEventCoudertAskTylerCompartment]) {
getCharacter(kCharacterCond2).inventoryItem = 0x80;
}
@@ -829,7 +829,7 @@ void LogicManager::CONS_Cond2_Listen(CONS_PARAMS) {
void LogicManager::HAND_Cond2_Listen(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
+ if (_globals[kGlobalJacket] == 1 && nearChar(kCharacterCond2, kCharacterCath, 1000) && !inComp(kCharacterCath) && !whoOutside(kCharacterCath)) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 4;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, 123, 0, 0);
}
@@ -923,7 +923,7 @@ void LogicManager::HAND_Cond2_TatianaLockUnlockMyComp(HAND_PARAMS) {
case 2:
if (getCharacter(kCharacterCond2).callParams[getCharacter(kCharacterCond2).currentCall].parameters[0]) {
playDialog(kCharacterCond2, "Tat3163", -1, 0);
- } else if (_globals[kProgressChapter] == 3 && _gameTime < 1449000) {
+ } else if (_globals[kGlobalChapter] == 3 && _gameTime < 1449000) {
playDialog(kCharacterCond2, "Tat3161A", -1, 0);
} else {
playDialog(kCharacterCond2, "Tat3162A", -1, 0);
@@ -2782,7 +2782,7 @@ void LogicManager::HAND_Cond2_Sitting(HAND_PARAMS) {
getCharacterParams(kCharacterCond2, 8)[18] = 0;
}
- if (_globals[kProgressEventFoundCorpse] || _doneNIS[kEventCoudertAskTylerCompartment]) {
+ if (_globals[kGlobalFoundCorpse] || _doneNIS[kEventCoudertAskTylerCompartment]) {
getCharacter(kCharacterCond2).inventoryItem = 0;
} else {
getCharacter(kCharacterCond2).inventoryItem = 0x80;
@@ -2912,7 +2912,7 @@ void LogicManager::HAND_Cond2_Sitting(HAND_PARAMS) {
if (!getCharacterParams(kCharacterCond2, 8)[16] &&
!getCharacterParams(kCharacterCond2, 8)[0] &&
(checkCathDir(kCarRedSleeping, 1) || checkCathDir(kCarRedSleeping, 23))) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterCond2).callbacks[getCharacter(kCharacterCond2).currentCall + 8] = 1;
Cond2Call(&LogicManager::CONS_Cond2_SaveGame, 2, kEventCoudertBloodJacket, 0, 0);
} else {
@@ -4198,7 +4198,7 @@ void LogicManager::CONS_Cond2_TatianaComeHere(CONS_PARAMS) {
void LogicManager::HAND_Cond2_TatianaComeHere(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_gameTime > 2133000 && !_globals[kProgressField40]) {
+ if (_gameTime > 2133000 && !_globals[kGlobalConcertIsHappening]) {
softReleaseAtDoor(kCharacterCond2, 33);
setDoor(32, kCharacterCath, 0, 10, 9);
setDoor(33, kCharacterCath, 1, 10, 9);
diff --git a/engines/lastexpress/characters/cook.cpp b/engines/lastexpress/characters/cook.cpp
index b6bf9efdb4e..0591f5ea2ef 100644
--- a/engines/lastexpress/characters/cook.cpp
+++ b/engines/lastexpress/characters/cook.cpp
@@ -128,10 +128,10 @@ void LogicManager::HAND_Cook_UptrainVersion(HAND_PARAMS) {
startCycOtis(kCharacterCook, "308A");
blockView(kCharacterCook, kCarRestaurant, 75);
blockView(kCharacterCook, kCarRestaurant, 78);
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
getCharacter(kCharacterCook).callbacks[getCharacter(kCharacterCook).currentCall + 8] = 1;
CookCall(&LogicManager::CONS_Cook_DoDialog, "KIT1010", 0, 0, 0);
- } else if (_globals[kProgressChapter] == 3) {
+ } else if (_globals[kGlobalChapter] == 3) {
getCharacter(kCharacterCook).callbacks[getCharacter(kCharacterCook).currentCall + 8] = 2;
CookCall(&LogicManager::CONS_Cook_DoDialog, "KIT1012", 0, 0, 0);
} else {
@@ -218,10 +218,10 @@ void LogicManager::HAND_Cook_DowntrainVersion(HAND_PARAMS) {
blockView(kCharacterCook, kCarRestaurant, 75);
blockView(kCharacterCook, kCarRestaurant, 78);
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
getCharacter(kCharacterCook).callbacks[getCharacter(kCharacterCook).currentCall + 8] = 1;
CookCall(&LogicManager::CONS_Cook_DoDialog, "KIT1010", 0, 0, 0);
- } else if (_globals[kProgressChapter] == 3) {
+ } else if (_globals[kGlobalChapter] == 3) {
getCharacter(kCharacterCook).callbacks[getCharacter(kCharacterCook).currentCall + 8] = 2;
CookCall(&LogicManager::CONS_Cook_DoDialog, "KIT1012", 0, 0, 0);
} else {
@@ -314,7 +314,7 @@ void LogicManager::HAND_Cook_Birth(HAND_PARAMS) {
getCharacter(kCharacterCook).characterPosition.car = kCarRestaurant;
getCharacter(kCharacterCook).characterPosition.position = 5900;
getCharacter(kCharacterCook).characterPosition.location = 0;
- _globals[kProgressField4C] = 0;
+ _globals[kGlobalUnknownDebugFlag] = 0;
break;
default:
break;
@@ -378,7 +378,7 @@ void LogicManager::HAND_Cook_InKitchenDinner(HAND_PARAMS) {
CONS_Cook_LockUp(0, 0, 0, 0);
break;
case 224849280:
- _globals[kProgressField4C] = 1;
+ _globals[kGlobalUnknownDebugFlag] = 1;
getCharacterCurrentParams(kCharacterCook)[0] = 1;
break;
default:
@@ -434,7 +434,7 @@ void LogicManager::HAND_Cook_StartPart2(HAND_PARAMS) {
getCharacter(kCharacterCook).characterPosition.position = 5900;
getCharacter(kCharacterCook).characterPosition.location = 0;
getCharacter(kCharacterCook).inventoryItem = kItemNone;
- _globals[kProgressField4C] = 1;
+ _globals[kGlobalUnknownDebugFlag] = 1;
break;
default:
break;
@@ -509,7 +509,7 @@ void LogicManager::HAND_Cook_StartPart3(HAND_PARAMS) {
endGraphics(kCharacterCook);
getCharacter(kCharacterCook).characterPosition.car = kCarRestaurant;
getCharacter(kCharacterCook).characterPosition.position = 5900;
- _globals[kProgressField4C] = 0;
+ _globals[kGlobalUnknownDebugFlag] = 0;
break;
default:
break;
@@ -582,7 +582,7 @@ void LogicManager::HAND_Cook_InKitchenLunch(HAND_PARAMS) {
break;
case 236976550:
- _globals[kProgressField4C] = 1;
+ _globals[kGlobalUnknownDebugFlag] = 1;
break;
default:
break;
@@ -610,7 +610,7 @@ void LogicManager::HAND_Cook_StartPart4(HAND_PARAMS) {
getCharacter(kCharacterCook).characterPosition.position = 5900;
getCharacter(kCharacterCook).characterPosition.location = 0;
getCharacter(kCharacterCook).inventoryItem = kItemNone;
- _globals[kProgressField4C] = 1;
+ _globals[kGlobalUnknownDebugFlag] = 1;
break;
default:
break;
diff --git a/engines/lastexpress/characters/demo/demo_anna.cpp b/engines/lastexpress/characters/demo/demo_anna.cpp
index 205fb566ec3..c7712a5c91a 100644
--- a/engines/lastexpress/characters/demo/demo_anna.cpp
+++ b/engines/lastexpress/characters/demo/demo_anna.cpp
@@ -306,7 +306,7 @@ void LogicManager::HAND_DemoAnna_GoBagg(HAND_PARAMS) {
DemoAnnaCall(&LogicManager::CONS_DemoAnna_FinishSeqOtis, 0, 0, 0, 0);
break;
case 5:
- _globals[kProgressField4C] = 1;
+ _globals[kGlobalUnknownDebugFlag] = 1;
endGraphics(kCharacterAnna);
CONS_DemoAnna_InBagg(0, 0, 0, 0);
break;
@@ -346,7 +346,7 @@ void LogicManager::HAND_DemoAnna_InBagg(HAND_PARAMS) {
break;
case 12:
getCharacter(kCharacterAnna).characterPosition.car = kCarBaggage;
- _globals[kProgressField54] = 1;
+ _globals[kGlobalAnnaIsInBaggageCar] = 1;
break;
case 235856512:
getCharacterCurrentParams(kCharacterAnna)[0] = 1;
@@ -422,13 +422,13 @@ void LogicManager::HAND_DemoAnna_BaggageFight(HAND_PARAMS) {
} else {
_gameTime = 2268000;
getCharacter(kCharacterAnna).callbacks[getCharacter(kCharacterAnna).currentCall + 8] = 3;
- DemoAnnaCall(&LogicManager::CONS_DemoAnna_SaveGame, 2, kEventAnnaBagagePart2, 0, 0);
+ DemoAnnaCall(&LogicManager::CONS_DemoAnna_SaveGame, 2, kEventAnnaBaggagePart2, 0, 0);
}
break;
case 3:
- playNIS(kEventAnnaBagagePart2);
- _globals[kProgressField54] = 0;
+ playNIS(kEventAnnaBaggagePart2);
+ _globals[kGlobalAnnaIsInBaggageCar] = 0;
forceJump(kCharacterVesna, &LogicManager::CONS_DemoVesna_InComp);
winGame();
break;
diff --git a/engines/lastexpress/characters/demo/demo_master.cpp b/engines/lastexpress/characters/demo/demo_master.cpp
index ebd7deac4b7..c2f47fecbe5 100644
--- a/engines/lastexpress/characters/demo/demo_master.cpp
+++ b/engines/lastexpress/characters/demo/demo_master.cpp
@@ -121,7 +121,7 @@ void LogicManager::HAND_DemoMaster_Birth(HAND_PARAMS) {
bool playSndFx = false;
bool doBumpCath = false;
- if (_globals[kProgressIsTrainRunning]) {
+ if (_globals[kGlobalTrainIsRunning]) {
if (!getCharacterCurrentParams(kCharacterMaster)[3]) {
getCharacterCurrentParams(kCharacterMaster)[3] = _realTime + getCharacterCurrentParams(kCharacterMaster)[0];
if (!getCharacterCurrentParams(kCharacterMaster)[3])
diff --git a/engines/lastexpress/characters/demo/demo_vesna.cpp b/engines/lastexpress/characters/demo/demo_vesna.cpp
index a6cf3d1bb4d..2174a1e5b11 100644
--- a/engines/lastexpress/characters/demo/demo_vesna.cpp
+++ b/engines/lastexpress/characters/demo/demo_vesna.cpp
@@ -219,7 +219,7 @@ void LogicManager::CONS_DemoVesna_InComp(CONS_PARAMS) {
void LogicManager::HAND_DemoVesna_InComp(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressField54] && getCharacterCurrentParams(kCharacterVesna)[0] != 0x7FFFFFFF && _gameTime) {
+ if (_globals[kGlobalAnnaIsInBaggageCar] && getCharacterCurrentParams(kCharacterVesna)[0] != 0x7FFFFFFF && _gameTime) {
if (_gameTime <= 2259000) {
if (!cathInCorridor(kCarRedSleeping) || !getCharacterCurrentParams(kCharacterVesna)[0]) {
getCharacterCurrentParams(kCharacterVesna)[0] = _gameTime;
diff --git a/engines/lastexpress/characters/francois.cpp b/engines/lastexpress/characters/francois.cpp
index 26b3d20b2b2..df2c5814574 100644
--- a/engines/lastexpress/characters/francois.cpp
+++ b/engines/lastexpress/characters/francois.cpp
@@ -583,7 +583,7 @@ void LogicManager::HAND_Francois_Rampage(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterFrancois)[2] == 540) {
getCharacterCurrentParams(kCharacterFrancois)[1] = 4;
- if (_globals[kProgressChapter] != 1)
+ if (_globals[kGlobalChapter] != 1)
getCharacterCurrentParams(kCharacterFrancois)[1] = 3;
getCharacterCurrentParams(kCharacterFrancois)[2] = 9460;
@@ -598,7 +598,7 @@ void LogicManager::HAND_Francois_Rampage(HAND_PARAMS) {
}
if (!nearX(kCharacterFrancois, 2000, 500) || getCharacter(kCharacterFrancois).direction != 2) {
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
if (checkLoc(kCharacterFrancois, kCarRedSleeping) &&
(whoOnScreen(kCharacterFrancois) || getCharacterCurrentParams(kCharacterFrancois)[0] < _gameTime || getCharacterCurrentParams(kCharacterFrancois)[3]) &&
!getCharacterCurrentParams(kCharacterFrancois)[4] && getCharacter(kCharacterFrancois).characterPosition.position < getCharacter(kCharacterMadame).characterPosition.position) {
@@ -637,7 +637,7 @@ void LogicManager::HAND_Francois_Rampage(HAND_PARAMS) {
getCharacter(kCharacterFrancois).callbacks[getCharacter(kCharacterFrancois).currentCall + 8] = 3;
FrancoisCall(&LogicManager::CONS_Francois_DoSeqOtis, "605A", 0, 0, 0);
} else {
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
if (checkLoc(kCharacterFrancois, kCarRedSleeping) &&
(whoOnScreen(kCharacterFrancois) || getCharacterCurrentParams(kCharacterFrancois)[0] < _gameTime || getCharacterCurrentParams(kCharacterFrancois)[3]) &&
!getCharacterCurrentParams(kCharacterFrancois)[4] && getCharacter(kCharacterFrancois).characterPosition.position < getCharacter(kCharacterMadame).characterPosition.position) {
@@ -675,7 +675,7 @@ void LogicManager::HAND_Francois_Rampage(HAND_PARAMS) {
FrancoisCall(&LogicManager::CONS_Francois_SaveGame, 2, kEventFrancoisWhistle, 0, 0);
break;
case 5:
- if (_globals[kProgressJacket] == 2 && !_doneNIS[kEventFrancoisWhistle] && !_doneNIS[kEventFrancoisWhistleD] && !_doneNIS[kEventFrancoisWhistleNight] && !_doneNIS[kEventFrancoisWhistleNightD]) {
+ if (_globals[kGlobalJacket] == 2 && !_doneNIS[kEventFrancoisWhistle] && !_doneNIS[kEventFrancoisWhistleD] && !_doneNIS[kEventFrancoisWhistleNight] && !_doneNIS[kEventFrancoisWhistleNightD]) {
getCharacter(kCharacterFrancois).inventoryItem = 0x80;
}
@@ -706,7 +706,7 @@ void LogicManager::HAND_Francois_Rampage(HAND_PARAMS) {
getCharacter(kCharacterFrancois).characterPosition.position = 2088;
walk(kCharacterFrancois, getCharacterCurrentParams(kCharacterFrancois)[1], getCharacterCurrentParams(kCharacterFrancois)[2]);
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
if (checkLoc(kCharacterFrancois, kCarRedSleeping) &&
(whoOnScreen(kCharacterFrancois) || getCharacterCurrentParams(kCharacterFrancois)[0] < _gameTime || getCharacterCurrentParams(kCharacterFrancois)[3]) &&
!getCharacterCurrentParams(kCharacterFrancois)[4] && getCharacter(kCharacterFrancois).characterPosition.position < getCharacter(kCharacterMadame).characterPosition.position) {
@@ -741,7 +741,7 @@ void LogicManager::HAND_Francois_Rampage(HAND_PARAMS) {
fedEx(kCharacterFrancois, kCharacterFrancois, 18, 0);
break;
case 6:
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
if (!isNight()) {
if (getCharacter(kCharacterFrancois).characterPosition.position <= getCharacter(kCharacterCath).characterPosition.position) {
playNIS(kEventFrancoisWhistleD);
@@ -1586,7 +1586,7 @@ void LogicManager::HAND_Francois_WithMama(HAND_PARAMS) {
// fall through
case 6:
if (getCharacter(kCharacterFrancois).callbacks[getCharacter(kCharacterFrancois).currentCall + 8] == 6) {
- _globals[kProgressField9C] = 1;
+ _globals[kGlobalFrancoisSawABlackBeetle] = 1;
}
if (_gameTime > 1782000 && !getCharacterCurrentParams(kCharacterFrancois)[5]) {
@@ -1983,7 +1983,7 @@ void LogicManager::HAND_Francois_InPart3(HAND_PARAMS) {
break;
case 12:
if (getCharacter(kCharacterFrancois).callbacks[getCharacter(kCharacterFrancois).currentCall + 8] == 12) {
- _globals[kProgressField9C] = 1;
+ _globals[kGlobalFrancoisSawABlackBeetle] = 1;
}
if (_gameTime > 2040300 && !getCharacterCurrentParams(kCharacterFrancois)[12]) {
diff --git a/engines/lastexpress/characters/headwait.cpp b/engines/lastexpress/characters/headwait.cpp
index 77cae708f43..1b193b6c9ac 100644
--- a/engines/lastexpress/characters/headwait.cpp
+++ b/engines/lastexpress/characters/headwait.cpp
@@ -300,7 +300,7 @@ void LogicManager::HAND_HeadWait_RebeccaHereWeAre(HAND_PARAMS) {
case 18:
switch (getCharacter(kCharacterHeadWait).callbacks[getCharacter(kCharacterHeadWait).currentCall + 8]) {
case 1:
- switch (_globals[kProgressChapter]) {
+ switch (_globals[kGlobalChapter]) {
case 1:
playDialog(kCharacterHeadWait, "REB1198", -1, 30);
break;
diff --git a/engines/lastexpress/characters/kahina.cpp b/engines/lastexpress/characters/kahina.cpp
index 167c118047f..8dc9e71df83 100644
--- a/engines/lastexpress/characters/kahina.cpp
+++ b/engines/lastexpress/characters/kahina.cpp
@@ -499,12 +499,12 @@ void LogicManager::CONS_Kahina_InSeclusion(CONS_PARAMS) {
void LogicManager::HAND_Kahina_InSeclusion(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_gameTime > 1107000 && !getCharacterCurrentParams(kCharacterKahina)[0] && _globals[kProgressJacket]) {
+ if (_gameTime > 1107000 && !getCharacterCurrentParams(kCharacterKahina)[0] && _globals[kGlobalJacket]) {
send(kCharacterKahina, kCharacterCond1, 238732837, 0);
getCharacterCurrentParams(kCharacterKahina)[0] = 1;
}
- if (_globals[kProgressEventMertensChronosInvitation])
+ if (_globals[kGlobalKnowAboutKronos])
CONS_Kahina_AwaitingCath(0, 0, 0, 0);
break;
@@ -583,7 +583,7 @@ void LogicManager::CONS_Kahina_CathDone(CONS_PARAMS) {
void LogicManager::HAND_Kahina_CathDone(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (!_globals[kProgressField14] && _gameTime < 1201500 && getCharacterCurrentParams(kCharacterKahina)[1] != 0x7FFFFFFF && getCharacterCurrentParams(kCharacterKahina)[0] < _gameTime) {
+ if (!_globals[kGlobalCharacterSearchingForCath] && _gameTime < 1201500 && getCharacterCurrentParams(kCharacterKahina)[1] != 0x7FFFFFFF && getCharacterCurrentParams(kCharacterKahina)[0] < _gameTime) {
if (_gameTime <= 1197000) {
if (!cathInCorridor(kCarGreenSleeping) || !getCharacterCurrentParams(kCharacterKahina)[1]) {
getCharacterCurrentParams(kCharacterKahina)[1] = _gameTime;
@@ -682,7 +682,7 @@ void LogicManager::HAND_Kahina_SearchTrain(HAND_PARAMS) {
break;
case 12:
- _globals[kProgressField14] = 19;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterKahina;
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 1;
KahinaCall(&LogicManager::CONS_Kahina_DoWalk, 3, 8200, 0, 0);
break;
@@ -691,8 +691,8 @@ void LogicManager::HAND_Kahina_SearchTrain(HAND_PARAMS) {
case 1:
if (!whoOnScreen(kCharacterKahina)) {
if (inComp(kCharacterCath, kCarGreenSleeping, 8200) || cathOutHisWindow() || nearChar(kCharacterKahina, kCharacterCath, 2000)) {
- if (_globals[kProgressField14] == 19)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterKahina)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 8;
KahinaCall(&LogicManager::CONS_Kahina_DoWalk, 3, 9460, 0, 0);
@@ -717,8 +717,8 @@ void LogicManager::HAND_Kahina_SearchTrain(HAND_PARAMS) {
break;
case 4:
if (inComp(kCharacterCath, kCarGreenSleeping, 8200) || cathOutHisWindow() || nearChar(kCharacterKahina, kCharacterCath, 2000)) {
- if (_globals[kProgressField14] == 19)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterKahina)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 8;
KahinaCall(&LogicManager::CONS_Kahina_DoWalk, 3, 9460, 0, 0);
@@ -745,8 +745,8 @@ void LogicManager::HAND_Kahina_SearchTrain(HAND_PARAMS) {
case 7:
getCharacter(kCharacterKahina).characterPosition.location = 0;
- if (_globals[kProgressField14] == 19)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterKahina)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 8;
KahinaCall(&LogicManager::CONS_Kahina_DoWalk, 3, 9460, 0, 0);
@@ -1359,11 +1359,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
}
if (!getCharacterCurrentParams(kCharacterKahina)[1]) {
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1376,11 +1376,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterKahina)[3] = _gameTime + 4500;
if (getCharacterCurrentParams(kCharacterKahina)[5] == 0x7FFFFFFF || !_gameTime) {
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1397,11 +1397,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
playDialog(0, "LIB015", getVolume(kCharacterKahina), 15);
startCycOtis(kCharacterKahina, "202a");
getCharacterCurrentParams(kCharacterKahina)[1] = 0;
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1412,11 +1412,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
}
if (getCharacterCurrentParams(kCharacterKahina)[5] >= _gameTime) {
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1432,11 +1432,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
startCycOtis(kCharacterKahina, "202a");
getCharacterCurrentParams(kCharacterKahina)[1] = 0;
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1460,11 +1460,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterKahina)[0] = 0;
getCharacterCurrentParams(kCharacterKahina)[1] = 1;
if (!getCharacterCurrentParams(kCharacterKahina)[1]) {
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1477,11 +1477,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterKahina)[3] = _gameTime + 4500;
if (getCharacterCurrentParams(kCharacterKahina)[5] == 0x7FFFFFFF || !_gameTime) {
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1498,11 +1498,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
playDialog(0, "LIB015", getVolume(kCharacterKahina), 15);
startCycOtis(kCharacterKahina, "202a");
getCharacterCurrentParams(kCharacterKahina)[1] = 0;
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1513,11 +1513,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
}
if (getCharacterCurrentParams(kCharacterKahina)[5] >= _gameTime) {
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1533,11 +1533,11 @@ void LogicManager::HAND_Kahina_Concert(HAND_PARAMS) {
startCycOtis(kCharacterKahina, "202a");
getCharacterCurrentParams(kCharacterKahina)[1] = 0;
- if (!_globals[kProgressField44] && _gameTime > 2214000) {
- if (_items[kProgressField48].floating == 3 || _items[kProgressField48].floating == 7) {
+ if (!_globals[kGlobalKahinaKillTimeoutActive] && _gameTime > 2214000) {
+ if (_items[kItemFirebird].floating == 3 || _items[kItemFirebird].floating == 7) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 3;
KahinaCall(&LogicManager::CONS_Kahina_SearchCath, 0, 0, 0, 0);
- } else if (_items[kProgressField48].floating == 2 || _items[kProgressField48].floating == 1) {
+ } else if (_items[kItemFirebird].floating == 2 || _items[kItemFirebird].floating == 1) {
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 4;
KahinaCall(&LogicManager::CONS_Kahina_SearchTatiana, 0, 0, 0, 0);
}
@@ -1736,7 +1736,7 @@ void LogicManager::HAND_Kahina_SeekCath(HAND_PARAMS) {
bumpCathRx(getCharacter(kCharacterKahina).characterPosition.car, getCharacter(kCharacterKahina).characterPosition.position + 750);
send(kCharacterKahina, kCharacterKronos, 235599361, 0);
playDialog(kCharacterKahina, "MUS016", 16, 0);
- _globals[kProgressField44] = 1;
+ _globals[kGlobalKahinaKillTimeoutActive] = 1;
getCharacterCurrentParams(kCharacterKahina)[0] = 1;
getCharacterCurrentParams(kCharacterKahina)[1] = 2;
getCharacterCurrentParams(kCharacterKahina)[2] = 9270;
@@ -1761,7 +1761,7 @@ void LogicManager::HAND_Kahina_SeekCath(HAND_PARAMS) {
if (whoRunningDialog(kCharacterKahina))
fadeDialog(kCharacterKahina);
- _globals[kProgressField44] = 0;
+ _globals[kGlobalKahinaKillTimeoutActive] = 0;
CONS_Kahina_Finished(0, 0, 0, 0);
break;
case 137503360:
@@ -1770,7 +1770,7 @@ void LogicManager::HAND_Kahina_SeekCath(HAND_PARAMS) {
if (whoRunningDialog(kCharacterKahina))
fadeDialog(kCharacterKahina);
- _globals[kProgressField44] = 0;
+ _globals[kGlobalKahinaKillTimeoutActive] = 0;
CONS_Kahina_Finished(0, 0, 0, 0);
break;
default:
@@ -1820,11 +1820,11 @@ void LogicManager::HAND_Kahina_SearchCath(HAND_PARAMS) {
}
if (_items[kItemFirebird].floating == 3) {
- _globals[kProgressField7C] = 1;
+ _globals[kGlobalCanPlayEggSuitcaseMusic] = 1;
} else {
if (_items[kItemFirebird].floating != 7) {
dropItem(kItemBriefcase, 2);
- _globals[kProgressField78] = 1;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 1;
getCharacterParams(kCharacterKahina, 8)[2] = 0;
getCharacter(kCharacterKahina).currentCall--;
@@ -1833,14 +1833,14 @@ void LogicManager::HAND_Kahina_SearchCath(HAND_PARAMS) {
break;
}
- _globals[kProgressField80] = 1;
+ _globals[kGlobalCanPlayEggUnderSinkMusic] = 1;
}
takeItem(kItemFirebird);
_items[kItemFirebird].floating = 5;
send(kCharacterKahina, kCharacterKronos, 138085344, 0);
dropItem(kItemBriefcase, 2);
- _globals[kProgressField78] = 1;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 1;
getCharacterParams(kCharacterKahina, 8)[2] = 0;
getCharacter(kCharacterKahina).currentCall--;
@@ -1914,13 +1914,13 @@ void LogicManager::HAND_Kahina_SearchCath(HAND_PARAMS) {
setDoor(17, kCharacterCath, 0, 10, 9);
if (_items[kItemFirebird].floating == 3) {
- _globals[kProgressField7C] = 1;
+ _globals[kGlobalCanPlayEggSuitcaseMusic] = 1;
takeItem(kItemFirebird);
_items[kItemFirebird].floating = 5;
send(kCharacterKahina, kCharacterKronos, 138085344, 0);
dropItem(kItemBriefcase, 2);
- _globals[kProgressFieldC0] = _gameTime;
- _globals[kProgressField78] = 1;
+ _globals[kGlobalRegisteredTimeAtWhichCathGaveFirebirdToKronos] = _gameTime;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 1;
getCharacterParams(kCharacterKahina, 8)[2] = 0;
if (_items[kItemFirebird].floating != 18) {
@@ -1932,13 +1932,13 @@ void LogicManager::HAND_Kahina_SearchCath(HAND_PARAMS) {
}
if (_items[kItemFirebird].floating == 7) {
- _globals[kProgressField80] = 1;
+ _globals[kGlobalCanPlayEggUnderSinkMusic] = 1;
takeItem(kItemFirebird);
_items[kItemFirebird].floating = 5;
send(kCharacterKahina, kCharacterKronos, 138085344, 0);
dropItem(kItemBriefcase, 2);
- _globals[kProgressFieldC0] = _gameTime;
- _globals[kProgressField78] = 1;
+ _globals[kGlobalRegisteredTimeAtWhichCathGaveFirebirdToKronos] = _gameTime;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 1;
getCharacterParams(kCharacterKahina, 8)[2] = 0;
if (_items[kItemFirebird].floating != 18) {
@@ -1951,7 +1951,7 @@ void LogicManager::HAND_Kahina_SearchCath(HAND_PARAMS) {
if (getCharacterParams(kCharacterKahina, 8)[2]) {
dropItem(kItemBriefcase, 2);
- _globals[kProgressField78] = 1;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 1;
getCharacterParams(kCharacterKahina, 8)[2] = 0;
}
@@ -1998,7 +1998,7 @@ void LogicManager::HAND_Kahina_SearchTatiana(HAND_PARAMS) {
_items[kItemFirebird].floating = 5;
send(kCharacterKahina, kCharacterKronos, 138085344, 0);
dropItem(kItemBriefcase, 2);
- _globals[kProgressField78] = 1;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 1;
getCharacter(kCharacterKahina).currentCall--;
_engine->getMessageManager()->setMessageHandle(kCharacterKahina, _functionsKahina[getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall]]);
@@ -2068,7 +2068,7 @@ void LogicManager::HAND_Kahina_SearchTatiana(HAND_PARAMS) {
}
getCharacter(kCharacterKahina).callbacks[getCharacter(kCharacterKahina).currentCall + 8] = 8;
- KahinaCall(&LogicManager::CONS_Kahina_DoCorrOtis, "616Ba", 0x20, 0, 0);
+ KahinaCall(&LogicManager::CONS_Kahina_DoCorrOtis, "616Ba", 32, 0, 0);
break;
case 8:
getCharacter(kCharacterKahina).characterPosition.location = 0;
diff --git a/engines/lastexpress/characters/kronos.cpp b/engines/lastexpress/characters/kronos.cpp
index fc352a759ab..e09f21ad14b 100644
--- a/engines/lastexpress/characters/kronos.cpp
+++ b/engines/lastexpress/characters/kronos.cpp
@@ -903,7 +903,7 @@ void LogicManager::HAND_Kronos_Concert(HAND_PARAMS) {
setDoor(75, kCharacterCath, 0, 10, 9);
setDoor(76, kCharacterKronos, 0, 10, 9);
- _globals[kProgressField40] = 1;
+ _globals[kGlobalConcertIsHappening] = 1;
startCycOtis(kCharacterKronos, "201a");
getCharacterCurrentParams(kCharacterKronos)[2] = 2700;
getCharacterCurrentParams(kCharacterKronos)[1] = 2700;
@@ -971,7 +971,7 @@ void LogicManager::HAND_Kronos_AfterConcert(HAND_PARAMS) {
break;
case 12:
- _globals[kProgressField40] = 0;
+ _globals[kGlobalConcertIsHappening] = 0;
setDoor(75, kCharacterCath, 3, 0, 0);
send(kCharacterKronos, kCharacterRebecca, 191668032, 0);
@@ -1015,7 +1015,7 @@ void LogicManager::HAND_Kronos_AwaitingCath3(HAND_PARAMS) {
switch (msg->action) {
case 0:
if (inInnerSanctum(kCharacterCath)) {
- if (_globals[kProgressField44]) {
+ if (_globals[kGlobalKahinaKillTimeoutActive]) {
getCharacter(kCharacterKronos).callbacks[getCharacter(kCharacterKronos).currentCall + 8] = 5;
KronosCall(&LogicManager::CONS_Kronos_SaveGame, 2, kEventKahinaPunchBaggageCarEntrance, 0, 0);
} else {
diff --git a/engines/lastexpress/characters/madame.cpp b/engines/lastexpress/characters/madame.cpp
index b9cf33a4342..1970ff72f15 100644
--- a/engines/lastexpress/characters/madame.cpp
+++ b/engines/lastexpress/characters/madame.cpp
@@ -334,10 +334,10 @@ void LogicManager::HAND_Madame_ComplainCond2(HAND_PARAMS) {
startCycOtis(kCharacterMadame, "606L");
playDialog(kCharacterMadame, (char *)&getCharacterCurrentParams(kCharacterMadame)[0], -1, 0);
if (whoOnScreen(kCharacterMadame) || nearChar(kCharacterMadame, kCharacterCath, 2000)) {
- if (_globals[kProgressChapter] == 1) {
- _globals[kProgressFieldA8] = 1;
- } else if (_globals[kProgressChapter] == 3) {
- _globals[kProgressFieldA4] = 1;
+ if (_globals[kGlobalChapter] == 1) {
+ _globals[kGlobalMadameComplainedAboutMax] = 1;
+ } else if (_globals[kGlobalChapter] == 3) {
+ _globals[kGlobalMadameDemandedMaxInBaggage] = 1;
}
}
@@ -595,7 +595,7 @@ void LogicManager::HAND_Madame_OpenComp1(HAND_PARAMS) {
playDialog(kCharacterMadame, "MME1035A", -1, 0);
if (whoOnScreen(kCharacterMadame) || nearChar(kCharacterMadame, kCharacterCath, 2000))
- _globals[kProgressFieldAC] = 1;
+ _globals[kGlobalMetMadame] = 1;
getCharacter(kCharacterMadame).callbacks[getCharacter(kCharacterMadame).currentCall + 8] = 2;
MadameCall(&LogicManager::CONS_Madame_DoCorrOtis, "606Ed", 35, 0, 0);
@@ -624,7 +624,7 @@ void LogicManager::HAND_Madame_ClosedComp1(HAND_PARAMS) {
setDoor(51, kCharacterCath, 1, 0, 0);
if (nearChar(kCharacterMadame, kCharacterCath, 2000))
- _globals[kProgressFieldA0] = 1;
+ _globals[kGlobalOverheardMadameAndFrancoisTalkingAboutWhistle] = 1;
getCharacterCurrentParams(kCharacterMadame)[4] = 1;
getCharacter(kCharacterMadame).callbacks[getCharacter(kCharacterMadame).currentCall + 8] = 1;
@@ -639,7 +639,7 @@ void LogicManager::HAND_Madame_ClosedComp1(HAND_PARAMS) {
setDoor(51, kCharacterCath, 1, 0, 0);
if (nearChar(kCharacterMadame, kCharacterCath, 2000))
- _globals[kProgressFieldA0] = 1;
+ _globals[kGlobalOverheardMadameAndFrancoisTalkingAboutWhistle] = 1;
getCharacterCurrentParams(kCharacterMadame)[4] = 1;
getCharacter(kCharacterMadame).callbacks[getCharacter(kCharacterMadame).currentCall + 8] = 1;
@@ -654,7 +654,7 @@ void LogicManager::HAND_Madame_ClosedComp1(HAND_PARAMS) {
setDoor(51, kCharacterCath, 1, 0, 0);
if (nearChar(kCharacterMadame, kCharacterCath, 2000))
- _globals[kProgressFieldA0] = 1;
+ _globals[kGlobalOverheardMadameAndFrancoisTalkingAboutWhistle] = 1;
getCharacterCurrentParams(kCharacterMadame)[4] = 1;
getCharacter(kCharacterMadame).callbacks[getCharacter(kCharacterMadame).currentCall + 8] = 1;
@@ -663,7 +663,7 @@ void LogicManager::HAND_Madame_ClosedComp1(HAND_PARAMS) {
}
}
- if (_globals[kProgressField24] && getCharacterCurrentParams(kCharacterMadame)[6] != 0x7FFFFFFF && _gameTime) {
+ if (_globals[kGlobalFrancoisHasSeenCorpseThrown] && getCharacterCurrentParams(kCharacterMadame)[6] != 0x7FFFFFFF && _gameTime) {
if (_gameTime > 1093500) {
getCharacterCurrentParams(kCharacterMadame)[6] = 0x7FFFFFFF;
getCharacter(kCharacterMadame).callbacks[getCharacter(kCharacterMadame).currentCall + 8] = 2;
@@ -768,7 +768,7 @@ void LogicManager::HAND_Madame_ClosedComp1(HAND_PARAMS) {
setDoor(35, kCharacterMadame, 1, 10, 9);
setDoor(51, kCharacterMadame, 1, 10, 9);
- if (_globals[kProgressField24] && getCharacterCurrentParams(kCharacterMadame)[6] != 0x7FFFFFFF && _gameTime) {
+ if (_globals[kGlobalFrancoisHasSeenCorpseThrown] && getCharacterCurrentParams(kCharacterMadame)[6] != 0x7FFFFFFF && _gameTime) {
if (_gameTime > 1093500) {
getCharacterCurrentParams(kCharacterMadame)[6] = 0x7FFFFFFF;
getCharacter(kCharacterMadame).callbacks[getCharacter(kCharacterMadame).currentCall + 8] = 2;
diff --git a/engines/lastexpress/characters/mahmud.cpp b/engines/lastexpress/characters/mahmud.cpp
index 057cead31fe..ff732f51db4 100644
--- a/engines/lastexpress/characters/mahmud.cpp
+++ b/engines/lastexpress/characters/mahmud.cpp
@@ -456,7 +456,7 @@ void LogicManager::HAND_Mahmud_CathKnockingHarem(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterMahmud)[2] = 0;
} else {
playDialog(kCharacterClerk, "LIB050", 16, 0);
- if (_globals[kProgressChapter] == 1)
+ if (_globals[kGlobalChapter] == 1)
endGame(0, 0, 57, true);
else
endGame(0, 0, 63, true);
@@ -489,7 +489,7 @@ void LogicManager::HAND_Mahmud_CathKnockingHarem(HAND_PARAMS) {
playDialog(kCharacterMahmud, "MAH1170A", -1, 45);
}
- _globals[kProgressFieldC4] = 1;
+ _globals[kGlobalMetMahmud] = 1;
getCharacter(kCharacterMahmud).callbacks[getCharacter(kCharacterMahmud).currentCall + 8] = 1;
MahmudCall(&LogicManager::CONS_Mahmud_DoBumpCorrOtis, "614Dd", 4, 30, *getCharacterCurrentParams(kCharacterMahmud));
break;
@@ -800,7 +800,7 @@ void LogicManager::HAND_Mahmud_Vigilant(HAND_PARAMS) {
getCharacterParams(kCharacterMahmud, 8)[0] = 0;
}
- if (!getCharacterCurrentParams(kCharacterMahmud)[1] && _globals[kProgressChapter] == 1) {
+ if (!getCharacterCurrentParams(kCharacterMahmud)[1] && _globals[kGlobalChapter] == 1) {
if (_gameTime > 1098000 && !getCharacterCurrentParams(kCharacterMahmud)[5]) {
getCharacterCurrentParams(kCharacterMahmud)[5] = 1;
getCharacter(kCharacterMahmud).callbacks[getCharacter(kCharacterMahmud).currentCall + 8] = 1;
@@ -837,7 +837,7 @@ void LogicManager::HAND_Mahmud_Vigilant(HAND_PARAMS) {
case 9:
if (getCharacterCurrentParams(kCharacterMahmud)[4]) {
setDoor(4, kCharacterMahmud, 3, 0, 0);
- if (_globals[kProgressJacket] == 1 || _doneNIS[kEventMahmudWrongDoor] || _doneNIS[kEventMahmudWrongDoorOriginalJacket] || _doneNIS[kEventMahmudWrongDoorDay]) {
+ if (_globals[kGlobalJacket] == 1 || _doneNIS[kEventMahmudWrongDoor] || _doneNIS[kEventMahmudWrongDoorOriginalJacket] || _doneNIS[kEventMahmudWrongDoorDay]) {
if (cathHasItem(kItemPassengerList)) {
getCharacter(kCharacterMahmud).callbacks[getCharacter(kCharacterMahmud).currentCall + 8] = 6;
@@ -935,7 +935,7 @@ void LogicManager::HAND_Mahmud_Vigilant(HAND_PARAMS) {
MahmudCall(&LogicManager::CONS_Mahmud_DoDialog, "MAH1175", 0, 0, 0);
break;
case 5:
- if (_globals[kProgressJacket] == 1 ||
+ if (_globals[kGlobalJacket] == 1 ||
_doneNIS[kEventMahmudWrongDoor] ||
_doneNIS[kEventMahmudWrongDoorOriginalJacket] ||
_doneNIS[kEventMahmudWrongDoorDay]) {
@@ -956,7 +956,7 @@ void LogicManager::HAND_Mahmud_Vigilant(HAND_PARAMS) {
MahmudCall(&LogicManager::CONS_Mahmud_SaveGame, 2, kEventMahmudWrongDoor, 0, 0);
break;
case 10:
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
if (isNight()) {
playNIS(kEventMahmudWrongDoor);
} else {
diff --git a/engines/lastexpress/characters/master.cpp b/engines/lastexpress/characters/master.cpp
index b24f415d246..b742895db8b 100644
--- a/engines/lastexpress/characters/master.cpp
+++ b/engines/lastexpress/characters/master.cpp
@@ -155,7 +155,7 @@ void LogicManager::HAND_Master_Arrive(HAND_PARAMS) {
playDialog(kCharacterMaster, "ARRIVE", 8, 0);
_engine->getSoundManager()->endAmbient();
- _globals[kProgressIsTrainRunning] = 0;
+ _globals[kGlobalTrainIsRunning] = 0;
getCharacterParams(kCharacterMaster, 8)[1] = 1;
getCharacterParams(kCharacterMaster, 8)[3] = getCharacterCurrentParams(kCharacterMaster)[3];
@@ -226,7 +226,7 @@ void LogicManager::HAND_Master_Depart(HAND_PARAMS) {
setDoor(26, kCharacterCath, 1, 0, 9);
setDoor(27, kCharacterCath, 1, 0, 9);
- _globals[kProgressIsTrainRunning] = 1;
+ _globals[kGlobalTrainIsRunning] = 1;
getCharacterParams(kCharacterMaster, 8)[2] = 1;
@@ -408,18 +408,18 @@ void LogicManager::HAND_Master_FirstDream(HAND_PARAMS) {
_engine->waitForTimer(4);
}
- _globals[kProgressField84] = 1;
+ _globals[kGlobalCathInSpecialState] = 1;
bumpCath(kCarLocomotive, 75, 255);
restoreIcons();
_gameTime = 1492200;
- _globals[kProgressField18] = 4;
+ _globals[kGlobalPhaseOfTheNight] = 4;
_timeSpeed = 0;
setDoor(63, kCharacterMaster, 0, 0, 9);
send(kCharacterMaster, kCharacterClerk, 191350523, 0);
- _globals[kProgressIsTrainRunning] = 0;
+ _globals[kGlobalTrainIsRunning] = 0;
getCharacter(kCharacterMaster).callbacks[getCharacter(kCharacterMaster).currentCall + 8] = 1;
MasterCall(&LogicManager::CONS_Master_SaveGame, 1, 0, 0, 0);
@@ -438,11 +438,11 @@ void LogicManager::HAND_Master_FirstDream(HAND_PARAMS) {
playNIS(kEventCathDream);
_timeSpeed = 3;
- _globals[kProgressField18] = 1;
+ _globals[kGlobalPhaseOfTheNight] = 1;
setDoor(63, kCharacterCath, 0, 10, 9);
- _globals[kProgressField84] = 0;
+ _globals[kGlobalCathInSpecialState] = 0;
bumpCathTylerComp();
@@ -499,15 +499,15 @@ void LogicManager::CONS_Master_StartPart1(CONS_PARAMS) {
void LogicManager::HAND_Master_StartPart1(HAND_PARAMS) {
switch (msg->action) {
case 12:
- _globals[kProgressChapter] = 1;
+ _globals[kGlobalChapter] = 1;
_engine->getSoundManager()->startAmbient();
_gameTime = 1061100;
_timeSpeed = 0;
- _globals[kProgressIsTrainRunning] = 1;
- _globals[kProgressPortrait] = 32;
- _globals[kProgressField18] = 1;
+ _globals[kGlobalTrainIsRunning] = 1;
+ _globals[kGlobalCathIcon] = 32;
+ _globals[kGlobalPhaseOfTheNight] = 1;
giveCathItem(kItemTelegram);
giveCathItem(kItemArticle);
@@ -524,7 +524,7 @@ void LogicManager::HAND_Master_StartPart1(HAND_PARAMS) {
dropItem(kItem22, 1);
dropItem(kItemPaper, 1);
- _globals[kProgressField7C] = 1;
+ _globals[kGlobalCanPlayEggSuitcaseMusic] = 1;
setDoor(1, kCharacterCath, 0, 10, 9);
setDoor(9, kCharacterCath, 0, 255, 255);
@@ -585,7 +585,7 @@ void LogicManager::CONS_Master_MovingNight(CONS_PARAMS) {
void LogicManager::HAND_Master_MovingNight(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressIsTrainRunning] && _gameTime < 1458000) {
+ if (_globals[kGlobalTrainIsRunning] && _gameTime < 1458000) {
bool skip = false;
if (!getCharacterCurrentParams(kCharacterMaster)[5]) {
@@ -654,7 +654,7 @@ void LogicManager::HAND_Master_MovingNight(HAND_PARAMS) {
if (_gameTime > 1170000 && !getCharacterCurrentParams(kCharacterMaster)[9]) {
getCharacterCurrentParams(kCharacterMaster)[9] = 1;
- _globals[kProgressField18] = 2;
+ _globals[kGlobalPhaseOfTheNight] = 2;
}
if (!getCharacterCurrentParams(kCharacterMaster)[0]) {
@@ -831,7 +831,7 @@ void LogicManager::HAND_Master_MovingNight(HAND_PARAMS) {
_engine->getSoundManager()->startAmbient();
getCharacterParams(kCharacterMaster, 8)[2] = 0;
if (getCharacterCurrentParams(kCharacterMaster)[3]) {
- if (_globals[kProgressField24])
+ if (_globals[kGlobalFrancoisHasSeenCorpseThrown])
send(kCharacterMaster, kCharacterTrainM, 168187490, 0);
else
send(kCharacterMaster, kCharacterCond1, 224122407, 0);
@@ -842,7 +842,7 @@ void LogicManager::HAND_Master_MovingNight(HAND_PARAMS) {
break;
case 190346110:
- _globals[kProgressField18] = 3;
+ _globals[kGlobalPhaseOfTheNight] = 3;
if (_gameTime >= 1494000) {
CONS_Master_SecondSleep(0, 0, 0, 0);
} else {
@@ -901,7 +901,7 @@ void LogicManager::HAND_Master_MovingNight(HAND_PARAMS) {
if (_gameTime > 1170000 && !getCharacterCurrentParams(kCharacterMaster)[9]) {
getCharacterCurrentParams(kCharacterMaster)[9] = 1;
- _globals[kProgressField18] = 2;
+ _globals[kGlobalPhaseOfTheNight] = 2;
}
if (!getCharacterCurrentParams(kCharacterMaster)[0]) {
@@ -1147,7 +1147,7 @@ void LogicManager::HAND_Master_MovingNight(HAND_PARAMS) {
// fall through
case 17:
if (getCharacter(kCharacterMaster).callbacks[getCharacter(kCharacterMaster).currentCall + 8] == 17) {
- _globals[kProgressField18] = 1;
+ _globals[kGlobalPhaseOfTheNight] = 1;
getCharacter(kCharacterMaster).callbacks[getCharacter(kCharacterMaster).currentCall + 8] = 18;
MasterCall(&LogicManager::CONS_Master_Arrive, "Strasbou", 7, 0, 0);
}
@@ -1254,8 +1254,8 @@ void LogicManager::CONS_Master_StartPart2(CONS_PARAMS) {
void LogicManager::HAND_Master_StartPart2(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressChapter] != 2) {
- _globals[kProgressChapter] = 2;
+ if (_globals[kGlobalChapter] != 2) {
+ _globals[kGlobalChapter] = 2;
makeAllJump(2);
}
@@ -1295,18 +1295,18 @@ void LogicManager::CONS_Master_InitPart2(CONS_PARAMS) {
void LogicManager::HAND_Master_InitPart2(HAND_PARAMS) {
switch (msg->action) {
case 12:
- _globals[kProgressIsTrainRunning] = 1;
+ _globals[kGlobalTrainIsRunning] = 1;
setDoor(26, kCharacterCath, 1, 0, 9);
setDoor(27, kCharacterCath, 1, 0, 9);
- _globals[kProgressField18] = 1;
+ _globals[kGlobalPhaseOfTheNight] = 1;
giveCathItem(kItemGreenJacket);
_items[kItemCorpse].floating = 0;
_items[kItemCorpse].haveIt = 0;
- _globals[kProgressJacket] = 2;
- _globals[kProgressPortrait] = 34;
- _globals[kProgressEventCorpseMovedFromFloor] = 1;
- _globals[kProgressEventFoundCorpse] = 1;
+ _globals[kGlobalJacket] = 2;
+ _globals[kGlobalCathIcon] = 34;
+ _globals[kGlobalCorpseMovedFromFloor] = 1;
+ _globals[kGlobalFoundCorpse] = 1;
dropItem(kItemBeetle, 3);
dropItem(kItem3, 1);
@@ -1365,7 +1365,7 @@ void LogicManager::CONS_Master_MovingDay(CONS_PARAMS) {
void LogicManager::HAND_Master_MovingDay(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressIsTrainRunning]) {
+ if (_globals[kGlobalTrainIsRunning]) {
if (getCharacterCurrentParams(kCharacterMaster)[1] ||
(getCharacterCurrentParams(kCharacterMaster)[1] = _realTime + getCharacterCurrentParams(kCharacterMaster)[0],
_realTime + getCharacterCurrentParams(kCharacterMaster)[0] != 0)) {
@@ -1424,8 +1424,8 @@ void LogicManager::CONS_Master_StartPart3(CONS_PARAMS) {
void LogicManager::HAND_Master_StartPart3(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressChapter] != 3) {
- _globals[kProgressChapter] = 3;
+ if (_globals[kGlobalChapter] != 3) {
+ _globals[kGlobalChapter] = 3;
makeAllJump(3);
}
@@ -1459,7 +1459,7 @@ void LogicManager::HAND_Master_InitPart3(HAND_PARAMS) {
send(kCharacterMaster, kCharacterTableE, 103798704, 0);
send(kCharacterMaster, kCharacterTableF, 103798704, 0);
- _globals[kProgressIsTrainRunning] = 1;
+ _globals[kGlobalTrainIsRunning] = 1;
setDoor(26, kCharacterCath, 1, 0, 9);
setDoor(27, kCharacterCath, 1, 0, 9);
@@ -1507,7 +1507,7 @@ void LogicManager::HAND_Master_MovingAfternoon(HAND_PARAMS) {
switch (msg->action) {
case 0:
{
- if (_globals[kProgressIsTrainRunning]) {
+ if (_globals[kGlobalTrainIsRunning]) {
bool skip1 = false;
if (!getCharacterCurrentParams(kCharacterMaster)[3]) {
@@ -1847,7 +1847,7 @@ void LogicManager::HAND_Master_EndVienna(HAND_PARAMS) {
} else if (_doneNIS[kEventKronosBringEgg]) {
endGame(1, 2155500, 60, true);
} else {
- if (_globals[kProgressFieldC0]) {
+ if (_globals[kGlobalRegisteredTimeAtWhichCathGaveFirebirdToKronos]) {
if (_doneNIS[kEventKronosReturnBriefcase]) {
endGame(1, 61, 61, true);
return;
@@ -1896,8 +1896,8 @@ void LogicManager::CONS_Master_StartPart4(CONS_PARAMS) {
void LogicManager::HAND_Master_StartPart4(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressChapter] != 4) {
- _globals[kProgressChapter] = 4;
+ if (_globals[kGlobalChapter] != 4) {
+ _globals[kGlobalChapter] = 4;
makeAllJump(4);
}
@@ -1940,7 +1940,7 @@ void LogicManager::HAND_Master_InitPart4(HAND_PARAMS) {
_engine->getSoundManager()->endAmbient();
_engine->getSoundManager()->startAmbient();
- _globals[kProgressIsTrainRunning] = 1;
+ _globals[kGlobalTrainIsRunning] = 1;
setDoor(26, kCharacterCath, 1, 0, 9);
setDoor(27, kCharacterCath, 1, 0, 9);
@@ -2000,7 +2000,7 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
case 0:
{
bool skip = false;
- if (_globals[kProgressIsTrainRunning]) {
+ if (_globals[kGlobalTrainIsRunning]) {
if (getCharacterCurrentParams(kCharacterMaster)[5] ||
(getCharacterCurrentParams(kCharacterMaster)[5] = _realTime + getCharacterCurrentParams(kCharacterMaster)[3], _realTime + getCharacterCurrentParams(kCharacterMaster)[3] != 0)) {
if (getCharacterCurrentParams(kCharacterMaster)[5] >= _realTime) {
@@ -2057,7 +2057,7 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
if (getModel(1) == 1 && _gameTime > 2403000 && !getCharacterCurrentParams(kCharacterMaster)[9]) {
getCharacterCurrentParams(kCharacterMaster)[9] = 1;
- _globals[kProgressField18] = 2;
+ _globals[kGlobalPhaseOfTheNight] = 2;
}
if (!getCharacterCurrentParams(kCharacterMaster)[0]) {
@@ -2078,14 +2078,14 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
if (_gameTime > 2470500 && !getCharacterCurrentParams(kCharacterMaster)[12]) {
getCharacterCurrentParams(kCharacterMaster)[12] = 1;
- if (_globals[kProgressField18] == 2)
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
_timeSpeed = 1;
}
if (_gameTime > 2506500 && !getCharacterCurrentParams(kCharacterMaster)[13]) {
getCharacterCurrentParams(kCharacterMaster)[13] = 1;
- if (_globals[kProgressField18] == 2)
- _globals[kProgressField18] = 1;
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
+ _globals[kGlobalPhaseOfTheNight] = 1;
}
if (_gameTime > 2520000 && !getCharacterCurrentParams(kCharacterMaster)[14]) {
@@ -2131,7 +2131,7 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
if (getModel(1) == 1 && _gameTime > 2403000 && !getCharacterCurrentParams(kCharacterMaster)[9]) {
getCharacterCurrentParams(kCharacterMaster)[9] = 1;
- _globals[kProgressField18] = 2;
+ _globals[kGlobalPhaseOfTheNight] = 2;
}
if (!getCharacterCurrentParams(kCharacterMaster)[0]) {
@@ -2152,14 +2152,14 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
if (_gameTime > 2470500 && !getCharacterCurrentParams(kCharacterMaster)[12]) {
getCharacterCurrentParams(kCharacterMaster)[12] = 1;
- if (_globals[kProgressField18] == 2)
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
_timeSpeed = 1;
}
if (_gameTime > 2506500 && !getCharacterCurrentParams(kCharacterMaster)[13]) {
getCharacterCurrentParams(kCharacterMaster)[13] = 1;
- if (_globals[kProgressField18] == 2)
- _globals[kProgressField18] = 1;
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
+ _globals[kGlobalPhaseOfTheNight] = 1;
}
if (_gameTime > 2520000 && !getCharacterCurrentParams(kCharacterMaster)[14]) {
@@ -2249,20 +2249,20 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
case 2:
if (getModel(1) == 1 && _gameTime > 2403000 && !getCharacterCurrentParams(kCharacterMaster)[9]) {
getCharacterCurrentParams(kCharacterMaster)[9] = 1;
- _globals[kProgressField18] = 2;
+ _globals[kGlobalPhaseOfTheNight] = 2;
}
if (getCharacterCurrentParams(kCharacterMaster)[0]) {
if (_gameTime > 2470500 && !getCharacterCurrentParams(kCharacterMaster)[12]) {
getCharacterCurrentParams(kCharacterMaster)[12] = 1;
- if (_globals[kProgressField18] == 2)
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
_timeSpeed = 1;
}
if (_gameTime > 2506500 && !getCharacterCurrentParams(kCharacterMaster)[13]) {
getCharacterCurrentParams(kCharacterMaster)[13] = 1;
- if (_globals[kProgressField18] == 2)
- _globals[kProgressField18] = 1;
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
+ _globals[kGlobalPhaseOfTheNight] = 1;
}
if (_gameTime > 2520000 && !getCharacterCurrentParams(kCharacterMaster)[14]) {
@@ -2296,14 +2296,14 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
case 4:
if (_gameTime > 2470500 && !getCharacterCurrentParams(kCharacterMaster)[12]) {
getCharacterCurrentParams(kCharacterMaster)[12] = 1;
- if (_globals[kProgressField18] == 2)
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
_timeSpeed = 1;
}
if (_gameTime > 2506500 && !getCharacterCurrentParams(kCharacterMaster)[13]) {
getCharacterCurrentParams(kCharacterMaster)[13] = 1;
- if (_globals[kProgressField18] == 2)
- _globals[kProgressField18] = 1;
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
+ _globals[kGlobalPhaseOfTheNight] = 1;
}
if (_gameTime > 2520000 && !getCharacterCurrentParams(kCharacterMaster)[14]) {
@@ -2326,7 +2326,7 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
_engine->getSoundManager()->endAmbient();
playNIS(kEventTylerCastleDream);
_engine->getSoundManager()->startAmbient();
- _globals[kProgressField18] = 1;
+ _globals[kGlobalPhaseOfTheNight] = 1;
bumpCathTylerComp();
send(kCharacterMaster, kCharacterTatiana, 169360385, 0);
_timeSpeed = 1;
@@ -2399,7 +2399,7 @@ void LogicManager::HAND_Master_MovingSecondNight(HAND_PARAMS) {
startSeqOtis(kCharacterMaster, "BOMB");
break;
case 190346110:
- _globals[kProgressField18] = 3;
+ _globals[kGlobalPhaseOfTheNight] = 3;
getCharacterCurrentParams(kCharacterMaster)[0] = 1;
if (getCharacterParams(kCharacterMaster, 8)[1] || getCharacterParams(kCharacterMaster, 8)[2]) {
endDialog(kCharacterMaster);
@@ -2500,8 +2500,8 @@ void LogicManager::CONS_Master_StartPart5(CONS_PARAMS) {
void LogicManager::HAND_Master_StartPart5(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressChapter] != 5) {
- _globals[kProgressChapter] = 5;
+ if (_globals[kGlobalChapter] != 5) {
+ _globals[kGlobalChapter] = 5;
makeAllJump(5);
}
@@ -2535,7 +2535,7 @@ void LogicManager::HAND_Master_InitPart5(HAND_PARAMS) {
endGraphics(kCharacterTableE);
endGraphics(kCharacterTableF);
- _globals[kProgressIsTrainRunning] = 1;
+ _globals[kGlobalTrainIsRunning] = 1;
setDoor(26, kCharacterCath, 1, 0, 9);
setDoor(27, kCharacterCath, 1, 0, 9);
@@ -2570,10 +2570,10 @@ void LogicManager::HAND_Master_InitPart5(HAND_PARAMS) {
setDoor(26, kCharacterCath, 0, 10, 9);
setDoor(27, kCharacterCath, 0, 10, 9);
- _globals[kProgressField18] = 1;
+ _globals[kGlobalPhaseOfTheNight] = 1;
_activeItem = 0;
- _globals[kProgressField84] = 1;
- _globals[kProgressPortrait] = 36;
+ _globals[kGlobalCathInSpecialState] = 1;
+ _globals[kGlobalCathIcon] = 36;
takeCathItem(kItemKey);
takeCathItem(kItemBomb);
@@ -2635,7 +2635,7 @@ void LogicManager::HAND_Master_MovingPart5(HAND_PARAMS) {
case 0:
if (_gameTime > 2907000 && !getCharacterCurrentParams(kCharacterMaster)[1]) {
getCharacterCurrentParams(kCharacterMaster)[1] = 1;
- if (!_globals[kProgressIsDayTime]) {
+ if (!_globals[kGlobalIsDayTime]) {
playDialog(kCharacterMaster, "ARRIVE", 8, 0);
_engine->getSoundManager()->endAmbient();
}
@@ -2670,7 +2670,7 @@ void LogicManager::HAND_Master_MovingPart5(HAND_PARAMS) {
break;
case 135800432:
- _globals[kProgressIsDayTime] = 1;
+ _globals[kGlobalIsDayTime] = 1;
_gameTime = 2916000;
if (whoRunningDialog(kCharacterMaster))
diff --git a/engines/lastexpress/characters/max.cpp b/engines/lastexpress/characters/max.cpp
index 4cdba076646..e0fdf3d7dfd 100644
--- a/engines/lastexpress/characters/max.cpp
+++ b/engines/lastexpress/characters/max.cpp
@@ -447,9 +447,9 @@ void LogicManager::HAND_Max_Escaped(HAND_PARAMS) {
if (!whoOnScreen(kCharacterMax) || !getCharacterCurrentParams(kCharacterMax)[1]) {
getCharacterCurrentParams(kCharacterMax)[1] = _gameTime;
if (!_gameTime) {
- if (_globals[kProgressChapter] == 3) {
+ if (_globals[kGlobalChapter] == 3) {
CONS_Max_LetMeIn3(0, 0, 0, 0);
- } else if (_globals[kProgressChapter] == 4) {
+ } else if (_globals[kGlobalChapter] == 4) {
CONS_Max_LetMeIn4(0, 0, 0, 0);
}
}
@@ -460,9 +460,9 @@ void LogicManager::HAND_Max_Escaped(HAND_PARAMS) {
}
getCharacterCurrentParams(kCharacterMax)[1] = 0x7FFFFFFF;
- if (_globals[kProgressChapter] == 3) {
+ if (_globals[kGlobalChapter] == 3) {
CONS_Max_LetMeIn3(0, 0, 0, 0);
- } else if (_globals[kProgressChapter] == 4) {
+ } else if (_globals[kGlobalChapter] == 4) {
CONS_Max_LetMeIn4(0, 0, 0, 0);
}
}
diff --git a/engines/lastexpress/characters/milos.cpp b/engines/lastexpress/characters/milos.cpp
index bcc9da981d0..2d1a7f156e2 100644
--- a/engines/lastexpress/characters/milos.cpp
+++ b/engines/lastexpress/characters/milos.cpp
@@ -433,7 +433,7 @@ void LogicManager::HAND_Milos_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterMilos)[7] = 0;
}
- if (_globals[kProgressChapter] == 1 && !getCharacterCurrentParams(kCharacterMilos)[4]) {
+ if (_globals[kGlobalChapter] == 1 && !getCharacterCurrentParams(kCharacterMilos)[4]) {
bool skip2 = false;
if (getCharacterCurrentParams(kCharacterMilos)[5]) {
@@ -453,9 +453,9 @@ void LogicManager::HAND_Milos_CompLogic(HAND_PARAMS) {
}
}
- if (!_globals[kProgressFieldCC]) {
- if (getCharacterParams(kCharacterMilos, 8)[2] && !_globals[kProgressField14] && !getCharacterCurrentParams(kCharacterMilos)[5]) {
- _globals[kProgressField14] = 14;
+ if (!_globals[kGlobalMetMilos]) {
+ if (getCharacterParams(kCharacterMilos, 8)[2] && !_globals[kGlobalCharacterSearchingForCath] && !getCharacterCurrentParams(kCharacterMilos)[5]) {
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterMilos;
send(kCharacterMilos, kCharacterVesna, 190412928, 0);
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 1;
MilosCall(&LogicManager::CONS_Milos_DoCorrOtis, "609Cg", 38, 0, 0);
@@ -473,7 +473,7 @@ void LogicManager::HAND_Milos_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterMilos)[9] = _gameTime + 150;
if (_gameTime == -150) {
if (nearChar(kCharacterCath, kCharacterMilos, 2000))
- _globals[kProgressField98] = 1;
+ _globals[kGlobalOverheardVesnaAndMilosDebatingAboutCath] = 1;
setDoor(38, kCharacterMilos, 3, 0, 0);
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 6;
@@ -488,7 +488,7 @@ void LogicManager::HAND_Milos_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterMilos)[9] = 0x7FFFFFFF;
if (nearChar(kCharacterCath, kCharacterMilos, 2000))
- _globals[kProgressField98] = 1;
+ _globals[kGlobalOverheardVesnaAndMilosDebatingAboutCath] = 1;
setDoor(38, kCharacterMilos, 3, 0, 0);
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 6;
@@ -550,8 +550,8 @@ void LogicManager::HAND_Milos_CompLogic(HAND_PARAMS) {
MilosCall(&LogicManager::CONS_Milos_KnockTyler, 0, 0, 0, 0);
break;
case 3:
- if (_globals[kProgressField14] == 14)
- _globals[kProgressField14] = 0;
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterMilos)
+ _globals[kGlobalCharacterSearchingForCath] = 0;
getCharacterCurrentParams(kCharacterMilos)[5] = 1;
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 4;
@@ -702,7 +702,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressField14] == 29 || _globals[kProgressField14] == 3) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice || _globals[kGlobalCharacterSearchingForCath] == kCharacterCond1) {
if (getCharacterCurrentParams(kCharacterMilos)[1]) {
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 1;
MilosCall(&LogicManager::CONS_Milos_DoCorrOtis, "609Ca", 1, 0, 0);
@@ -759,7 +759,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterMilos)[9] = 0;
break;
}
- } else if (!_globals[kProgressEventCorpseMovedFromFloor] || _globals[kProgressJacket] == 1) {
+ } else if (!_globals[kGlobalCorpseMovedFromFloor] || _globals[kGlobalJacket] == 1) {
setDoor(9, kCharacterCath, 0, 255, 255);
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 2;
MilosCall(&LogicManager::CONS_Milos_SaveGame, 2, kEventMilosCorpseFloor, 0, 0);
@@ -789,7 +789,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
softReleaseAtDoor(kCharacterMilos, 1);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 13;
MilosCall(&LogicManager::CONS_Milos_DoCorrOtis, "609Ba", 1, 0, 0);
} else if (checkLoc(kCharacterCath, kCarGreenSleeping)) {
@@ -817,7 +817,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
break;
case 9:
- if (!_globals[kProgressEventCorpseMovedFromFloor] || _globals[kProgressJacket] == 1) {
+ if (!_globals[kGlobalCorpseMovedFromFloor] || _globals[kGlobalJacket] == 1) {
setDoor(9, kCharacterCath, 0, 255, 255);
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 16;
MilosCall(&LogicManager::CONS_Milos_SaveGame, 2, kEventMilosCorpseFloor, 0, 0);
@@ -870,7 +870,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
case 2:
playDialog(0, "LIB014", -1, 0);
playNIS(kEventMilosCorpseFloor);
- endGame(0, 1, _globals[kProgressEventCorpseMovedFromFloor] == kProgressField0 ? 57 : 55, 1);
+ endGame(0, 1, _globals[kGlobalCorpseMovedFromFloor] == 0 ? 57 : 55, 1);
break;
case 3:
setDoor(1, kCharacterCath, 0, 10, 9);
@@ -890,7 +890,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
}
_gameTime += 1800;
- _globals[kProgressFieldCC] = 1;
+ _globals[kGlobalMetMilos] = 1;
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 5;
MilosCall(&LogicManager::CONS_Milos_SaveGame, 2, kEventMilosTylerCompartmentDefeat, 0, 0);
break;
@@ -934,7 +934,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
}
softReleaseAtDoor(kCharacterMilos, 1);
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 13;
MilosCall(&LogicManager::CONS_Milos_DoCorrOtis, "609Ba", 1, 0, 0);
} else if (checkLoc(kCharacterCath, kCarGreenSleeping)) {
@@ -971,7 +971,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
}
playNIS(kEventMilosCorpseFloor);
- endGame(0, 1, _globals[kProgressEventCorpseMovedFromFloor] == 0 ? 57 : 55, true);
+ endGame(0, 1, _globals[kGlobalCorpseMovedFromFloor] == 0 ? 57 : 55, true);
break;
case 17:
if (checkDoor(1) != 1) {
@@ -993,7 +993,7 @@ void LogicManager::HAND_Milos_KnockTyler(HAND_PARAMS) {
endGame(0, 0, 0, fightOutcome == 1);
} else {
_gameTime += 1800;
- _globals[kProgressFieldCC] = 1;
+ _globals[kGlobalMetMilos] = 1;
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 19;
MilosCall(&LogicManager::CONS_Milos_SaveGame, 2, kEventMilosTylerCompartmentDefeat, 0, 0);
}
@@ -1694,7 +1694,7 @@ void LogicManager::CONS_Milos_Friendly(CONS_PARAMS) {
void LogicManager::HAND_Milos_Friendly(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (!_doneNIS[kEventMilosCompartmentVisitTyler] && !_globals[kProgressField54] && !getCharacterParams(kCharacterMilos, 8)[3]) {
+ if (!_doneNIS[kEventMilosCompartmentVisitTyler] && !_globals[kGlobalAnnaIsInBaggageCar] && !getCharacterParams(kCharacterMilos, 8)[3]) {
bool skip = false;
if (!getCharacterCurrentParams(kCharacterMilos)[2]) {
@@ -1756,7 +1756,7 @@ void LogicManager::HAND_Milos_Friendly(HAND_PARAMS) {
break;
case 12:
setDoor(38, kCharacterMilos, 3, 10, 9);
- if (!_doneNIS[kEventMilosCompartmentVisitTyler] && !_globals[kProgressField54] && !getCharacterParams(kCharacterMilos, 8)[3]) {
+ if (!_doneNIS[kEventMilosCompartmentVisitTyler] && !_globals[kGlobalAnnaIsInBaggageCar] && !getCharacterParams(kCharacterMilos, 8)[3]) {
send(kCharacterMilos, kCharacterVesna, 155913424, 0);
}
@@ -1993,21 +1993,21 @@ void LogicManager::HAND_Milos_Conspiring(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterMilos)[2] = 1;
playDialog(kCharacterMilos, "Mil4013", -1, 0);
if (nearChar(kCharacterMilos, kCharacterCath, 2000))
- _globals[kProgressField94] = 1;
+ _globals[kGlobalOverheardMilosAndVesnaConspiring] = 1;
}
if (_gameTime > 2360700 && !getCharacterCurrentParams(kCharacterMilos)[3]) {
getCharacterCurrentParams(kCharacterMilos)[3] = 1;
playDialog(kCharacterMilos, "Mil4014", -1, 0);
if (nearChar(kCharacterMilos, kCharacterCath, 2000))
- _globals[kProgressField94] = 1;
+ _globals[kGlobalOverheardMilosAndVesnaConspiring] = 1;
}
if (_gameTime > 2370600 && !getCharacterCurrentParams(kCharacterMilos)[4]) {
getCharacterCurrentParams(kCharacterMilos)[4] = 1;
playDialog(kCharacterMilos, "Mil4015", -1, 0);
if (nearChar(kCharacterMilos, kCharacterCath, 2000))
- _globals[kProgressField94] = 1;
+ _globals[kGlobalOverheardMilosAndVesnaConspiring] = 1;
}
if (_gameTime > 2407500 && !getCharacterCurrentParams(kCharacterMilos)[5]) {
@@ -2194,7 +2194,7 @@ void LogicManager::CONS_Milos_RunningTrain(CONS_PARAMS) {
void LogicManager::HAND_Milos_RunningTrain(HAND_PARAMS) {
switch (msg->action) {
case 2:
- if (_globals[kProgressIsDayTime]) {
+ if (_globals[kGlobalIsDayTime]) {
endGame(0, 0, 52, true);
} else {
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 6;
@@ -2205,7 +2205,7 @@ void LogicManager::HAND_Milos_RunningTrain(HAND_PARAMS) {
case 18:
switch (getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8]) {
case 1:
- playNIS(((_globals[kProgressIsDayTime] == kProgressField0) + kEventLocomotiveMilosShovelingDay));
+ playNIS(((_globals[kGlobalIsDayTime] == 0) + kEventLocomotiveMilosShovelingDay));
cleanNIS();
break;
case 2:
@@ -2216,7 +2216,7 @@ void LogicManager::HAND_Milos_RunningTrain(HAND_PARAMS) {
endDialog("ARRIVE");
_engine->getSoundManager()->endAmbient();
- playNIS(((_globals[kProgressIsDayTime] == kProgressField0) + kEventLocomotiveMilosDay));
+ playNIS(((_globals[kGlobalIsDayTime] == 0) + kEventLocomotiveMilosDay));
claimNISLink(kCharacterMilos);
bumpCath(kCarCoalTender, 1, 255);
break;
@@ -2249,7 +2249,7 @@ void LogicManager::HAND_Milos_RunningTrain(HAND_PARAMS) {
case 168646401:
if (_doneNIS[kEventLocomotiveMilosShovelingDay] || _doneNIS[kEventLocomotiveMilosShovelingNight]) {
if (!_doneNIS[kEventLocomotiveMilosDay] && !_doneNIS[kEventLocomotiveMilosNight]) {
- if (_globals[kProgressIsDayTime] && _gameTime < 2943000)
+ if (_globals[kGlobalIsDayTime] && _gameTime < 2943000)
_gameTime = 2943000;
getCharacter(kCharacterMilos).callbacks[getCharacter(kCharacterMilos).currentCall + 8] = 2;
MilosCall(&LogicManager::CONS_Milos_SaveGame, 2, kEventLocomotiveMilosDay, 0, 0);
@@ -2261,7 +2261,7 @@ void LogicManager::HAND_Milos_RunningTrain(HAND_PARAMS) {
break;
case 169773228:
- if (_globals[kProgressIsDayTime]) {
+ if (_globals[kGlobalIsDayTime]) {
fadeDialog(kCharacterMilos);
if (_gameTime < 2949300)
_gameTime = 2949300;
diff --git a/engines/lastexpress/characters/monsieur.cpp b/engines/lastexpress/characters/monsieur.cpp
index 53dbe4f235a..c6433431dad 100644
--- a/engines/lastexpress/characters/monsieur.cpp
+++ b/engines/lastexpress/characters/monsieur.cpp
@@ -403,7 +403,7 @@ void LogicManager::HAND_Monsieur_GoDining(HAND_PARAMS) {
break;
case 12:
if (getCharacterCurrentParams(kCharacterMonsieur)[0]) {
- if (_globals[kProgressChapter] == 4) {
+ if (_globals[kGlobalChapter] == 4) {
setDoor(34, kCharacterCath, 0, 10, 9);
getCharacter(kCharacterMonsieur).callbacks[getCharacter(kCharacterMonsieur).currentCall + 8] = 1;
MonsieurCall(&LogicManager::CONS_Monsieur_DoCorrOtis, "607Hc", 34, 0, 0);
@@ -445,9 +445,9 @@ void LogicManager::HAND_Monsieur_GoDining(HAND_PARAMS) {
MonsieurCall(&LogicManager::CONS_Monsieur_DoSeqOtis, "812US", 0, 0, 0);
break;
case 6:
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
playDialog(kCharacterMonsieur, "MRB1075", -1, 60);
- } else if (_globals[kProgressChapter] == 3) {
+ } else if (_globals[kGlobalChapter] == 3) {
playDialog(kCharacterMonsieur, "MRB3101", -1, 0);
}
diff --git a/engines/lastexpress/characters/police.cpp b/engines/lastexpress/characters/police.cpp
index 933c0890ce1..49841405658 100644
--- a/engines/lastexpress/characters/police.cpp
+++ b/engines/lastexpress/characters/police.cpp
@@ -610,7 +610,7 @@ void LogicManager::HAND_Police_TrappedCath(HAND_PARAMS) {
if (cathOutHisWindow())
bumpCath(kCarGreenSleeping, 49, 255);
playDialog(kCharacterPolice, "LIB017", 16, 0);
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalJacket] == 1) {
getCharacter(kCharacterPolice).callbacks[getCharacter(kCharacterPolice).currentCall + 8] = 3;
PoliceCall(&LogicManager::CONS_Police_SaveGame, 2, kEventMertensBloodJacket, 0, 0);
} else {
@@ -715,7 +715,7 @@ void LogicManager::HAND_Police_SearchTrain(HAND_PARAMS) {
getCharacter(kCharacterPolice).characterPosition.car = kCarGreenSleeping;
getCharacter(kCharacterPolice).characterPosition.location = 0;
getCharacter(kCharacterPolice).characterPosition.position = 540;
- _globals[kProgressField14] = 29;
+ _globals[kGlobalCharacterSearchingForCath] = kCharacterPolice;
getCharacter(kCharacterPolice).callbacks[getCharacter(kCharacterPolice).currentCall + 8] = 1;
PoliceCall(&LogicManager::CONS_Police_DoWalk, 3, 5540, 0, 0);
break;
@@ -755,7 +755,7 @@ void LogicManager::HAND_Police_SearchTrain(HAND_PARAMS) {
break;
case 9:
if (getCharacter(kCharacterCath).characterPosition.car == 3) {
- _globals[kProgressField14] = 0;
+ _globals[kGlobalCharacterSearchingForCath] = 0;
endGraphics(kCharacterPolice);
send(kCharacterPolice, kCharacterTrainM, 168710784, 0);
CONS_Police_SearchDone(0, 0, 0, 0);
@@ -822,7 +822,7 @@ void LogicManager::HAND_Police_SearchTrain(HAND_PARAMS) {
PoliceCall(&LogicManager::CONS_Police_DoWalk, 4, 9460, 0, 0);
break;
case 24:
- _globals[kProgressField14] = 0;
+ _globals[kGlobalCharacterSearchingForCath] = 0;
endGraphics(kCharacterPolice);
send(kCharacterPolice, kCharacterTrainM, 168710784, 0);
CONS_Police_SearchDone(0, 0, 0, 0);
diff --git a/engines/lastexpress/characters/rebecca.cpp b/engines/lastexpress/characters/rebecca.cpp
index 1e0f6ab6adb..deea88df1af 100644
--- a/engines/lastexpress/characters/rebecca.cpp
+++ b/engines/lastexpress/characters/rebecca.cpp
@@ -605,7 +605,7 @@ void LogicManager::HAND_Rebecca_GotoDinner(HAND_PARAMS) {
case 5:
startCycOtis(kCharacterRebecca, "012A");
- if (_globals[kProgressChapter] == 3)
+ if (_globals[kGlobalChapter] == 3)
playDialog(kCharacterRebecca, "REB3000", -1, 0);
send(kCharacterRebecca, kCharacterHeadWait, 269479296, 0);
@@ -676,7 +676,7 @@ void LogicManager::HAND_Rebecca_GotoSalon(HAND_PARAMS) {
getCharacter(kCharacterRebecca).characterPosition.position = 1540;
getCharacter(kCharacterRebecca).characterPosition.location = 0;
- if (_globals[kProgressChapter] == 3)
+ if (_globals[kGlobalChapter] == 3)
playDialog(kCharacterRebecca, "Reb3005", -1, 75);
if (getCharacterCurrentParams(kCharacterRebecca)[0]) {
@@ -895,7 +895,7 @@ void LogicManager::HAND_Rebecca_CompLogic(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterRebecca)[5] = 0;
}
- if (_globals[kProgressChapter] == 1 && !getCharacterParams(kCharacterRebecca, 8)[2]) {
+ if (_globals[kGlobalChapter] == 1 && !getCharacterParams(kCharacterRebecca, 8)[2]) {
if (getCharacterCurrentParams(kCharacterRebecca)[6] != 0x7FFFFFFF && _gameTime > 1174500) {
if (_gameTime > 1183500) {
getCharacterCurrentParams(kCharacterRebecca)[6] = 0x7FFFFFFF;
@@ -929,7 +929,7 @@ void LogicManager::HAND_Rebecca_CompLogic(HAND_PARAMS) {
break;
}
}
- } else if (_globals[kProgressChapter] == 3 && !getCharacterParams(kCharacterRebecca, 8)[3] && getCharacterCurrentParams(kCharacterRebecca)[7] != 0x7FFFFFFF && _gameTime > 2097000) {
+ } else if (_globals[kGlobalChapter] == 3 && !getCharacterParams(kCharacterRebecca, 8)[3] && getCharacterCurrentParams(kCharacterRebecca)[7] != 0x7FFFFFFF && _gameTime > 2097000) {
if (_gameTime > 2106000) {
getCharacterCurrentParams(kCharacterRebecca)[7] = 0x7FFFFFFF;
getCharacterParams(kCharacterRebecca, 8)[3] = 1;
@@ -1198,7 +1198,7 @@ void LogicManager::HAND_Rebecca_InSalon1A(HAND_PARAMS) {
if (_gameTime > 1080000) {
getCharacterCurrentParams(kCharacterRebecca)[3] = 0x7FFFFFFF;
if (inSalon(kCharacterCath))
- _globals[kProgressFieldB8] = 1;
+ _globals[kGlobalMetSophieAndRebecca] = 1;
getCharacter(kCharacterRebecca).callbacks[getCharacter(kCharacterRebecca).currentCall + 8] = 4;
RebeccaCall(&LogicManager::CONS_Rebecca_DoDialog, "REB1012", 0, 0, 0);
@@ -1209,7 +1209,7 @@ void LogicManager::HAND_Rebecca_InSalon1A(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterRebecca)[3] = _gameTime + 150;
if (_gameTime == -150) {
if (inSalon(kCharacterCath))
- _globals[kProgressFieldB8] = 1;
+ _globals[kGlobalMetSophieAndRebecca] = 1;
getCharacter(kCharacterRebecca).callbacks[getCharacter(kCharacterRebecca).currentCall + 8] = 4;
RebeccaCall(&LogicManager::CONS_Rebecca_DoDialog, "REB1012", 0, 0, 0);
@@ -1245,7 +1245,7 @@ void LogicManager::HAND_Rebecca_InSalon1A(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterRebecca)[3] = 0x7FFFFFFF;
if (inSalon(kCharacterCath))
- _globals[kProgressFieldB8] = 1;
+ _globals[kGlobalMetSophieAndRebecca] = 1;
getCharacter(kCharacterRebecca).callbacks[getCharacter(kCharacterRebecca).currentCall + 8] = 4;
RebeccaCall(&LogicManager::CONS_Rebecca_DoDialog, "REB1012", 0, 0, 0);
@@ -1299,7 +1299,7 @@ void LogicManager::HAND_Rebecca_InSalon1A(HAND_PARAMS) {
break;
case 5:
- _globals[kProgressFieldB4] = 1;
+ _globals[kGlobalOverheardSophieTalkingAboutCath] = 1;
getCharacterCurrentParams(kCharacterRebecca)[0] = 0;
if (getCharacterCurrentParams(kCharacterRebecca)[1]) {
@@ -1483,7 +1483,7 @@ void LogicManager::HAND_Rebecca_GoDinner(HAND_PARAMS) {
break;
case 3:
- _globals[kProgressFieldBC] = 1;
+ _globals[kGlobalKnowAboutRebeccaAndSophieRelationship] = 1;
if (!inDiningRoom(kCharacterAnna)) {
getCharacter(kCharacterRebecca).callbacks[getCharacter(kCharacterRebecca).currentCall + 8] = 5;
@@ -1715,7 +1715,7 @@ void LogicManager::HAND_Rebecca_InSalon2(HAND_PARAMS) {
if (_gameTime > 15803100) {
getCharacterCurrentParams(kCharacterRebecca)[3] = 0x7FFFFFFF;
playDialog(kCharacterRebecca, "Reb2001", -1, 0);
- _globals[kProgressFieldB0] = 1;
+ _globals[kGlobalKnowAboutRebeccaDiary] = 1;
getCharacterCurrentParams(kCharacterRebecca)[1] = 1;
skip = true;
}
@@ -1726,7 +1726,7 @@ void LogicManager::HAND_Rebecca_InSalon2(HAND_PARAMS) {
if (_gameTime == -450) {
skip = true;
playDialog(kCharacterRebecca, "Reb2001", -1, 0);
- _globals[kProgressFieldB0] = 1;
+ _globals[kGlobalKnowAboutRebeccaDiary] = 1;
getCharacterCurrentParams(kCharacterRebecca)[1] = 1;
}
}
@@ -1734,7 +1734,7 @@ void LogicManager::HAND_Rebecca_InSalon2(HAND_PARAMS) {
if (!skip && getCharacterCurrentParams(kCharacterRebecca)[3] < _gameTime) {
getCharacterCurrentParams(kCharacterRebecca)[3] = 0x7FFFFFFF;
playDialog(kCharacterRebecca, "Reb2001", -1, 0);
- _globals[kProgressFieldB0] = 1;
+ _globals[kGlobalKnowAboutRebeccaDiary] = 1;
getCharacterCurrentParams(kCharacterRebecca)[1] = 1;
}
}
diff --git a/engines/lastexpress/characters/tablec.cpp b/engines/lastexpress/characters/tablec.cpp
index df8cebd467b..33007b4b120 100644
--- a/engines/lastexpress/characters/tablec.cpp
+++ b/engines/lastexpress/characters/tablec.cpp
@@ -172,17 +172,17 @@ void LogicManager::CONS_TableC_Idling(CONS_PARAMS) {
void LogicManager::HAND_TableC_Idling(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
if (_gameTime > 1165500 && !getCharacterCurrentParams(kCharacterTableC)[0]) {
getCharacterCurrentParams(kCharacterTableC)[0] = 1;
fadeDialog(kCharacterTableC);
}
- } else if (_globals[kProgressChapter] == 3) {
+ } else if (_globals[kGlobalChapter] == 3) {
if (_gameTime > 2052000 && !getCharacterCurrentParams(kCharacterTableC)[1]) {
getCharacterCurrentParams(kCharacterTableC)[1] = 1;
fadeDialog(kCharacterTableC);
}
- } else if (_globals[kProgressChapter] == 4 && _gameTime > 2488500 && !getCharacterCurrentParams(kCharacterTableC)[2]) {
+ } else if (_globals[kGlobalChapter] == 4 && _gameTime > 2488500 && !getCharacterCurrentParams(kCharacterTableC)[2]) {
getCharacterCurrentParams(kCharacterTableC)[2] = 1;
fadeDialog(kCharacterTableC);
}
diff --git a/engines/lastexpress/characters/tatiana.cpp b/engines/lastexpress/characters/tatiana.cpp
index e57c096c715..9b076856e92 100644
--- a/engines/lastexpress/characters/tatiana.cpp
+++ b/engines/lastexpress/characters/tatiana.cpp
@@ -515,7 +515,7 @@ void LogicManager::HAND_Tatiana_EnterComp(HAND_PARAMS) {
case 12:
send(kCharacterTatiana, kCharacterCond2, 326348944, 0);
- if (_globals[kProgressChapter] != 1) {
+ if (_globals[kGlobalChapter] != 1) {
startCycOtis(kCharacterTatiana, "673Fb");
} else {
startCycOtis(kCharacterTatiana, "603Fb");
@@ -537,7 +537,7 @@ void LogicManager::HAND_Tatiana_EnterComp(HAND_PARAMS) {
break;
case 69239528:
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
getCharacter(kCharacterTatiana).callbacks[getCharacter(kCharacterTatiana).currentCall + 8] = 1;
TatianaCall(&LogicManager::CONS_Tatiana_DoEnterCorrOtis, "603Db", 33, 0, 0);
} else {
@@ -564,7 +564,7 @@ void LogicManager::CONS_Tatiana_ExitComp(CONS_PARAMS) {
void LogicManager::HAND_Tatiana_ExitComp(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
getCharacter(kCharacterTatiana).callbacks[getCharacter(kCharacterTatiana).currentCall + 8] = 1;
TatianaCall(&LogicManager::CONS_Tatiana_DoCorrOtis, "603Bb", 33, 0, 0);
} else {
@@ -579,7 +579,7 @@ void LogicManager::HAND_Tatiana_ExitComp(HAND_PARAMS) {
getCharacter(kCharacterTatiana).characterPosition.location = 0;
send(kCharacterTatiana, kCharacterCond2, 292048641, 0);
- if (_globals[kProgressChapter] != 1) {
+ if (_globals[kGlobalChapter] != 1) {
startCycOtis(kCharacterTatiana, "673Fb");
} else {
startCycOtis(kCharacterTatiana, "603Fb");
@@ -872,7 +872,7 @@ void LogicManager::HAND_Tatiana_AtDinner(HAND_PARAMS) {
playDialog(kCharacterTatiana, "TAT1069B", -1, 0);
}
- _globals[kProgressField64] = 1;
+ _globals[kGlobalMetTatianaAndVassili] = 1;
getCharacterCurrentParams(kCharacterTatiana)[2]++;
getCharacterCurrentParams(kCharacterTatiana)[4] = 0;
}
@@ -897,7 +897,7 @@ void LogicManager::HAND_Tatiana_AtDinner(HAND_PARAMS) {
playDialog(kCharacterTatiana, "TAT1069B", -1, 0);
}
- _globals[kProgressField64] = 1;
+ _globals[kGlobalMetTatianaAndVassili] = 1;
getCharacterCurrentParams(kCharacterTatiana)[2]++;
getCharacterCurrentParams(kCharacterTatiana)[5] = 0;
}
@@ -1058,7 +1058,7 @@ void LogicManager::HAND_Tatiana_ReturnToComp(HAND_PARAMS) {
break;
case 5:
case 6:
- if (_globals[kProgressField14] == 29) {
+ if (_globals[kGlobalCharacterSearchingForCath] == kCharacterPolice) {
getCharacter(kCharacterTatiana).callbacks[getCharacter(kCharacterTatiana).currentCall + 8] = 6;
TatianaCall(&LogicManager::CONS_Tatiana_CompLogic, _gameTime + 900, 0, 0, 0);
} else {
@@ -1572,7 +1572,7 @@ void LogicManager::HAND_Tatiana_PlayChess(HAND_PARAMS) {
playDialog(kCharacterTatiana, (char *)&getCharacterCurrentParams(kCharacterTatiana)[5], -1, 0);
if (getCharacterCurrentParams(kCharacterTatiana)[2] == 4 && inSalon(kCharacterCath))
- _globals[kProgressField90] = 1;
+ _globals[kGlobalOverheardTatianaAndAlexeiPlayingChess] = 1;
getCharacterCurrentParams(kCharacterTatiana)[1] = 1;
}
@@ -1865,7 +1865,7 @@ void LogicManager::HAND_Tatiana_AfterConcert(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterTatiana)[3] != 0x7FFFFFFF && getCharacterCurrentParams(kCharacterTatiana)[2] < _gameTime) {
if (_gameTime > 2227500) {
getCharacterCurrentParams(kCharacterTatiana)[3] = 0x7FFFFFFF;
- _globals[kProgressField5C] = 1;
+ _globals[kGlobalTatianaFoundOutEggStolen] = 1;
if (inComp(kCharacterAnna, kCarRedSleeping, 4070)) {
CONS_Tatiana_CryAnna(0, 0, 0, 0);
@@ -1878,7 +1878,7 @@ void LogicManager::HAND_Tatiana_AfterConcert(HAND_PARAMS) {
if (_gameTime == -450) {
skip = true;
- _globals[kProgressField5C] = 1;
+ _globals[kGlobalTatianaFoundOutEggStolen] = 1;
if (inComp(kCharacterAnna, kCarRedSleeping, 4070)) {
CONS_Tatiana_CryAnna(0, 0, 0, 0);
break;
@@ -1888,7 +1888,7 @@ void LogicManager::HAND_Tatiana_AfterConcert(HAND_PARAMS) {
if (!skip && getCharacterCurrentParams(kCharacterTatiana)[3] < _gameTime) {
getCharacterCurrentParams(kCharacterTatiana)[3] = 0x7FFFFFFF;
- _globals[kProgressField5C] = 1;
+ _globals[kGlobalTatianaFoundOutEggStolen] = 1;
if (inComp(kCharacterAnna, kCarRedSleeping, 4070)) {
CONS_Tatiana_CryAnna(0, 0, 0, 0);
break;
@@ -2192,7 +2192,7 @@ void LogicManager::HAND_Tatiana_TrapCath(HAND_PARAMS) {
switch (msg->action) {
case 0:
if (getCharacterCurrentParams(kCharacterTatiana)[0]) {
- if (inSuite(kCharacterCath, kCarRedSleeping, 7850) && !_doneNIS[kEventVassiliCompartmentStealEgg] && (_gameTime <= 2133000 || _globals[kProgressField40])) {
+ if (inSuite(kCharacterCath, kCarRedSleeping, 7850) && !_doneNIS[kEventVassiliCompartmentStealEgg] && (_gameTime <= 2133000 || _globals[kGlobalConcertIsHappening])) {
if (inComp(kCharacterCath, kCarRedSleeping, 7500)) {
send(kCharacterTatiana, kCharacterCond2, 235061888, 0);
endGraphics(kCharacterTatiana);
@@ -2426,9 +2426,9 @@ void LogicManager::HAND_Tatiana_WithAlexei(HAND_PARAMS) {
if (_timeSpeed > getCharacterCurrentParams(kCharacterTatiana)[0]) {
playDialog(kCharacterTatiana, (char *)&getCharacterCurrentParams(kCharacterTatiana)[5], -1, 0);
if (getCharacterCurrentParams(kCharacterTatiana)[3] == 4 && nearChar(kCharacterTatiana, kCharacterCath, 2000)) {
- _globals[kProgressField8C] = 1;
+ _globals[kGlobalOverheardAlexeiTellingTatianaAboutWantingToKillVassili] = 1;
} else if (getCharacterCurrentParams(kCharacterTatiana)[3] == 7 && nearChar(kCharacterTatiana, kCharacterCath, 2000)) {
- _globals[kProgressField88] = 1;
+ _globals[kGlobalOverheardAlexeiTellingTatianaAboutBomb] = 1;
}
getCharacterCurrentParams(kCharacterTatiana)[1] = 1;
@@ -2597,7 +2597,7 @@ void LogicManager::HAND_Tatiana_SeekCath(HAND_PARAMS) {
if (!getCharacterCurrentParams(kCharacterTatiana)[0]) {
if (!_doneNIS[kEventTatianaTylerCompartment] && inComp(kCharacterCath, kCarGreenSleeping, 8200)) {
getCharacterCurrentParams(kCharacterTatiana)[0] = 1;
- _globals[kProgressFieldE4] = 1;
+ _globals[kGlobalTatianaScheduledToVisitCath] = 1;
setDoor(1, kCharacterTatiana, checkDoor(1), 0, 9);
}
@@ -2609,7 +2609,7 @@ void LogicManager::HAND_Tatiana_SeekCath(HAND_PARAMS) {
// setDoor(1, kCharacterCath, checkDoor(1), 10, 9);
// }
- _globals[kProgressFieldE4] = 0;
+ _globals[kGlobalTatianaScheduledToVisitCath] = 0;
softReleaseAtDoor(kCharacterTatiana, 2);
getCharacter(kCharacterTatiana).callbacks[getCharacter(kCharacterTatiana).currentCall + 8] = 3;
TatianaCall(&LogicManager::CONS_Tatiana_DoWalk, 4, 7500, 0, 0);
@@ -2633,7 +2633,7 @@ void LogicManager::HAND_Tatiana_SeekCath(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterTatiana)[0]) {
setDoor(1, kCharacterCath, checkDoor(1), 10, 9);
}
- _globals[kProgressFieldE4] = 0;
+ _globals[kGlobalTatianaScheduledToVisitCath] = 0;
softReleaseAtDoor(kCharacterTatiana, 2);
getCharacter(kCharacterTatiana).callbacks[getCharacter(kCharacterTatiana).currentCall + 8] = 3;
TatianaCall(&LogicManager::CONS_Tatiana_DoWalk, 4, 7500, 0, 0);
@@ -2653,7 +2653,7 @@ void LogicManager::HAND_Tatiana_SeekCath(HAND_PARAMS) {
if (getCharacterCurrentParams(kCharacterTatiana)[0]) {
setDoor(1, kCharacterCath, checkDoor(1), 10, 9);
}
- _globals[kProgressFieldE4] = 0;
+ _globals[kGlobalTatianaScheduledToVisitCath] = 0;
softReleaseAtDoor(kCharacterTatiana, 2);
getCharacter(kCharacterTatiana).callbacks[getCharacter(kCharacterTatiana).currentCall + 8] = 3;
TatianaCall(&LogicManager::CONS_Tatiana_DoWalk, 4, 7500, 0, 0);
diff --git a/engines/lastexpress/characters/trainm.cpp b/engines/lastexpress/characters/trainm.cpp
index 66930591101..9e7ae7b14b6 100644
--- a/engines/lastexpress/characters/trainm.cpp
+++ b/engines/lastexpress/characters/trainm.cpp
@@ -662,7 +662,7 @@ void LogicManager::HAND_TrainM_KickCathOut(HAND_PARAMS) {
getCharacterCurrentParams(kCharacterTrainM)[1] = 1;
}
- if (isNight() && _globals[kProgressChapter] != 1)
+ if (isNight() && _globals[kGlobalChapter] != 1)
getCharacterCurrentParams(kCharacterTrainM)[1] = 1;
if (getCharacterCurrentParams(kCharacterTrainM)[0]) {
@@ -1223,10 +1223,10 @@ void LogicManager::HAND_TrainM_BoardPolice(HAND_PARAMS) {
case 18:
switch (getCharacter(kCharacterTrainM).callbacks[getCharacter(kCharacterTrainM).currentCall + 8]) {
case 1:
- takeItem(kCharacterTrainM);
+ takeItem(kItem9);
if (inOuterSanctum(kCharacterCath)) {
- if (_doneNIS[kProgressFieldCC]) {
- _globals[kProgressField3C] = 1;
+ if (_doneNIS[kEventKronosConversation]) {
+ _globals[kGlobalPoliceHasBoardedAndGone] = 1;
getCharacter(kCharacterTrainM).characterPosition.car = kCarGreenSleeping;
getCharacter(kCharacterTrainM).characterPosition.position = 540;
getCharacter(kCharacterTrainM).characterPosition.location = 0;
@@ -1276,7 +1276,7 @@ void LogicManager::HAND_TrainM_BoardPolice(HAND_PARAMS) {
}
send(kCharacterTrainM, kCharacterPolice, 169499649, 0);
- _globals[kProgressField3C] = 1;
+ _globals[kGlobalPoliceHasBoardedAndGone] = 1;
_timeSpeed = 1;
if (getCharacter(kCharacterTrainM).characterPosition.car == kCarRedSleeping) {
getCharacter(kCharacterTrainM).callbacks[getCharacter(kCharacterTrainM).currentCall + 8] = 6;
@@ -1288,8 +1288,8 @@ void LogicManager::HAND_TrainM_BoardPolice(HAND_PARAMS) {
break;
case 2:
- if (_doneNIS[kProgressFieldCC]) {
- _globals[kProgressField3C] = 1;
+ if (_doneNIS[kEventKronosConversation]) {
+ _globals[kGlobalPoliceHasBoardedAndGone] = 1;
getCharacter(kCharacterTrainM).characterPosition.car = kCarGreenSleeping;
getCharacter(kCharacterTrainM).characterPosition.position = 540;
getCharacter(kCharacterTrainM).characterPosition.location = 0;
@@ -1974,7 +1974,7 @@ void LogicManager::HAND_TrainM_DoDogProblem(HAND_PARAMS) {
TrainMCall(&LogicManager::CONS_TrainM_WalkBackToOffice, 0, 0, 0, 0);
break;
case 4:
- _globals[kProgressField48] = 1;
+ _globals[kGlobalMaxHasToStayInBaggage] = 1;
getCharacterParams(kCharacterTrainM, 8)[3] = 0;
getCharacter(kCharacterTrainM).currentCall--;
@@ -2122,7 +2122,7 @@ void LogicManager::HAND_TrainM_OnRearPlatform(HAND_PARAMS) {
getCharacter(kCharacterTrainM).characterPosition.location = 1;
getCharacter(kCharacterTrainM).characterPosition.position = 5799;
- if (!_globals[kProgressField3C]) {
+ if (!_globals[kGlobalPoliceHasBoardedAndGone]) {
getCharacter(kCharacterTrainM).callbacks[getCharacter(kCharacterTrainM).currentCall + 8] = 5;
TrainMCall(&LogicManager::CONS_TrainM_DoDialog, "Abb3035", 0, 0, 0);
} else {
diff --git a/engines/lastexpress/characters/vassili.cpp b/engines/lastexpress/characters/vassili.cpp
index 0379ee78798..a87e229f3e9 100644
--- a/engines/lastexpress/characters/vassili.cpp
+++ b/engines/lastexpress/characters/vassili.cpp
@@ -447,9 +447,9 @@ void LogicManager::CONS_Vassili_CathArrives(CONS_PARAMS) {
void LogicManager::HAND_Vassili_CathArrives(HAND_PARAMS) {
switch (msg->action) {
case 12:
- if (_globals[kProgressEventCorpseMovedFromFloor]) {
- if (_globals[kProgressEventCorpseThrown]) {
- if (_globals[kProgressJacket] == 1) {
+ if (_globals[kGlobalCorpseMovedFromFloor]) {
+ if (_globals[kGlobalCorpseHasBeenThrown]) {
+ if (_globals[kGlobalJacket] == 1) {
playNIS(kEventMertensBloodJacket);
endGame(0, 0, 0, true);
} else {
@@ -474,7 +474,7 @@ void LogicManager::HAND_Vassili_CathArrives(HAND_PARAMS) {
playNIS(kEventVassiliSeizure);
setDoor(32, kCharacterCath, 0, 10, 9);
setDoor(1, kCharacterCath, 0, 10, 9);
- _globals[kProgressField18] = 2;
+ _globals[kGlobalPhaseOfTheNight] = 2;
send(kCharacterVassili, kCharacterAnna, 191477936, 0);
send(kCharacterVassili, kCharacterTrainM, 191477936, 0);
send(kCharacterVassili, kCharacterCond2, 191477936, 0);
diff --git a/engines/lastexpress/characters/vesna.cpp b/engines/lastexpress/characters/vesna.cpp
index ba86e663579..3673e1b1081 100644
--- a/engines/lastexpress/characters/vesna.cpp
+++ b/engines/lastexpress/characters/vesna.cpp
@@ -793,7 +793,7 @@ void LogicManager::CONS_Vesna_InComp(CONS_PARAMS) {
void LogicManager::HAND_Vesna_InComp(HAND_PARAMS) {
switch (msg->action) {
case 0:
- if (_globals[kProgressField54] && getCharacterCurrentParams(kCharacterVesna)[6] != 0x7FFFFFFF && _gameTime) {
+ if (_globals[kGlobalAnnaIsInBaggageCar] && getCharacterCurrentParams(kCharacterVesna)[6] != 0x7FFFFFFF && _gameTime) {
if (_gameTime > 2250000) {
getCharacterCurrentParams(kCharacterVesna)[6] = 0x7FFFFFFF;
CONS_Vesna_KillAnna(0, 0, 0, 0);
diff --git a/engines/lastexpress/characters/waiter1.cpp b/engines/lastexpress/characters/waiter1.cpp
index abbe74961c3..12cc19737dc 100644
--- a/engines/lastexpress/characters/waiter1.cpp
+++ b/engines/lastexpress/characters/waiter1.cpp
@@ -389,7 +389,7 @@ void LogicManager::HAND_Waiter1_AbbotCheckMe(HAND_PARAMS) {
startCycOtis(kCharacterWaiter1, "029D");
getCharacter(kCharacterWaiter1).callbacks[getCharacter(kCharacterWaiter1).currentCall + 8] = 2;
- if (_globals[kProgressChapter] != 3) {
+ if (_globals[kGlobalChapter] != 3) {
Waiter1Call(&LogicManager::CONS_Waiter1_DoDialog, "Abb4001", 0, 0, 0);
} else {
Waiter1Call(&LogicManager::CONS_Waiter1_DoDialog, "Abb3016", 0, 0, 0);
diff --git a/engines/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp
index 3965a7f90a2..722d6d2b220 100644
--- a/engines/lastexpress/debug.cpp
+++ b/engines/lastexpress/debug.cpp
@@ -609,11 +609,11 @@ void LogicManager::renderCurrentSceneDebugger() {
"None", "Inventory", "SendCathMessage", "PlaySound", "PlayMusic",
"Knock", "Compartment", "PlaySounds", "PlayAnimation", "SetDoor",
"SetModel", "SetItem", "KnockInside", "TakeItem", "DropItem",
- "LinkOnGlobal", "Rattle", "DummyAction2", "LeanOutWindow", "AlmostFall",
+ "LinkOnGlobal", "Rattle", "DummyAction1", "LeanOutWindow", "AlmostFall",
"ClimbInWindow", "ClimbLadder", "ClimbDownTrain", "KronosSanctum", "EscapeBaggage",
- "EnterBaggage", "BombPuzzle", "Conductors", "KronosConcert", "PlayMusic2",
+ "EnterBaggage", "BombPuzzle", "Conductors", "KronosConcert", "LetterInAugustSuitcase",
"CatchBeetle", "ExitCompartment", "OutsideTrain", "FirebirdPuzzle", "OpenMatchBox",
- "OpenBed", "DummyAction3", "HintDialog", "MusicEggBox", "PlayMusic3",
+ "OpenBed", "DummyAction2", "HintDialog", "MusicEggBox", "FindEggUnderSink",
"Bed", "PlayMusicChapter", "PlayMusicChapterSetupTrain", "SwitchChapter", "EasterEgg"
};
@@ -745,7 +745,7 @@ void LogicManager::showTrainMapWindow() {
CarInfo *cars = nullptr;
int carCount = 0;
- switch (_state->_engine->getLogicManager()->_globals[kProgressChapter]) {
+ switch (_state->_engine->getLogicManager()->_globals[kGlobalChapter]) {
case 1:
cars = carsChapter1;
carCount = ARRAYSIZE(carsChapter1);
@@ -758,7 +758,7 @@ void LogicManager::showTrainMapWindow() {
break;
case 4:
case 5:
- if (_state->_engine->getLogicManager()->_globals[kProgressChapter] == 5 &&
+ if (_state->_engine->getLogicManager()->_globals[kGlobalChapter] == 5 &&
(_state->_engine->getLogicManager()->_doneNIS[kEventAugustUnhookCars] || _state->_engine->getLogicManager()->_doneNIS[kEventAugustUnhookCarsBetrayal])) {
cars = carsChapter5;
carCount = ARRAYSIZE(carsChapter5);
diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index 02f1cf468eb..be3b3041ca1 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -233,7 +233,7 @@ void CFight::timer(Event *event, bool isProcessing) {
_engine->setEventTickInternal(false);
if (_engine->_gracePeriodTimer) {
- if ((_engine->getLogicManager()->_globals[kProgressJacket] < 2 ? 225 : 450) == _engine->_gracePeriodTimer || _engine->_gracePeriodTimer == 900) {
+ if ((_engine->getLogicManager()->_globals[kGlobalJacket] < 2 ? 225 : 450) == _engine->_gracePeriodTimer || _engine->_gracePeriodTimer == 900) {
_eggIconBrightness = 0;
_eggIconBrightnessStep = 1;
}
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index aa235200191..212547f8d4b 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -71,7 +71,7 @@ int LogicManager::findCursor(Link *link) {
case kActionTakeItem:
if (link->param1 >= 32) {
result = kCursorNormal;
- } else if ((!_activeItem || _items[_activeItem].inPocket) && (link->param1 != 21 || _globals[kProgressEventCorpseMovedFromFloor] == 1)) {
+ } else if ((!_activeItem || _items[_activeItem].inPocket) && (link->param1 != 21 || _globals[kGlobalCorpseMovedFromFloor] == 1)) {
result = kCursorHand;
} else {
result = kCursorNormal;
@@ -81,7 +81,7 @@ int LogicManager::findCursor(Link *link) {
case kActionDropItem:
if (link->param1 >= 32) {
result = kCursorNormal;
- } else if (link->param1 != _activeItem || (link->param1 == 20 && !_globals[kProgressIsTrainRunning] && link->param2 == 4) || (link->param1 == 18 && link->param2 == 1 && _globals[kProgressField5C])) {
+ } else if (link->param1 != _activeItem || (link->param1 == 20 && !_globals[kGlobalTrainIsRunning] && link->param2 == 4) || (link->param1 == 18 && link->param2 == 1 && _globals[kGlobalTatianaFoundOutEggStolen])) {
result = kCursorNormal;
} else {
result = _items[_activeItem].mnum;
@@ -117,9 +117,9 @@ int LogicManager::findCursor(Link *link) {
break;
case kActionLeanOutWindow:
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
if ((_doneNIS[kEventCathLookOutsideWindowDay] || _doneNIS[kEventCathLookOutsideWindowNight] || getModel(1) == 1) &&
- _globals[kProgressIsTrainRunning] &&
+ _globals[kGlobalTrainIsRunning] &&
(link->param1 != 45 || (!inComp(kCharacterRebecca, kCarRedSleeping, 4840) && _doors[kObjectOutsideBetweenCompartments].status == 2)) &&
_activeItem != kItemBriefcase && _activeItem != kItemFirebird) {
result = kCursorForward;
@@ -132,11 +132,11 @@ int LogicManager::findCursor(Link *link) {
break;
case kActionAlmostFall:
- result = _globals[kProgressFieldC8] == 0 ? kCursorNormal : kCursorLeft;
+ result = _globals[kGlobalAlmostFallActionIsAvailable] == 0 ? kCursorNormal : kCursorLeft;
break;
case kActionClimbLadder:
- if (_globals[kProgressIsTrainRunning] && _activeItem != kItemBriefcase && _activeItem != kItemFirebird &&
- (_globals[kProgressChapter] == 2 || _globals[kProgressChapter] == 3 || _globals[kProgressChapter] == 5)) {
+ if (_globals[kGlobalTrainIsRunning] && _activeItem != kItemBriefcase && _activeItem != kItemFirebird &&
+ (_globals[kGlobalChapter] == 2 || _globals[kGlobalChapter] == 3 || _globals[kGlobalChapter] == 5)) {
result = kCursorUp;
} else {
result = kCursorNormal;
@@ -189,13 +189,13 @@ int LogicManager::findCursor(Link *link) {
break;
case kActionOpenBed:
- result = _globals[kProgressChapter] == 1 ? kCursorHand : kCursorNormal;
+ result = _globals[kGlobalChapter] == 1 ? kCursorHand : kCursorNormal;
break;
case kActionHintDialog:
result = getHintDialog(link->param1) == 0 ? kCursorNormal : kCursorHandPointer;
break;
case kActionBed:
- if (_globals[kProgressField18] == 2 && !_globals[kProgressFieldE4] && (_gameTime > 1404000 || (_globals[kProgressEventMetAugust] && _globals[kProgressFieldCC] && (!_globals[kProgressField24] || _globals[kProgressField3C])))) {
+ if (_globals[kGlobalPhaseOfTheNight] == 2 && !_globals[kGlobalTatianaScheduledToVisitCath] && (_gameTime > 1404000 || (_globals[kGlobalMetAugust] && _globals[kGlobalMetMilos] && (!_globals[kGlobalFrancoisHasSeenCorpseThrown] || _globals[kGlobalPoliceHasBoardedAndGone])))) {
result = kCursorSleep;
} else {
result = kCursorNormal;
@@ -606,7 +606,7 @@ void LogicManager::doPostFunction() {
if (_engine->isDemo())
break;
- if (_globals[kProgressField18] == 2)
+ if (_globals[kGlobalPhaseOfTheNight] == 2)
send(kCharacterCath, kCharacterMaster, 190346110, 0);
return;
@@ -618,7 +618,7 @@ void LogicManager::doPostFunction() {
return;
case kNodePullingStop:
{
- if (_gameTime < 2418300 && _globals[kProgressField18] != 4) {
+ if (_gameTime < 2418300 && _globals[kGlobalPhaseOfTheNight] != 4) {
Slot *slot = _engine->getSoundManager()->_soundCache;
if (slot) {
do {
@@ -634,9 +634,9 @@ void LogicManager::doPostFunction() {
playDialog(kCharacterClerk, "LIB050", 16, 0);
- if (_globals[kProgressChapter] == 1) {
+ if (_globals[kGlobalChapter] == 1) {
endGame(0, 0, 62, true);
- } else if (_globals[kProgressChapter] == 4) {
+ } else if (_globals[kGlobalChapter] == 4) {
endGame(0, 0, 64, true);
} else {
endGame(0, 0, 63, true);
@@ -813,7 +813,7 @@ void LogicManager::doAction(Link *link) {
break;
case kActionPlayMusic:
Common::sprintf_s(filename, "MUS%03d", link->param1);
- if (!dialogRunning(filename) && (link->param1 != 50 || _globals[kProgressChapter] == 5))
+ if (!dialogRunning(filename) && (link->param1 != 50 || _globals[kGlobalChapter] == 5))
playDialog(kCharacterCath, filename, 16, link->param2);
break;
@@ -892,7 +892,7 @@ void LogicManager::doAction(Link *link) {
_items[link->param1].floating = link->param2;
if (link->param1 == kItemCorpse) {
- _globals[kProgressEventCorpseMovedFromFloor] = (_items[kItemCorpse].floating == 3 || _items[kItemCorpse].floating == 4) ? 1 : 0;
+ _globals[kGlobalCorpseMovedFromFloor] = (_items[kItemCorpse].floating == 3 || _items[kItemCorpse].floating == 4) ? 1 : 0;
}
}
}
@@ -974,9 +974,9 @@ void LogicManager::doAction(Link *link) {
queueSFX(kCharacterCath, 82, 0);
if (link->param2 == 2) {
- if (!_globals[kProgressField58]) {
+ if (!_globals[kGlobalDoneSavePointAfterLeavingSuitcaseInCathComp]) {
_engine->getVCR()->writeSavePoint(1, 0, 0);
- _globals[kProgressField58] = 1;
+ _globals[kGlobalDoneSavePointAfterLeavingSuitcaseInCathComp] = 1;
}
if (_items[kItemParchemin].floating == 2) {
@@ -990,7 +990,7 @@ void LogicManager::doAction(Link *link) {
_items[link->param1].haveIt = 0;
_items[link->param1].floating = link->param2;
- if (link->param1 == 20)
+ if (link->param1 == kItemCorpse)
dropTyler(link->scene == 0);
_activeItem = 0;
@@ -1007,7 +1007,7 @@ void LogicManager::doAction(Link *link) {
if (_engine->isDemo())
break;
- if ((!_doneNIS[kEventCathLookOutsideWindowDay] && !_doneNIS[kEventCathLookOutsideWindowNight] && getModel(1) != 1) || !_globals[kProgressIsTrainRunning] || (link->param1 == 45 && (inComp(kCharacterRebecca, kCarRedSleeping, 4840) || _doors[kObjectOutsideBetweenCompartments].status != 2)) || _activeItem == kItemBriefcase || _activeItem == kItemFirebird) {
+ if ((!_doneNIS[kEventCathLookOutsideWindowDay] && !_doneNIS[kEventCathLookOutsideWindowNight] && getModel(1) != 1) || !_globals[kGlobalTrainIsRunning] || (link->param1 == 45 && (inComp(kCharacterRebecca, kCarRedSleeping, 4840) || _doors[kObjectOutsideBetweenCompartments].status != 2)) || _activeItem == kItemBriefcase || _activeItem == kItemFirebird) {
if (link->param1 == 9 || (link->param1 >= 44 && link->param1 <= 45)) {
if (isNight()) {
playNIS(kEventCathLookOutsideWindowNight);
@@ -1031,7 +1031,7 @@ void LogicManager::doAction(Link *link) {
playNIS(kEventCathGoOutsideTylerCompartmentDay);
}
- _globals[kProgressFieldC8] = 1;
+ _globals[kGlobalAlmostFallActionIsAvailable] = 1;
break;
case 44:
_doneNIS[kEventCathLookOutsideWindowDay] = 1;
@@ -1042,7 +1042,7 @@ void LogicManager::doAction(Link *link) {
playNIS(kEventCathGoOutsideDay);
}
- _globals[kProgressFieldC8] = 1;
+ _globals[kGlobalAlmostFallActionIsAvailable] = 1;
break;
case 45:
_doneNIS[kEventCathLookOutsideWindowDay] = 1;
@@ -1071,7 +1071,7 @@ void LogicManager::doAction(Link *link) {
playNIS(kEventCathSlipTylerCompartmentDay);
}
- _globals[kProgressFieldC8] = 0;
+ _globals[kGlobalAlmostFallActionIsAvailable] = 0;
if (link->scene)
return;
@@ -1085,7 +1085,7 @@ void LogicManager::doAction(Link *link) {
playNIS(kEventCathSlipDay);
}
- _globals[kProgressFieldC8] = 0;
+ _globals[kGlobalAlmostFallActionIsAvailable] = 0;
if (link->scene)
return;
@@ -1138,10 +1138,10 @@ void LogicManager::doAction(Link *link) {
break;
if (link->param1 == 1) {
- if (_globals[kProgressChapter] == 2 || _globals[kProgressChapter] == 3) {
+ if (_globals[kGlobalChapter] == 2 || _globals[kGlobalChapter] == 3) {
playNIS(kEventCathTopTrainGreenJacket);
- } else if (_globals[kProgressChapter] == 5) {
- playNIS(kEventCathTopTrainNoJacketDay - (_globals[kProgressIsDayTime] == kProgressField0));
+ } else if (_globals[kGlobalChapter] == 5) {
+ playNIS(kEventCathTopTrainNoJacketDay - (_globals[kGlobalIsDayTime] == 0));
}
if (link->scene)
@@ -1150,12 +1150,12 @@ void LogicManager::doAction(Link *link) {
if (link->param1 != 2)
return;
- if (_globals[kProgressChapter] == 2 || _globals[kProgressChapter] == 3) {
+ if (_globals[kGlobalChapter] == 2 || _globals[kGlobalChapter] == 3) {
playNIS(kEventCathClimbUpTrainGreenJacket);
playNIS(kEventCathTopTrainGreenJacket);
- } else if (_globals[kProgressChapter] == 5) {
- playNIS(kEventCathClimbUpTrainNoJacketDay - (_globals[kProgressIsDayTime] == 0));
- playNIS(kEventCathTopTrainNoJacketDay - (_globals[kProgressIsDayTime] == 0));
+ } else if (_globals[kGlobalChapter] == 5) {
+ playNIS(kEventCathClimbUpTrainNoJacketDay - (_globals[kGlobalIsDayTime] == 0));
+ playNIS(kEventCathTopTrainNoJacketDay - (_globals[kGlobalIsDayTime] == 0));
}
if (link->scene)
@@ -1168,10 +1168,10 @@ void LogicManager::doAction(Link *link) {
if (_engine->isDemo())
break;
- if (_globals[kProgressChapter] == 2 || _globals[kProgressChapter] == 3) {
+ if (_globals[kGlobalChapter] == 2 || _globals[kGlobalChapter] == 3) {
nisId = kEventCathClimbDownTrainGreenJacket;
- } else if (_globals[kProgressChapter] == 5) {
- if (_globals[kProgressIsDayTime] == 0) {
+ } else if (_globals[kGlobalChapter] == 5) {
+ if (_globals[kGlobalIsDayTime] == 0) {
nisId = kEventCathClimbDownTrainNoJacketNight;
} else {
nisId = kEventCathClimbDownTrainNoJacketDay;
@@ -1221,7 +1221,7 @@ void LogicManager::doAction(Link *link) {
break;
case 4:
- if (_globals[kProgressChapter] == 1)
+ if (_globals[kGlobalChapter] == 1)
send(kCharacterCath, kCharacterKronos, 202621266, 0);
break;
default:
@@ -1250,7 +1250,7 @@ void LogicManager::doAction(Link *link) {
case 3:
if (_doneNIS[kEventCathBurnRope]) {
playNIS(kEventCathRemoveBonds);
- _globals[kProgressField84] = 0;
+ _globals[kGlobalCathInSpecialState] = 0;
bumpCath(kCarBaggageRear, 89, 255);
link->scene = kSceneNone;
}
@@ -1376,11 +1376,11 @@ void LogicManager::doAction(Link *link) {
}
break;
- case kActionPlayMusic2:
+ case kActionLetterInAugustSuitcase:
if (_engine->isDemo())
break;
- _globals[kProgressFieldC] = 1;
+ _globals[kGlobalReadLetterInAugustSuitcase] = 1;
queueSFX(kCharacterCath, link->param1, link->param2);
Common::sprintf_s(filename, "MUS%03d", link->param3);
if (!dialogRunning(filename))
@@ -1408,21 +1408,21 @@ void LogicManager::doAction(Link *link) {
if (link->action != kActionCompartment) {
if (!_engine->isDemo()) {
if (link->action == kActionExitCompartment) {
- if (!_globals[kProgressField30] && _globals[kProgressJacket]) {
+ if (!_globals[kGlobalDoneSavePointAfterLeftCompWithNewJacket] && _globals[kGlobalJacket] != 0) {
_engine->getVCR()->writeSavePoint(1, kCharacterCath, 0);
- _globals[kProgressField30] = 1;
+ _globals[kGlobalDoneSavePointAfterLeftCompWithNewJacket] = 1;
}
setModel(1, link->param2);
}
if (_doors[kItemMatchBox].status != 1 && _doors[kItemMatchBox].status != 3 && _activeItem != kItemKey) {
- if (!_globals[kProgressEventFoundCorpse]) {
+ if (!_globals[kGlobalFoundCorpse]) {
_engine->getVCR()->writeSavePoint(1, kCharacterCath, 0);
playDialog(kCharacterCath, "LIB014", -1, 0);
playNIS(kEventCathFindCorpse);
playDialog(kCharacterCath, "LIB015", -1, 0);
- _globals[kProgressEventFoundCorpse] = 1;
+ _globals[kGlobalFoundCorpse] = 1;
link->scene = kSceneCompartmentCorpse;
return;
@@ -1503,9 +1503,9 @@ void LogicManager::doAction(Link *link) {
queueSFX(kCharacterCath, 14, 0);
queueSFX(kCharacterCath, 15, 22);
- if (_globals[kProgressField78] && !dialogRunning("MUS003")) {
+ if (_globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] && !dialogRunning("MUS003")) {
playDialog(kCharacterCath, "MUS003", 16, 0);
- _globals[kProgressField78] = 0;
+ _globals[kGlobalCanPlayKronosSuitcaseLeftInCompMusic] = 0;
}
bumpCath(kCarGreenSleeping, 77, 255);
@@ -1527,7 +1527,7 @@ void LogicManager::doAction(Link *link) {
send(kCharacterCath, kCharacterVesna, 202884544, 0);
break;
case 3:
- if (_globals[kProgressChapter] == 5) {
+ if (_globals[kGlobalChapter] == 5) {
send(kCharacterCath, kCharacterAbbot, 168646401, 0);
send(kCharacterCath, kCharacterMilos, 168646401, 0);
} else {
@@ -1579,7 +1579,7 @@ void LogicManager::doAction(Link *link) {
nisId = kEventCathOpenEggNoBackground;
}
- _globals[kProgressIsEggOpen] = 1;
+ _globals[kGlobalEggIsOpen] = 1;
break;
}
case 2:
@@ -1589,7 +1589,7 @@ void LogicManager::doAction(Link *link) {
nisId = kEventCathCloseEgg;
}
- _globals[kProgressIsEggOpen] = 0;
+ _globals[kGlobalEggIsOpen] = 0;
break;
case 3:
if (!inComp(kCharacterCath, kCarGreenSleeping, 8200)) {
@@ -1640,20 +1640,20 @@ void LogicManager::doAction(Link *link) {
break;
queueSFX(kCharacterCath, 43, 0);
- if (_globals[kProgressField7C] && !dialogRunning("MUS003")) {
+ if (_globals[kGlobalCanPlayEggSuitcaseMusic] && !dialogRunning("MUS003")) {
playDialog(kCharacterCath, "MUS003", 16, 0);
- _globals[kProgressField7C] = 0;
+ _globals[kGlobalCanPlayEggSuitcaseMusic] = 0;
}
break;
- case kActionPlayMusic3:
+ case kActionFindEggUnderSink:
if (_engine->isDemo())
break;
queueSFX(kCharacterCath, 24, 0);
- if (_globals[kProgressField80] && !dialogRunning("MUS003")) {
+ if (_globals[kGlobalCanPlayEggUnderSinkMusic] && !dialogRunning("MUS003")) {
playDialog(kCharacterCath, "MUS003", 16, 0);
- _globals[kProgressField80] = 0;
+ _globals[kGlobalCanPlayEggUnderSinkMusic] = 0;
}
break;
@@ -1673,7 +1673,7 @@ void LogicManager::doAction(Link *link) {
return;
case kActionPlayMusicChapter:
- switch (_globals[kProgressChapter]) {
+ switch (_globals[kGlobalChapter]) {
case 1:
musId = link->param1;
break;
@@ -1698,7 +1698,7 @@ void LogicManager::doAction(Link *link) {
if (_engine->isDemo())
break;
- switch (_globals[kProgressChapter]) {
+ switch (_globals[kGlobalChapter]) {
case 1:
musId = 1;
break;
@@ -1739,22 +1739,22 @@ void LogicManager::doAction(Link *link) {
}
void LogicManager::takeTyler(bool doCleanNIS, int8 bedPosition) {
- if (!_globals[kProgressJacket])
- _globals[kProgressJacket] = 1;
+ if (!_globals[kGlobalJacket])
+ _globals[kGlobalJacket] = 1;
if (_items[kItemCorpse].floating == 1) {
if (bedPosition == 4) {
- if (_globals[kProgressJacket])
+ if (_globals[kGlobalJacket])
playNIS(kEventCorpsePickFloorOpenedBedOriginal);
_items[kItemCorpse].floating = 5;
- } else if (_globals[kProgressJacket] == 2) {
+ } else if (_globals[kGlobalJacket] == 2) {
playNIS(kEventCorpsePickFloorGreen);
} else {
playNIS(kEventCorpsePickFloorOriginal);
}
} else if (_items[kItemCorpse].floating == 2) {
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
playNIS(kEventCorpsePickBedGreen);
} else {
playNIS(kEventCorpsePickBedOriginal);
@@ -1768,7 +1768,7 @@ void LogicManager::takeTyler(bool doCleanNIS, int8 bedPosition) {
void LogicManager::dropTyler(bool doCleanNIS) {
switch (_items[kItemCorpse].floating) {
case 1:
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
playNIS(kEventCorpseDropFloorGreen);
} else {
playNIS(kEventCorpseDropFloorOriginal);
@@ -1776,7 +1776,7 @@ void LogicManager::dropTyler(bool doCleanNIS) {
break;
case 2:
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
playNIS(kEventCorpseDropBedGreen);
} else {
playNIS(kEventCorpseDropBedOriginal);
@@ -1785,21 +1785,21 @@ void LogicManager::dropTyler(bool doCleanNIS) {
break;
case 4:
_items[kItemCorpse].floating = 0;
- _globals[kProgressEventCorpseThrown] = 1;
+ _globals[kGlobalCorpseHasBeenThrown] = 1;
if (_gameTime <= 1138500) {
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
playNIS(kEventCorpseDropWindowGreen);
} else {
playNIS(kEventCorpseDropWindowOriginal);
}
- _globals[kProgressField24] = 1;
+ _globals[kGlobalFrancoisHasSeenCorpseThrown] = 1;
} else {
playNIS(kEventCorpseDropBridge);
}
- _globals[kProgressEventCorpseMovedFromFloor] = 1;
+ _globals[kGlobalCorpseMovedFromFloor] = 1;
break;
}
@@ -1809,13 +1809,13 @@ void LogicManager::dropTyler(bool doCleanNIS) {
}
void LogicManager::takeJacket(bool doCleanNIS) {
- _globals[kProgressJacket] = 2;
+ _globals[kGlobalJacket] = 2;
_items[kItemMatchBox].haveIt = 1;
_items[kItemMatchBox].floating = 0;
setDoor(9, kCharacterCath, 2, 255, 255);
playNIS(kEventPickGreenJacket);
- _globals[kProgressPortrait] = 34;
- _engine->getGraphicsManager()->drawItemDim(_globals[kProgressPortrait], 0, 0, 1);
+ _globals[kGlobalCathIcon] = 34;
+ _engine->getGraphicsManager()->drawItemDim(_globals[kGlobalCathIcon], 0, 0, 1);
_engine->getGraphicsManager()->burstBox(0, 0, 32, 32);
if (doCleanNIS)
@@ -1823,7 +1823,7 @@ void LogicManager::takeJacket(bool doCleanNIS) {
}
void LogicManager::takeScarf(bool doCleanNIS) {
- if (_globals[kProgressJacket] == 2) {
+ if (_globals[kGlobalJacket] == 2) {
playNIS(kEventPickScarfGreen);
} else {
playNIS(kEventPickScarfOriginal);
@@ -1862,7 +1862,7 @@ const char *LogicManager::getHintDialog(int character) {
} else if (_doneNIS[kEventAugustPresentAnna] ||
_doneNIS[kEventAugustPresentAnnaFirstIntroduction]) {
return "XANN5";
- } else if (_globals[kProgressField60]) {
+ } else if (_globals[kGlobalOverheardAugustInterruptingAnnaAtDinner]) {
return "XANN4";
} else if (_doneNIS[kEventAnnaGiveScarf] ||
_doneNIS[kEventAnnaGiveScarfDiner] ||
@@ -1899,7 +1899,7 @@ const char *LogicManager::getHintDialog(int character) {
return "XAUG3";
} else if (_doneNIS[kEventAugustPresentAnnaFirstIntroduction]) {
return "XAUG2";
- } else if (_globals[kProgressEventMertensAugustWaiting]) {
+ } else if (_globals[kGlobalKnowAboutAugust]) {
return "XAUG1";
}
@@ -1911,7 +1911,7 @@ const char *LogicManager::getHintDialog(int character) {
return "XTAT5";
} else if (_doneNIS[kEventTatianaGivePoem]) {
return "XTAT3";
- } else if (_globals[kProgressField64]) {
+ } else if (_globals[kGlobalMetTatianaAndVassili]) {
return "XTAT1";
}
@@ -1925,19 +1925,19 @@ const char *LogicManager::getHintDialog(int character) {
return "XVAS2";
} else if (_doneNIS[kEventVassiliSeizure]) {
return "XVAS1A";
- } else if (_globals[kProgressField64]) {
+ } else if (_globals[kGlobalMetTatianaAndVassili]) {
return "XVAS1";
}
break;
case kCharacterAlexei:
- if (_globals[kProgressField88]) {
+ if (_globals[kGlobalOverheardAlexeiTellingTatianaAboutBomb]) {
return "XALX6";
- } else if (_globals[kProgressField8C]) {
+ } else if (_globals[kGlobalOverheardAlexeiTellingTatianaAboutWantingToKillVassili]) {
return "XALX5";
- } else if (_globals[kProgressField90]) {
+ } else if (_globals[kGlobalOverheardTatianaAndAlexeiPlayingChess]) {
return "XALX4A";
- } else if (_globals[kProgressField68]) {
+ } else if (_globals[kGlobalOverheardTatianaAndAlexeiAtBreakfast]) {
return "XALX4";
} else if (_doneNIS[kEventAlexeiSalonPoem]) {
return "XALX3";
@@ -1967,11 +1967,11 @@ const char *LogicManager::getHintDialog(int character) {
if (_doneNIS[kEventLocomotiveMilosDay] || _doneNIS[kEventLocomotiveMilosNight]) {
return "XMIL5";
} else if (_doneNIS[kEventMilosCompartmentVisitTyler] &&
- (_globals[kProgressChapter] == 3 ||
- _globals[kProgressChapter] == 4)) {
+ (_globals[kGlobalChapter] == 3 ||
+ _globals[kGlobalChapter] == 4)) {
return "XMIL4";
} else if (_doneNIS[kEventMilosCorridorThanks] ||
- _globals[kProgressChapter] == 5) {
+ _globals[kGlobalChapter] == 5) {
return "XMIL3";
} else if (_doneNIS[kEventMilosCompartmentVisitAugust]) {
return "XMIL2";
@@ -1981,9 +1981,9 @@ const char *LogicManager::getHintDialog(int character) {
break;
case kCharacterVesna:
- if (_globals[kProgressField94]) {
+ if (_globals[kGlobalOverheardMilosAndVesnaConspiring]) {
return "XVES2";
- } else if (_globals[kProgressField98]) {
+ } else if (_globals[kGlobalOverheardVesnaAndMilosDebatingAboutCath]) {
return "XVES1";
}
@@ -2014,16 +2014,16 @@ const char *LogicManager::getHintDialog(int character) {
return "XKRO2";
}
- if (_globals[kProgressEventMertensChronosInvitation]) {
+ if (_globals[kGlobalKnowAboutKronos]) {
return "XKRO1";
}
}
break;
case kCharacterFrancois:
- if (_globals[kProgressField9C]) {
+ if (_globals[kGlobalFrancoisSawABlackBeetle]) {
return "XFRA3";
- } else if (_globals[kProgressFieldA0] ||
+ } else if (_globals[kGlobalOverheardMadameAndFrancoisTalkingAboutWhistle] ||
_doneNIS[kEventFrancoisWhistle] ||
_doneNIS[kEventFrancoisWhistleD] ||
_doneNIS[kEventFrancoisWhistleNight] ||
@@ -2035,69 +2035,69 @@ const char *LogicManager::getHintDialog(int character) {
break;
case kCharacterMadame:
- if (_globals[kProgressFieldA4]) {
+ if (_globals[kGlobalMadameDemandedMaxInBaggage]) {
return "XMME4";
- } else if (_globals[kProgressFieldA8]) {
+ } else if (_globals[kGlobalMadameComplainedAboutMax]) {
return "XMME3";
- } else if (_globals[kProgressFieldA0]) {
+ } else if (_globals[kGlobalOverheardMadameAndFrancoisTalkingAboutWhistle]) {
return "XMME2";
- } else if (_globals[kProgressFieldAC]) {
+ } else if (_globals[kGlobalMetMadame]) {
return "XMME1";
}
break;
case kCharacterMonsieur:
- if (_globals[kProgressEventMetBoutarel]) {
+ if (_globals[kGlobalMetMonsieur]) {
return "XMRB1";
}
break;
case kCharacterRebecca:
- if (_globals[kProgressFieldB4]) {
+ if (_globals[kGlobalOverheardSophieTalkingAboutCath]) {
return "XREB1A";
- } else if (_globals[kProgressFieldB8]) {
+ } else if (_globals[kGlobalMetSophieAndRebecca]) {
return "XREB1";
}
break;
case kCharacterSophie:
- if (_globals[kProgressFieldB0]) {
+ if (_globals[kGlobalKnowAboutRebeccaDiary]) {
return "XSOP2";
- } else if (_globals[kProgressFieldBC]) {
+ } else if (_globals[kGlobalKnowAboutRebeccaAndSophieRelationship]) {
return "XSOP1B";
- } else if (_globals[kProgressFieldB4]) {
+ } else if (_globals[kGlobalOverheardSophieTalkingAboutCath]) {
return "XSOP1A";
- } else if (!_globals[kProgressFieldB8]) {
+ } else if (!_globals[kGlobalMetSophieAndRebecca]) {
return "XSOP1";
}
break;
case kCharacterMahmud:
- if (_globals[kProgressFieldC4]) {
+ if (_globals[kGlobalMetMahmud]) {
return "XMAH1";
}
break;
case kCharacterYasmin:
- if (_globals[kProgressEventMetYasmin]) {
+ if (_globals[kGlobalMetYasmin]) {
return "XHAR2";
}
break;
case kCharacterHadija:
- if (_globals[kProgressEventMetHadija]) {
+ if (_globals[kGlobalMetHadija]) {
return "XHAR1";
}
break;
case kCharacterAlouan:
- if (_globals[kProgressFieldDC]) {
+ if (_globals[kGlobalMetAlouan]) {
return "XHAR3";
}
break;
case kCharacterPolice:
- if (_globals[kProgressFieldE0]) {
+ if (_globals[kGlobalMetFatima]) {
return "XHAR4";
}
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index e319178593a..365928bb92d 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -217,7 +217,7 @@ void LogicManager::fadeToWhite() {
}
void LogicManager::restoreIcons() {
- _engine->getGraphicsManager()->drawItemDim(_globals[kProgressPortrait], 0, 0, 1);
+ _engine->getGraphicsManager()->drawItemDim(_globals[kGlobalCathIcon], 0, 0, 1);
_engine->getGraphicsManager()->drawItemDim(_engine->_currentGameFileColorId + 39, 608, 448, 1);
if (_activeItem) {
@@ -379,8 +379,8 @@ bool LogicManager::isSingleFemale(int character) {
}
bool LogicManager::isNight() {
- int chapter = _globals[kProgressChapter];
- return chapter == 1 || chapter == 4 || (chapter == 5 && !_globals[kProgressIsDayTime]);
+ int chapter = _globals[kGlobalChapter];
+ return chapter == 1 || chapter == 4 || (chapter == 5 && !_globals[kGlobalIsDayTime]);
}
bool LogicManager::whoOutside(int character) {
@@ -2078,9 +2078,9 @@ void LogicManager::playChrExcuseMe(int character, int receivingCharacter, int vo
return;
}
- if (receivingCharacter == kCharacterCath && _globals[kProgressJacket] == 2 && rnd(2) != 0) {
+ if (receivingCharacter == kCharacterCath && _globals[kGlobalJacket] == 2 && rnd(2) != 0) {
if (isNight()) {
- if (_globals[kProgressField18] != 2) {
+ if (_globals[kGlobalPhaseOfTheNight] != 2) {
playDialog(0, "CON1110E", volume, 0);
} else {
playDialog(0, "CON1110F", volume, 0);
@@ -2106,7 +2106,7 @@ void LogicManager::playChrExcuseMe(int character, int receivingCharacter, int vo
case kCharacterCond2:
if (isFemale(receivingCharacter)) {
playDialog(0, "JAC1111D", volume, 0);
- } else if (!receivingCharacter && _globals[kProgressJacket] == 2 && rnd(2)) {
+ } else if (!receivingCharacter && _globals[kGlobalJacket] == 2 && rnd(2)) {
playDialog(0, "JAC1113B", volume, 0);
} else {
switch (rnd(4)) {
@@ -2283,7 +2283,7 @@ void LogicManager::playChrExcuseMe(int character, int receivingCharacter, int vo
playDialog(0, "MRB1104", volume, 0);
if (volume > 2)
- _globals[kProgressEventMetBoutarel] = 1;
+ _globals[kGlobalMetMonsieur] = 1;
return;
case kCharacterRebecca:
@@ -2335,7 +2335,7 @@ void LogicManager::playChrExcuseMe(int character, int receivingCharacter, int vo
playDialog(0, "HAR1002", volume, 0);
if (volume > 2)
- _globals[kProgressEventMetYasmin] = 1;
+ _globals[kGlobalMetYasmin] = 1;
return;
case kCharacterHadija:
@@ -2349,7 +2349,7 @@ void LogicManager::playChrExcuseMe(int character, int receivingCharacter, int vo
}
if (volume > 2)
- _globals[kProgressEventMetHadija] = 1;
+ _globals[kGlobalMetHadija] = 1;
return;
case kCharacterAlouan:
@@ -2623,7 +2623,7 @@ void LogicManager::playCondYelling(int character, int situation) {
playDialog(kCharacterCond2, "Jac1500", 16, 0);
break;
}
- } else if (_globals[kProgressField40] || (_gameTime > 2101500 && _gameTime < 2133000)) {
+ } else if (_globals[kGlobalConcertIsHappening] || (_gameTime > 2101500 && _gameTime < 2133000)) {
playDialog(kCharacterCond2, "Jac1507A", 16, 0);
} else {
playDialog(kCharacterCond2, "Jac1507", 16, 0);
@@ -2644,7 +2644,7 @@ void LogicManager::playCondYelling(int character, int situation) {
break;
}
} else {
- if (_globals[kProgressChapter] < 3) {
+ if (_globals[kGlobalChapter] < 3) {
playDialog(kCharacterCond2, "Jac1506", 16, 0);
_lastTickCondYellingCompC = _realTime;
return;
@@ -2697,7 +2697,7 @@ void LogicManager::playCondYelling(int character, int situation) {
}
}
- if (_globals[kProgressField40] || (_gameTime > 2115000 && _gameTime < 2133000)) {
+ if (_globals[kGlobalConcertIsHappening] || (_gameTime > 2115000 && _gameTime < 2133000)) {
playDialog(kCharacterCond2, "Jac1504B", 16, 0);
_lastTickCondYellingCompE = _realTime;
return;
@@ -2742,7 +2742,7 @@ void LogicManager::playCondYelling(int character, int situation) {
break;
}
} else {
- if (_globals[kProgressField40] || (_gameTime > 2083500 && _gameTime < 2133000)) {
+ if (_globals[kGlobalConcertIsHappening] || (_gameTime > 2083500 && _gameTime < 2133000)) {
playDialog(kCharacterCond2, "Jac1503B", 16, 0);
_lastTickCondYellingCompF = _realTime;
return;
diff --git a/engines/lastexpress/game/navigation.cpp b/engines/lastexpress/game/navigation.cpp
index b0532eb90ee..7ee4ef5ab11 100644
--- a/engines/lastexpress/game/navigation.cpp
+++ b/engines/lastexpress/game/navigation.cpp
@@ -196,7 +196,7 @@ void LogicManager::nodeStepTimer(Event *event) {
_actionJustPerformed = false;
if (_engine->_gracePeriodTimer && !_engine->getGraphicsManager()->_shouldDrawEggOrHourglass) {
- if ((_globals[kProgressJacket] < 2 ? 225 : 450) == _engine->_gracePeriodTimer || _engine->_gracePeriodTimer == 900) {
+ if ((_globals[kGlobalJacket] < 2 ? 225 : 450) == _engine->_gracePeriodTimer || _engine->_gracePeriodTimer == 900) {
_navigationItemBrightness = 0;
_navigationItemBrighnessStep = 1;
}
@@ -344,7 +344,7 @@ void LogicManager::getNewMnum() {
bool found = false;
if (_activeItem != kItemWhistle ||
- _globals[kProgressIsEggOpen] ||
+ _globals[kGlobalEggIsOpen] ||
checkCathDir(kCarGreenSleeping, 59) ||
checkCathDir(kCarGreenSleeping, 76) ||
_inventoryFlag1 ||
@@ -355,7 +355,7 @@ void LogicManager::getNewMnum() {
if (_activeItem != kItemMatch ||
(!cathInCorridor(kCarGreenSleeping) &&
!cathInCorridor(kCarRedSleeping)) ||
- _globals[kProgressJacket] != 2 ||
+ _globals[kGlobalJacket] != 2 ||
_inventoryFlag1 ||
_inventoryFlag2 ||
_isEggHighlighted ||
@@ -454,7 +454,7 @@ void LogicManager::nodeStepMouse(Event *event) {
if (!_engine->getMenu()->isShowingMenu()) {
if (_activeItem != kItemWhistle ||
- _globals[kProgressIsEggOpen] ||
+ _globals[kGlobalEggIsOpen] ||
checkCathDir(kCarGreenSleeping, 59) ||
checkCathDir(kCarGreenSleeping, 76) ||
_inventoryFlag1 ||
@@ -465,7 +465,7 @@ void LogicManager::nodeStepMouse(Event *event) {
if (_activeItem != kItemMatch ||
(!cathInCorridor(kCarGreenSleeping) &&
!cathInCorridor(kCarRedSleeping)) ||
- _globals[kProgressJacket] != 2 ||
+ _globals[kGlobalJacket] != 2 ||
_inventoryFlag1 ||
_inventoryFlag2 ||
_isEggHighlighted ||
@@ -547,7 +547,7 @@ void LogicManager::nodeStepMouse(Event *event) {
}
if (!_engine->isDemo() && actionLink.action == 43 &&
- actionLink.param1 == _globals[kProgressChapter] &&
+ actionLink.param1 == _globals[kGlobalChapter] &&
(event->flags & kMouseFlagRightButton) != 0) {
doF4();
return;
@@ -628,10 +628,10 @@ void LogicManager::nodeStepMouse(Event *event) {
void LogicManager::doF4() {
_engine->getSoundManager()->killAllSlots();
- switch (_globals[kProgressChapter]) {
+ switch (_globals[kGlobalChapter]) {
case 1:
giveCathItem(kItemParchemin);
- giveCathItem(kProgressJacket);
+ giveCathItem(kItemMatchBox);
forceJump(kCharacterMaster, &LogicManager::CONS_Master_StartPart2);
break;
case 2:
@@ -747,7 +747,7 @@ void LogicManager::checkInventory(int32 flags) {
return;
}
- _engine->getGraphicsManager()->drawItemDim(_globals[kProgressPortrait], 0, 0, 1);
+ _engine->getGraphicsManager()->drawItemDim(_globals[kGlobalCathIcon], 0, 0, 1);
if (_engine->getGraphicsManager()->acquireSurface()) {
_engine->getGraphicsManager()->clear(_engine->getGraphicsManager()->_screenSurface, 0, 44, 32, 40 * _inventoryVerticalSlot);
@@ -773,7 +773,7 @@ void LogicManager::checkInventory(int32 flags) {
return;
if (!_nodeReturn2) {
- if (!_doneNIS[kEventKronosBringFirebird] && !_globals[kProgressIsEggOpen]) {
+ if (!_doneNIS[kEventKronosBringFirebird] && !_globals[kGlobalEggIsOpen]) {
_closeUp = 0;
if (_blockedViews[100 * _trainData[_nodeReturn].nodePosition.car + _trainData[_nodeReturn].cathDir]) {
bumpCathNode(getSmartBumpNode(_nodeReturn));
@@ -786,7 +786,7 @@ void LogicManager::checkInventory(int32 flags) {
}
} else {
if (_inventoryFlag1) {
- _engine->getGraphicsManager()->drawItemDim(_globals[kProgressPortrait], 0, 0, 1);
+ _engine->getGraphicsManager()->drawItemDim(_globals[kGlobalCathIcon], 0, 0, 1);
_engine->getGraphicsManager()->burstBox(0, 0, 32, 32);
_inventoryFlag1 = false;
}
@@ -827,7 +827,7 @@ void LogicManager::checkInventory(int32 flags) {
selectedItemIdx = 0;
if (!_inventoryFlag2) {
if (_inventoryFlag1) {
- _engine->getGraphicsManager()->drawItemDim(_globals[kProgressPortrait], 0, 0, 1);
+ _engine->getGraphicsManager()->drawItemDim(_globals[kGlobalCathIcon], 0, 0, 1);
_engine->getGraphicsManager()->burstBox(0, 0, 32, 32);
_inventoryFlag1 = false;
}
@@ -894,7 +894,7 @@ void LogicManager::checkInventory(int32 flags) {
}
}
- _engine->getGraphicsManager()->drawItemDim(_globals[kProgressPortrait], 0, 0, 1);
+ _engine->getGraphicsManager()->drawItemDim(_globals[kGlobalCathIcon], 0, 0, 1);
if (_engine->getGraphicsManager()->acquireSurface()) {
_engine->getGraphicsManager()->clear(_engine->getGraphicsManager()->_screenSurface, 0, 44, 32, 40 * _inventoryVerticalSlot);
_engine->getGraphicsManager()->unlockSurface();
@@ -958,7 +958,7 @@ void LogicManager::checkInventory(int32 flags) {
sceneIdx = _nodeReturn2;
_nodeReturn2 = 0;
} else {
- if (_doneNIS[kEventKronosBringFirebird] || _globals[kProgressIsEggOpen]) {
+ if (_doneNIS[kEventKronosBringFirebird] || _globals[kGlobalEggIsOpen]) {
_inventoryFlag2 = false;
return;
}
@@ -975,9 +975,9 @@ void LogicManager::checkInventory(int32 flags) {
return;
}
- if (_globals[kProgressField84] ||
+ if (_globals[kGlobalCathInSpecialState] ||
getCharacter(kCharacterCath).characterPosition.location == 2 ||
- _globals[kProgressField18] == 4 ||
+ _globals[kGlobalPhaseOfTheNight] == 4 ||
(_activeItem && !_items[_activeItem].inPocket && !_closeUp)) {
return;
}
@@ -985,7 +985,7 @@ void LogicManager::checkInventory(int32 flags) {
if ((flags & kMouseFlagLeftDown) != 0) {
_inventoryFlag1 = false;
_inventoryFlag2 = true;
- _engine->getGraphicsManager()->drawItem(_globals[kProgressPortrait] + 1, 0, 0);
+ _engine->getGraphicsManager()->drawItem(_globals[kGlobalCathIcon] + 1, 0, 0);
_inventoryVerticalSlot = 0;
for (int i = 1; i < 32; i++) {
@@ -1000,7 +1000,7 @@ void LogicManager::checkInventory(int32 flags) {
}
if (!_inventoryFlag1 && !_inventoryFlag2) {
- _engine->getGraphicsManager()->drawItem(_globals[kProgressPortrait], 0, 0);
+ _engine->getGraphicsManager()->drawItem(_globals[kGlobalCathIcon], 0, 0);
_engine->getGraphicsManager()->burstBox(0, 0, 32, 32);
_inventoryFlag1 = true;
@@ -1013,7 +1013,7 @@ void LogicManager::checkInventory(int32 flags) {
_engine->getGraphicsManager()->unlockSurface();
}
- _engine->getGraphicsManager()->drawItem(_globals[kProgressPortrait], 0, 0);
+ _engine->getGraphicsManager()->drawItem(_globals[kGlobalCathIcon], 0, 0);
_engine->getGraphicsManager()->burstBox(0, 0, 32, 8 * (5 * _inventoryVerticalSlot + 5));
_inventoryVerticalSlot = 0;
@@ -1033,7 +1033,7 @@ void LogicManager::checkInventory(int32 flags) {
sceneIdx = _nodeReturn2;
_nodeReturn2 = 0;
bumpCathNode(sceneIdx);
- } else if (!_doneNIS[kEventKronosBringFirebird] && !_globals[kProgressIsEggOpen]) {
+ } else if (!_doneNIS[kEventKronosBringFirebird] && !_globals[kGlobalEggIsOpen]) {
_closeUp = 0;
if (_blockedViews[100 * _trainData[_nodeReturn].nodePosition.car + _trainData[_nodeReturn].cathDir]) {
sceneIdx = getSmartBumpNode(_nodeReturn);
@@ -1044,7 +1044,7 @@ void LogicManager::checkInventory(int32 flags) {
}
}
} else {
- _engine->getGraphicsManager()->drawItem(_globals[kProgressPortrait], 0, 0);
+ _engine->getGraphicsManager()->drawItem(_globals[kGlobalCathIcon], 0, 0);
_engine->getGraphicsManager()->burstBox(0, 0, 32, 32);
}
diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp
index 0af60bc46c5..09ed7eefb7a 100644
--- a/engines/lastexpress/game/savegame.cpp
+++ b/engines/lastexpress/game/savegame.cpp
@@ -49,7 +49,7 @@ void SaveManager::writeSavePoint(CVCRFile *file, int saveType, int character, in
savePointHeader.magicNumber = 0xE660E660;
savePointHeader.size = 0;
savePointHeader.time = _engine->getLogicManager()->_gameTime;
- savePointHeader.partNumber = _engine->getLogicManager()->_globals[kProgressChapter];
+ savePointHeader.partNumber = _engine->getLogicManager()->_globals[kGlobalChapter];
savePointHeader.latestGameEvent = value;
savePointHeader.emptyField1 = 0;
savePointHeader.emptyField2 = 0;
@@ -374,7 +374,7 @@ void SaveManager::readSavePoint(CVCRFile *file, int *saveType, uint8 *character,
_engine->getSoundManager()->loadSoundInfo(file, skipSoundLoading);
_engine->getMessageManager()->loadMessages(file);
- _engine->getLogicManager()->_globals[kProgressChapter] = savePointHeader.partNumber;
+ _engine->getLogicManager()->_globals[kGlobalChapter] = savePointHeader.partNumber;
file->flush();
@@ -742,7 +742,7 @@ void SaveManager::startRewoundGame() {
delete saveFile;
_engine->_gracePeriodIndex = _engine->_currentSavePoint;
- _engine->_gracePeriodTimer = _engine->getLogicManager()->_globals[kProgressJacket] < 2 ? 225 : 450;
+ _engine->_gracePeriodTimer = _engine->getLogicManager()->_globals[kGlobalJacket] < 2 ? 225 : 450;
if (_engine->_currentSavePoint) {
_engine->getOtisManager()->wipeAllGSysInfo();
diff --git a/engines/lastexpress/game/vcr.cpp b/engines/lastexpress/game/vcr.cpp
index 5ee736db385..58f2f8f06c8 100644
--- a/engines/lastexpress/game/vcr.cpp
+++ b/engines/lastexpress/game/vcr.cpp
@@ -286,10 +286,10 @@ void VCR::init(bool doSaveGameFlag, int saveType, int32 time) {
} else {
chosenTime = 0;
- if (_engine->getLogicManager()->_globals[kProgressChapter] <= 1) {
+ if (_engine->getLogicManager()->_globals[kGlobalChapter] <= 1) {
cdNum = 1;
} else {
- cdNum = (_engine->getLogicManager()->_globals[kProgressChapter] > 3) + 2;
+ cdNum = (_engine->getLogicManager()->_globals[kGlobalChapter] > 3) + 2;
}
if (_engine->getArchiveManager()->isCDAvailable(cdNum, path, sizeof(path))) {
@@ -357,11 +357,11 @@ void VCR::init(bool doSaveGameFlag, int saveType, int32 time) {
if (!_engine->_gracePeriodTimer)
_engine->_gracePeriodIndex = 0;
- if (!_engine->getLogicManager()->_globals[kProgressChapter])
- _engine->getLogicManager()->_globals[kProgressChapter] = 1;
+ if (!_engine->getLogicManager()->_globals[kGlobalChapter])
+ _engine->getLogicManager()->_globals[kGlobalChapter] = 1;
_engine->getLogicManager()->_gameTime = _engine->_savePointHeaders[_engine->_currentSavePoint].time;
- _engine->getLogicManager()->_globals[kProgressChapter] = _engine->_savePointHeaders[_engine->_currentSavePoint].partNumber;
+ _engine->getLogicManager()->_globals[kGlobalChapter] = _engine->_savePointHeaders[_engine->_currentSavePoint].partNumber;
if (_engine->_gameTimeOfLastSavePointInFile >= 1061100) {
_engine->getClock()->startClock(_engine->getLogicManager()->_gameTime);
@@ -675,8 +675,8 @@ void VCR::updateCurGame(int32 fromTime, int32 toTime, bool searchEntry) {
}
if (_engine->_currentSavePoint == _currentSavePointInVCR &&
- _engine->_savePointHeaders[newMenuIdx].partNumber != _engine->getLogicManager()->_globals[kProgressChapter]) {
- _engine->getLogicManager()->_globals[kProgressChapter] = _engine->_savePointHeaders[_engine->_currentSavePoint].partNumber;
+ _engine->_savePointHeaders[newMenuIdx].partNumber != _engine->getLogicManager()->_globals[kGlobalChapter]) {
+ _engine->getLogicManager()->_globals[kGlobalChapter] = _engine->_savePointHeaders[_engine->_currentSavePoint].partNumber;
}
}
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 44fd811b734..738585d19c6 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -353,8 +353,8 @@ void LastExpressEngine::initGameData() {
getLogicManager()->_items[kItemArticle].closeUp = 36;
getLogicManager()->_items[kItemTelegram].haveIt = 1;
getLogicManager()->_items[kItemArticle].haveIt = 1;
- getLogicManager()->_globals[kProgressPortrait] = isDemo() ? 34: 32;
- getLogicManager()->_globals[kProgressChapter] = isDemo() ? 3 : 1;
+ getLogicManager()->_globals[kGlobalCathIcon] = isDemo() ? 34: 32;
+ getLogicManager()->_globals[kGlobalChapter] = isDemo() ? 3 : 1;
getLogicManager()->_lastSavegameSessionTicks = 0;
getLogicManager()->_realTime = 0;
getLogicManager()->_closeUp = 0;
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index b037e63cc2f..1acc7938fb4 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -340,8 +340,8 @@ bool Menu::eggCursorAction(int8 action, int8 flags) {
}
int whichCD = 1;
- if (_engine->getLogicManager()->_globals[kProgressChapter] > 1)
- whichCD = (_engine->getLogicManager()->_globals[kProgressChapter] > 3) + 2;
+ if (_engine->getLogicManager()->_globals[kGlobalChapter] > 1)
+ whichCD = (_engine->getLogicManager()->_globals[kGlobalChapter] > 3) + 2;
if (_engine->isDemo()) {
if (!_gameInNotStartedInFile) {
diff --git a/engines/lastexpress/shared.h b/engines/lastexpress/shared.h
index 6514e1bb80b..68e2bf536a8 100644
--- a/engines/lastexpress/shared.h
+++ b/engines/lastexpress/shared.h
@@ -1209,7 +1209,7 @@ enum EventIndex : uint {
kEventAugustBringBriefcase = 30,
kEventAugustTalkCigar = 31,
kEventAnnaBaggageArgument = 32,
- kEventAnnaBagagePart2 = 33,
+ kEventAnnaBaggagePart2 = 33,
kEventAnnaConversation_34 = 34,
kEventAugustDrink = 35,
kEventAnnaTired = 36,
@@ -1918,7 +1918,7 @@ enum Actions {
kActionDropItem,
kActionLinkOnGlobal, // 15
kActionRattle,
- kActionDummyAction2,
+ kActionDummyAction1,
kActionLeanOutWindow,
kActionAlmostFall,
kActionClimbInWindow, // 20
@@ -1930,17 +1930,17 @@ enum Actions {
kActionBombPuzzle,
kActionConductors,
kActionKronosConcert,
- kActionPlayMusic2,
+ kActionLetterInAugustSuitcase,
kActionCatchBeetle, // 30
kActionExitCompartment,
kActionOutsideTrain,
kActionFirebirdPuzzle,
kActionOpenMatchBox,
kActionOpenBed, // 35
- kActionDummyAction3,
+ kActionDummyAction2,
kActionHintDialog,
kActionMusicEggBox,
- kActionPlayMusic3,
+ kActionFindEggUnderSink,
kActionBed, // 40
kActionPlayMusicChapter,
kActionPlayMusicChapterSetupTrain,
@@ -1972,136 +1972,66 @@ enum NodeProperties {
//////////////////////////////////////////////////////////////////////////
// Game Progress
//////////////////////////////////////////////////////////////////////////
-enum GameProgress {
- kProgressField0 = 0,
- kProgressJacket,
- kProgressEventCorpseMovedFromFloor,
- kProgressFieldC,
- kProgressEventFoundCorpse,
- kProgressField14,
- kProgressField18,
- kProgressPortrait,
- kProgressEventCorpseThrown,
- kProgressField24,
- kProgressField28,
- kProgressChapter,
- kProgressField30,
- kProgressEventMetAugust,
- kProgressIsDayTime,
- kProgressField3C,
- kProgressField40,
- kProgressField44,
- kProgressField48,
- kProgressField4C,
- kProgressIsTrainRunning,
- kProgressField54,
- kProgressField58,
- kProgressField5C,
- kProgressField60,
- kProgressField64,
- kProgressField68,
- kProgressEventMertensAugustWaiting,
- kProgressEventMertensChronosInvitation,
- kProgressIsEggOpen,
- kProgressField78,
- kProgressField7C,
- kProgressField80,
- kProgressField84,
- kProgressField88,
- kProgressField8C,
- kProgressField90,
- kProgressField94,
- kProgressField98,
- kProgressField9C,
- kProgressFieldA0,
- kProgressFieldA4,
- kProgressFieldA8,
- kProgressFieldAC,
- kProgressFieldB0,
- kProgressFieldB4,
- kProgressFieldB8,
- kProgressFieldBC,
- kProgressFieldC0,
- kProgressFieldC4,
- kProgressFieldC8,
- kProgressFieldCC,
- kProgressEventMetBoutarel,
- kProgressEventMetHadija,
- kProgressEventMetYasmin,
- kProgressFieldDC,
- kProgressFieldE0,
- kProgressFieldE4,
- kProgressFieldE8,
- kProgressFieldEC,
- kProgressFieldF0,
- kProgressFieldF4,
- kProgressFieldF8,
- kProgressFieldFC,
- kProgressField100,
- kProgressField104,
- kProgressField108,
- kProgressField10C,
- kProgressField110,
- kProgressField114,
- kProgressField118,
- kProgressField11C,
- kProgressField120,
- kProgressField124,
- kProgressField128,
- kProgressField12C,
- kProgressField130,
- kProgressField134,
- kProgressField138,
- kProgressField13C,
- kProgressField140,
- kProgressField144,
- kProgressField148,
- kProgressField14C,
- kProgressField150,
- kProgressField154,
- kProgressField158,
- kProgressField15C,
- kProgressField160,
- kProgressField164,
- kProgressField168,
- kProgressField16C,
- kProgressField170,
- kProgressField174,
- kProgressField178,
- kProgressField17C,
- kProgressField180,
- kProgressField184,
- kProgressField188,
- kProgressField18C,
- kProgressField190,
- kProgressField194,
- kProgressField198,
- kProgressField19C,
- kProgressField1A0,
- kProgressField1A4,
- kProgressField1A8,
- kProgressField1AC,
- kProgressField1B0,
- kProgressField1B4,
- kProgressField1B8,
- kProgressField1BC,
- kProgressField1C0,
- kProgressField1C4,
- kProgressField1C8,
- kProgressField1CC,
- kProgressField1D0,
- kProgressField1D4,
- kProgressField1D8,
- kProgressField1DC,
- kProgressField1E0,
- kProgressField1E4,
- kProgressField1E8,
- kProgressField1EC,
- kProgressField1F0,
- kProgressField1F4,
- kProgressField1F8,
- kProgressField1FC,
- kProgressCount
+enum GameGlobals {
+ kGlobalJacket = 1,
+ kGlobalCorpseMovedFromFloor,
+ kGlobalReadLetterInAugustSuitcase,
+ kGlobalFoundCorpse,
+ kGlobalCharacterSearchingForCath,
+ kGlobalPhaseOfTheNight,
+ kGlobalCathIcon,
+ kGlobalCorpseHasBeenThrown,
+ kGlobalFrancoisHasSeenCorpseThrown,
+ kGlobalAnnaIsEating,
+ kGlobalChapter,
+ kGlobalDoneSavePointAfterLeftCompWithNewJacket,
+ kGlobalMetAugust,
+ kGlobalIsDayTime,
+ kGlobalPoliceHasBoardedAndGone,
+ kGlobalConcertIsHappening,
+ kGlobalKahinaKillTimeoutActive,
+ kGlobalMaxHasToStayInBaggage,
+ kGlobalUnknownDebugFlag,
+ kGlobalTrainIsRunning,
+ kGlobalAnnaIsInBaggageCar,
+ kGlobalDoneSavePointAfterLeavingSuitcaseInCathComp,
+ kGlobalTatianaFoundOutEggStolen,
+ kGlobalOverheardAugustInterruptingAnnaAtDinner,
+ kGlobalMetTatianaAndVassili,
+ kGlobalOverheardTatianaAndAlexeiAtBreakfast,
+ kGlobalKnowAboutAugust,
+ kGlobalKnowAboutKronos,
+ kGlobalEggIsOpen,
+ kGlobalCanPlayKronosSuitcaseLeftInCompMusic,
+ kGlobalCanPlayEggSuitcaseMusic,
+ kGlobalCanPlayEggUnderSinkMusic,
+ kGlobalCathInSpecialState,
+ kGlobalOverheardAlexeiTellingTatianaAboutBomb,
+ kGlobalOverheardAlexeiTellingTatianaAboutWantingToKillVassili,
+ kGlobalOverheardTatianaAndAlexeiPlayingChess,
+ kGlobalOverheardMilosAndVesnaConspiring,
+ kGlobalOverheardVesnaAndMilosDebatingAboutCath,
+ kGlobalFrancoisSawABlackBeetle,
+ kGlobalOverheardMadameAndFrancoisTalkingAboutWhistle,
+ kGlobalMadameDemandedMaxInBaggage,
+ kGlobalMadameComplainedAboutMax,
+ kGlobalMetMadame,
+ kGlobalKnowAboutRebeccaDiary,
+ kGlobalOverheardSophieTalkingAboutCath,
+ kGlobalMetSophieAndRebecca,
+ kGlobalKnowAboutRebeccaAndSophieRelationship,
+ kGlobalRegisteredTimeAtWhichCathGaveFirebirdToKronos,
+ kGlobalMetMahmud,
+ kGlobalAlmostFallActionIsAvailable,
+ kGlobalMetMilos,
+ kGlobalMetMonsieur,
+ kGlobalMetHadija,
+ kGlobalMetYasmin,
+ kGlobalMetAlouan,
+ kGlobalMetFatima,
+ kGlobalTatianaScheduledToVisitCath,
+
+ kGlobalCount = 128
};
} // End of namespace LastExpress
More information about the Scummvm-git-logs
mailing list