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

Multiple fix/cleanup

Browse source 
One bug remains before the game is completable without hack

svn-id: r29920
This commit is contained in:
Vincent Hamm 2007-12-20 14:30:51 +00:00
parent 6d37f5ccd8
commit 564fc06cf7
17 changed files with 602 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

106
engines/cruise/script.cpp
View file

@ -52,54 +52,62 @@ short int getShortFromScript(void) {
// load opcode
int32 opcodeType0(void) {
int index = 0;
switch (currentScriptOpcodeType) {
case 0:
{
pushVar(getShortFromScript());
return (0);
}
case 5:
index = saveOpcodeVar;
case 1:
{
uint8 *ptr = 0;
int byte1 = getByteFromScript();
int byte2 = getByteFromScript();
short int short1 = getShortFromScript();
uint8 *address = 0;
int type = getByteFromScript();
int ovl = getByteFromScript();
short int offset;
short int firstOffset = offset = getShortFromScript();
offset += index;
int var_E = byte1 & 7;
int typ7 = type & 7;
if (!var_E) {
return (-10);
if (!typ7) {
return (-10); // unresloved link
}
if (!byte2) {
ptr = scriptDataPtrTable[var_E] + short1;
if (!ovl) {
address = scriptDataPtrTable[typ7];
} else { // TODO:
if (!overlayTable[byte2].alreadyLoaded) {
if (!overlayTable[ovl].alreadyLoaded) {
return (-7);
}
if (!overlayTable[byte2].ovlData) {
if (!overlayTable[ovl].ovlData) {
return (-4);
}
if (var_E == 5) {
ptr =
overlayTable[byte2].ovlData->
data4Ptr + short1;
if (typ7 == 5) {
address = overlayTable[ovl].ovlData->data4Ptr;
} else {
assert(0);
}
}
if (((byte1 & 0x18) >> 3) == 1) {
pushVar(loadShort(ptr));
address += offset;
int size = (type >> 3) & 3;
if (size == 1) {
address += index;
pushVar(loadShort(address));
return (0);
} else if (((byte1 & 0x18) >> 3) == 2) {
pushVar(*ptr);
} else if (size == 2) {
pushVar(*address);
return (0);
} else {
printf
("Unsupported code in opcodeType0 case 1!\n");
printf("Unsupported code in opcodeType0 case 1!\n");
exit(1);
}
@ -125,57 +133,6 @@ int32 opcodeType0(void) {
break;
}
case 5:
{
int byte1 = getByteFromScript();
int byte2 = getByteFromScript();
short int short1 = getShortFromScript();
short int var_12 = short1;
// short int var_10 = saveOpcodeVar;
int var_E = byte1 & 7;
uint8 *ptr = 0;
if (!var_E) {
return (-10);
}
if (!byte2) {
ptr = scriptDataPtrTable[var_E] + var_12;
} else { // TODO:
if (!overlayTable[byte2].alreadyLoaded) {
return (-7);
}
if (!overlayTable[byte2].ovlData) {
return (-4);
}
if (var_E == 5) {
ptr =
overlayTable[byte2].ovlData->
data4Ptr + var_12;
} else {
assert(0);
}
}
if (((byte1 & 0x18) >> 3) == 1) {
pushVar(loadShort(ptr + saveOpcodeVar * 2)); // TODO: check this !
return (0);
} else if (((byte1 & 0x18) >> 3) == 2) {
pushVar(*(ptr + saveOpcodeVar));
return (0);
} else {
printf
("Unsupported code in opcodeType0 case 1!\n");
exit(1);
}
return (0);
}
default:
{
printf("Unsupported type %d in opcodeType0\n",
@ -681,6 +638,11 @@ int executeScripts(scriptInstanceStruct *ptr) {
numScript2 = ptr->scriptNumber;
if(ptr->overlayNumber == 66)
{
ptr->overlayNumber= ptr->overlayNumber;
}
if (ptr->type == 20) {
ptr2 = getOvlData3Entry(ptr->overlayNumber, numScript2);