libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I don't think assert(0) is a particularly helpful error message...

Browse Source 
svn-id: r21630
This commit is contained in:
Torbjörn Andersson 2006-04-05 13:06:03 +00:00
parent 58c7f8d6b1
commit 48c46eed6b
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/cine/anim.cpp
View File

@ -676,7 +676,7 @@ void loadSet(const char *resourceName) {
} else if (header2.type == 5) {
convert8BBP(animDataTable[entry].ptr1, dataPtr, header2.width, header2.height);
} else if (header2.type == 4) {
assert(0);
error("loadSet: header2.type == 4");
} else {
convert8BBP2(animDataTable[entry].ptr1, dataPtr, header2.width, header2.height);
}
@ -759,7 +759,7 @@ void loadSetAbs(const char *resourceName, uint16 idx) {
} else if (header2.type == 5) {
convert8BBP(animDataTable[entry].ptr1, dataPtr, header2.width, header2.height);
} else if (header2.type == 4) {
assert(0);
error("loadSetAbs: header2.type == 4");
} else {
convert8BBP2(animDataTable[entry].ptr1, dataPtr, header2.width, header2.height);
}
@ -821,7 +821,7 @@ void loadResource(const char *resourceName) {
return;
}
assert(0);
error("loadResource: Cannot determine type for '%s'", resourceName);
}
void loadAbs(const char *resourceName, uint16 idx) {
@ -844,7 +844,7 @@ void loadAbs(const char *resourceName, uint16 idx) {
return;
}
assert(0);
error("loadAbs: Cannot determine type for '%s'", resourceName);
}
void loadResourcesFromSave() {

10
engines/cine/script.cpp
View File

@ -881,7 +881,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
}
default:
{
assert(0);
error("executeScript: OP_loadVar: Unknown variable type %d", varType);
}
}
} else {
@ -2570,7 +2570,7 @@ void decompileScript(byte *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint16
} else if (param2 == 5) {
sprintf(lineBuffer, "var[%d]=rand() mod %d\n", param1, param3);
} else {
assert(0);
error("decompileScript: 0x09: param2 = %d", param2);
}
} else {
int16 param3;
@ -2720,7 +2720,7 @@ void decompileScript(byte *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint16
sprintf(compareString1, "var[%d]", param1);
sprintf(compareString2, "globalVar[%d]", param3);
} else {
assert(0);
error("decompileScript: 0x0E: param2 = %d", param2);
}
} else {
int16 param3;
@ -3138,7 +3138,7 @@ void decompileScript(byte *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint16
} else if (param2 == 2) {
sprintf(lineBuffer, "globalVar[%d] = globalVar[%d]\n", param1, param3);
} else {
assert(0);
error("decompileScript: 0x52: param2 = %d", param2);
}
} else {
int16 param3;
@ -3174,7 +3174,7 @@ void decompileScript(byte *scriptPtr, int16 *stackPtr, uint16 scriptSize, uint16
sprintf(compareString1, "globalVar[%d]", param1);
sprintf(compareString2, "globalVar[%d]", param3);
} else {
assert(0);
error("decompileScript: 0x53: param2 = %d", param2);
}
} else {
int16 param3;

22
engines/cine/various.cpp
View File

@ -1446,9 +1446,7 @@ int16 makeMenuChoice(const commandeType commandList[], uint16 height, uint16 X,
} while (!var_A);
if (needMouseSave) {
assert(0);
}
assert(!needMouseSave);
var_4 = button;
@ -1680,9 +1678,7 @@ int16 makeMenuChoice2(const commandeType commandList[], uint16 height, uint16 X,
} while (!var_A);
if (needMouseSave) {
assert(0);
}
assert(!needMouseSave);
var_4 = button;
@ -2828,15 +2824,13 @@ void processSeqListElement(SeqListElement *element) {
param1 = ptr1[1];
param2 = ptr1[2];
if (element->varC == 255) {
if (globalVars[VAR_MOUSE_X_POS] || globalVars[VAR_MOUSE_Y_POS]) {
computeMove1(element, ptr1[4] + x, ptr1[5] + y, param1, param2, globalVars[VAR_MOUSE_X_POS], globalVars[VAR_MOUSE_Y_POS]);
} else {
element->var16 = 0;
element->var14 = 0;
}
assert(element->varC == 255);
if (globalVars[VAR_MOUSE_X_POS] || globalVars[VAR_MOUSE_Y_POS]) {
computeMove1(element, ptr1[4] + x, ptr1[5] + y, param1, param2, globalVars[VAR_MOUSE_X_POS], globalVars[VAR_MOUSE_Y_POS]);
} else {
assert(0);
element->var16 = 0;
element->var14 = 0;
}
var_10 = computeMove2(element);