off by one. *sigh*

svn-id: r7895
This commit is contained in:
Oliver Kiehl 2003-05-24 18:24:39 +00:00
parent 9d95b025cd
commit d7573468aa
2 changed files with 31 additions and 31 deletions

View File

@ -71,7 +71,7 @@ void SkyLogic::engine() {
while (uint16 id = *logicList++) { // 0 means end of list
if (id == 0xffff) {
// Change logic data address
logicList = (uint16 *)SkyState::fetchCompact(id);
logicList = (uint16 *)SkyState::fetchCompact(*logicList);
continue;
}
@ -792,39 +792,39 @@ void SkyLogic::initScriptVariables() {
for (uint i = 0; i < sizeof(_scriptVariables)/sizeof(uint32); i++)
_scriptVariables[i] = 0;
_scriptVariables[3] = 141;
_scriptVariables[110] = 62;
_scriptVariables[146] = 1;
_scriptVariables[147] = 2;
_scriptVariables[451] = 8371;
_scriptVariables[641] = 1;
_scriptVariables[679] = 1;
_scriptVariables[694] = 3;
_scriptVariables[705] = 1;
_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[712] = 1;
_scriptVariables[79] = 1;
_scriptVariables[720] = 1;
_scriptVariables[721] = 1;
_scriptVariables[794] = 1;
_scriptVariables[793] = 1;
_scriptVariables[797] = 1;
_scriptVariables[798] = 1;
_scriptVariables[799] = 1;
_scriptVariables[804] = 1;
_scriptVariables[805] = 1;
_scriptVariables[806] = 1;
_scriptVariables[807] = 16731;
_scriptVariables[808] = 1;
_scriptVariables[809] = 2;
_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[822] = 1;
memcpy(_scriptVariables + 353, forwardList1b, sizeof(forwardList1b));
memcpy(_scriptVariables + 657, forwardList2b, sizeof(forwardList2b));
memcpy(_scriptVariables + 722, forwardList3b, sizeof(forwardList3b));
memcpy(_scriptVariables + 664, forwardList4b, sizeof(forwardList4b));
memcpy(_scriptVariables + 506, forwardList5b, sizeof(forwardList5b));
memcpy(_scriptVariables + 352, forwardList1b, sizeof(forwardList1b));
memcpy(_scriptVariables + 656, forwardList2b, sizeof(forwardList2b));
memcpy(_scriptVariables + 721, forwardList3b, sizeof(forwardList3b));
memcpy(_scriptVariables + 663, forwardList4b, sizeof(forwardList4b));
memcpy(_scriptVariables + 505, forwardList5b, sizeof(forwardList5b));
}
uint32 SkyLogic::script(Compact *compact, uint16 scriptNo, uint16 offset) {

View File

@ -37,13 +37,13 @@
#define FIRST_TEXT_COMPACT 23
// scriptVariable offsets
#define RESULT 1
#define LOGIC_LIST_NO 3
#define CUR_ID 13
#define HIT_ID 38
#define THE_CHOSEN_ONE 52
#define TEXT1 54
#define CUR_SECTION 144
#define RESULT 0
#define LOGIC_LIST_NO 2
#define CUR_ID 12
#define HIT_ID 37
#define THE_CHOSEN_ONE 51
#define TEXT1 53
#define CUR_SECTION 143
//screen/grid defines
#define GAME_SCREEN_WIDTH 320