diff options
author | Vincent Hamm | 2007-12-20 14:30:51 +0000 |
---|---|---|
committer | Vincent Hamm | 2007-12-20 14:30:51 +0000 |
commit | 564fc06cf7196f44c46be24d15c18da0c4992795 (patch) | |
tree | 664974b88411aee15b30751b7a22ce9ee4e68c9d /engines/cruise/cruise_main.cpp | |
parent | 6d37f5ccd8a2f5859ec69bd4924bc50eb4293464 (diff) | |
download | scummvm-rg350-564fc06cf7196f44c46be24d15c18da0c4992795.tar.gz scummvm-rg350-564fc06cf7196f44c46be24d15c18da0c4992795.tar.bz2 scummvm-rg350-564fc06cf7196f44c46be24d15c18da0c4992795.zip |
Multiple fix/cleanup
One bug remains before the game is completable without hack
svn-id: r29920
Diffstat (limited to 'engines/cruise/cruise_main.cpp')
-rw-r--r-- | engines/cruise/cruise_main.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 50da94a9c9..5ae67dae4d 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -572,7 +572,7 @@ int initAllData(void) { scriptFunc2(bootOverlayNumber, &procHead, 1, 0); } - strcpy(systemStrings.bootScriptName, "AUTO00"); + strcpy(lastOverlay, "AUTO00"); return (bootOverlayNumber); } @@ -652,7 +652,7 @@ int findObject(int mouseX, int mouseY, int *outObjOvl, int *outObjIdx) { j2 = params2.fileIdx; } - if (params.var5 >= 0 && params.fileIdx >= 0) { + if (params.state >= 0 && params.fileIdx >= 0) { if (currentObject->type == OBJ_TYPE_SPRITE || currentObject->type == OBJ_TYPE_MASK || currentObject->type == OBJ_TYPE_EXIT) { int x = params.X + x2; int y = params.Y + y2; @@ -990,7 +990,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) { thisOvl = j; } - //const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj); + const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj); objDataStruct* pObject = getObjectDataFromOverlay(thisOvl, ptrHead->obj1Number); @@ -1124,7 +1124,7 @@ void callSubRelation(menuElementSubStruct *pMenuElement, int nOvl, int nObj) { getMultipleObjectParam(obj2Ovl, pHeader->obj2Number, ¶ms); } - if ((pHeader->obj2OldState == -1) || (params.scale == pHeader->obj2OldState)) { + if ((pHeader->obj2OldState == -1) || (params.state == pHeader->obj2OldState)) { if (pHeader->type == 30) { // REL if(currentScriptPtr) { @@ -1738,9 +1738,10 @@ void mainLoop(void) { int enableUser = 0; - strcpy(currentOverlay, ""); - systemStrings.bootScriptName[0] = 0; - cmdLine[0] = 0; + strcpy(nextOverlay, ""); + strcpy(lastOverlay, ""); + strcpy(cmdLine, ""); + currentActiveMenu = -1; autoMsg = -1; linkedRelation = 0; |