[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.144,1.145 logic.h,1.38,1.39 sky.cpp,1.148,1.149
Joost Peters
joostp at users.sourceforge.net
Tue Sep 14 13:47:07 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.251,2.252 saveload.cpp,1.173,1.174 saveload.h,1.42,1.43 script_v72he.cpp,2.93,2.94 script_v7he.cpp,2.86,2.87 script_v80he.cpp,2.22,2.23 script_v90he.cpp,2.33,2.34 scumm.cpp,1.200,1.201 scumm.h,1.479,1.480 vars.cpp,1.101,1.102
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.201,1.202
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17168/sky
Modified Files:
logic.cpp logic.h sky.cpp
Log Message:
Use -more informative- constants for certain script variables
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- logic.cpp 13 Sep 2004 17:05:23 -0000 1.144
+++ logic.cpp 14 Sep 2004 20:46:04 -0000 1.145
@@ -1123,33 +1123,33 @@
for (int i = 0; i < ARRAYSIZE(_scriptVariables); i++)
_scriptVariables[i] = 0;
- _scriptVariables[2] = 141;
- _scriptVariables[109] = 62;
- _scriptVariables[145] = 1;
- _scriptVariables[146] = 2;
- _scriptVariables[450] = 8371;
- _scriptVariables[640] = 1;
- _scriptVariables[678] = 1;
- _scriptVariables[693] = 3;
- _scriptVariables[704] = 1;
- _scriptVariables[709] = 1;
- _scriptVariables[710] = 1;
- _scriptVariables[711] = 1;
- _scriptVariables[719] = 1;
- _scriptVariables[720] = 1;
- _scriptVariables[793] = 1;
- _scriptVariables[797] = 1;
- _scriptVariables[798] = 1;
- _scriptVariables[804] = 1;
- _scriptVariables[805] = 1;
- _scriptVariables[806] = 16731;
- _scriptVariables[807] = 1;
- _scriptVariables[808] = 2;
- _scriptVariables[817] = 1;
- _scriptVariables[818] = 1;
- _scriptVariables[819] = 1;
- _scriptVariables[820] = 1;
- _scriptVariables[821] = 1;
+ _scriptVariables[LOGIC_LIST_NO] = 141;
+ _scriptVariables[LAMB_GREET] = 62;
+ _scriptVariables[JOEY_SECTION] = 1;
+ _scriptVariables[LAMB_SECTION] = 2;
+ _scriptVariables[S15_FLOOR] = 8371;
+ _scriptVariables[GUARDIAN_THERE] = 1;
+ _scriptVariables[DOOR_67_68_FLAG] = 1;
+ _scriptVariables[SC70_IRIS_FLAG] = 3;
+ _scriptVariables[DOOR_73_75_FLAG] = 1;
+ _scriptVariables[SC76_CABINET1_FLAG] = 1;
+ _scriptVariables[SC76_CABINET2_FLAG] = 1;
+ _scriptVariables[SC76_CABINET3_FLAG] = 1;
+ _scriptVariables[DOOR_77_78_FLAG] = 1;
+ _scriptVariables[SC80_EXIT_FLAG] = 1;
+ _scriptVariables[SC31_LIFT_FLAG] = 1;
+ _scriptVariables[SC32_LIFT_FLAG] = 1;
+ _scriptVariables[SC33_SHED_DOOR_FLAG] = 1;
+ _scriptVariables[BAND_PLAYING] = 1;
+ _scriptVariables[COLSTON_AT_TABLE] = 1;
+ _scriptVariables[SC36_NEXT_DEALER] = 16731;
+ _scriptVariables[SC36_DOOR_FLAG] = 1;
+ _scriptVariables[SC37_DOOR_FLAG] = 2;
+ _scriptVariables[SC40_LOCKER_1_FLAG] = 1;
+ _scriptVariables[SC40_LOCKER_2_FLAG] = 1;
+ _scriptVariables[SC40_LOCKER_3_FLAG] = 1;
+ _scriptVariables[SC40_LOCKER_4_FLAG] = 1;
+ _scriptVariables[SC40_LOCKER_5_FLAG] = 1;
if (SkyEngine::_systemVars.gameVersion == 288)
memcpy(_scriptVariables + 352, forwardList1b288, sizeof(forwardList1b288));
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- logic.h 13 Sep 2004 17:05:23 -0000 1.38
+++ logic.h 14 Sep 2004 20:46:04 -0000 1.39
@@ -62,10 +62,21 @@
SCROLL_OFFSET = 101,
MENU = 102,
OBJECT_HELD = 103,
+ LAMB_GREET = 109,
RND = 115,
CUR_SECTION = 143,
+ JOEY_SECTION = 145,
+ LAMB_SECTION = 146,
+ KNOWS_PORT = 190,
+ GOT_SPONSOR = 240,
+ GOT_JAMMER = 258,
CONSOLE_TYPE = 345,
+ S15_FLOOR = 450,
+ FOREMAN_FRIEND = 451,
REICH_DOOR_FLAG = 470,
+ CARD_STATUS = 479,
+ CARD_FIX = 480,
+ GUARDIAN_THERE = 640,
FS_COMMAND = 643,
ENTER_DIGITS = 644,
LINC_DIGIT_0 = 646,
@@ -77,7 +88,28 @@
LINC_DIGIT_6 = 651,
LINC_DIGIT_7 = 653,
LINC_DIGIT_8 = 654,
- LINC_DIGIT_9 = 655
+ LINC_DIGIT_9 = 655,
+ DOOR_67_68_FLAG = 678,
+ SC70_IRIS_FLAG = 693,
+ DOOR_73_75_FLAG = 704,
+ SC76_CABINET1_FLAG = 709,
+ SC76_CABINET2_FLAG = 710,
+ SC76_CABINET3_FLAG = 711,
+ DOOR_77_78_FLAG = 719,
+ SC80_EXIT_FLAG = 720,
+ SC31_LIFT_FLAG = 793,
+ SC32_LIFT_FLAG = 797,
+ SC33_SHED_DOOR_FLAG = 798,
+ BAND_PLAYING = 804,
+ COLSTON_AT_TABLE = 805,
+ SC36_NEXT_DEALER = 806,
+ SC36_DOOR_FLAG = 807,
+ SC37_DOOR_FLAG = 808,
+ SC40_LOCKER_1_FLAG = 817,
+ SC40_LOCKER_2_FLAG = 818,
+ SC40_LOCKER_3_FLAG = 819,
+ SC40_LOCKER_4_FLAG = 820,
+ SC40_LOCKER_5_FLAG = 821
};
class AutoRoute;
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- sky.cpp 13 Sep 2004 17:05:23 -0000 1.148
+++ sky.cpp 14 Sep 2004 20:46:04 -0000 1.149
@@ -154,18 +154,18 @@
switch(num) {
case 1: warning("executed cheat: get jammer");
- Logic::_scriptVariables[258] = 42; // got_jammer
- Logic::_scriptVariables[240] = 69; // got_sponsor
+ Logic::_scriptVariables[GOT_JAMMER] = 42;
+ Logic::_scriptVariables[GOT_SPONSOR] = 69;
break;
case 2: warning("executed cheat: computer room");
- Logic::_scriptVariables[479] = 2; // card_status
- Logic::_scriptVariables[480] = 1; // card_fix
+ Logic::_scriptVariables[CARD_STATUS] = 2;
+ Logic::_scriptVariables[CARD_FIX] = 1;
break;
case 3: warning("executed cheat: get to burke");
- Logic::_scriptVariables[190] = 42; // knows_port
+ Logic::_scriptVariables[KNOWS_PORT] = 42;
break;
case 4: warning("executed cheat: get to reactor section");
- Logic::_scriptVariables[451] = 42; // foreman_friend
+ Logic::_scriptVariables[FOREMAN_FRIEND] = 42;
_skyLogic->fnSendSync(8484, 1, 0); // send sync to RAD suit (put in locker)
_skyLogic->fnKillId(ID_ANITA_SPY, 0, 0); // stop anita from getting to you
break;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.251,2.252 saveload.cpp,1.173,1.174 saveload.h,1.42,1.43 script_v72he.cpp,2.93,2.94 script_v7he.cpp,2.86,2.87 script_v80he.cpp,2.22,2.23 script_v90he.cpp,2.33,2.34 scumm.cpp,1.200,1.201 scumm.h,1.479,1.480 vars.cpp,1.101,1.102
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.201,1.202
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list