diff options
-rw-r--r-- | scumm/intern.h | 8 | ||||
-rw-r--r-- | scumm/script_v100he.cpp | 12 | ||||
-rw-r--r-- | scumm/script_v80he.cpp | 26 | ||||
-rw-r--r-- | scumm/script_v90he.cpp | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 56be6123c4..9d95e08c23 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -985,8 +985,8 @@ protected: void loadImgSpot(int resId, int state, int16 &x, int16 &y); void loadWizCursor(int resId); - void unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id); - void unknownE0Helper(int x, int y, int flags); + void drawLine(int x1, int y1, int x, int unk1, int unk2, int type, int id); + void drawPixel(int x, int y, int flags); /* HE version 80 script opcodes */ void o80_loadSBNG(); @@ -1000,7 +1000,7 @@ protected: void o80_setState(); void o80_drawBox(); void o80_drawWizPolygon(); - void o80_unknownE0(); + void o80_drawLine(); void o80_pickVarRandom(); void o80_getResourceSize(); }; @@ -1286,7 +1286,7 @@ protected: void o100_dim2dimArray(); void o100_redim2dimArray(); void o100_dimArray(); - void o100_unknownE0(); + void o100_drawLine(); void o100_drawObject(); void o100_setSpriteGroupInfo(); void o100_resourceRoutines(); diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 7642b4307a..2c6fd8ff9b 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -89,7 +89,7 @@ void ScummEngine_v100he::setupOpcodes() { /* 24 */ OPCODE(o72_drawWizImage), OPCODE(o80_drawWizPolygon), - OPCODE(o100_unknownE0), + OPCODE(o100_drawLine), OPCODE(o100_drawObject), /* 28 */ OPCODE(o6_dup), @@ -801,7 +801,7 @@ void ScummEngine_v100he::o100_dimArray() { defineArray(fetchScriptWord(), data, 0, 0, 0, pop()); } -void ScummEngine_v100he::o100_unknownE0() { +void ScummEngine_v100he::o100_drawLine() { int id, unk1, unk2, x, x1, y1; unk2 = pop(); @@ -815,16 +815,16 @@ void ScummEngine_v100he::o100_unknownE0() { switch (subOp) { case 1: - unknownE0(x1, y1, x, unk1, unk2, 2, id); + drawLine(x1, y1, x, unk1, unk2, 2, id); break; case 20: - unknownE0(x1, y1, x, unk1, unk2, 1, id); + drawLine(x1, y1, x, unk1, unk2, 1, id); break; case 40: - unknownE0(x1, y1, x, unk1, unk2, 3, id); + drawLine(x1, y1, x, unk1, unk2, 3, id); break; default: - error("o100_unknownE0: default case %d", subOp); + error("o100_drawLine: default case %d", subOp); } } diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index 05e1a69931..00346aafff 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -324,7 +324,7 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o72_deleteFile), OPCODE(o72_rename), /* E0 */ - OPCODE(o80_unknownE0), + OPCODE(o80_drawLine), OPCODE(o72_getPixel), OPCODE(o60_localizeArrayToScript), OPCODE(o80_pickVarRandom), @@ -613,8 +613,8 @@ void ScummEngine_v80he::o80_drawWizPolygon() { displayWizImage(&wi); } -void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int type, int id) { - debug(0,"unknownE0: x1 %d y1 %d x %d unk1 %d, unk2 %d type %d id %d", x1, y1, x, unk1, unk2, type, id); +void ScummEngine_v80he::drawLine(int x1, int y1, int x, int unk1, int unk2, int type, int id) { + debug(0,"drawLine: x1 %d y1 %d x %d unk1 %d, unk2 %d type %d id %d", x1, y1, x, unk1, unk2, type, id); int eax, ebx, ecx, edx, esi; int var_4, var_8, var_C, y; @@ -638,7 +638,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int } if (type == 2) { - Actor *a = derefActor(id, "unknownE0"); + Actor *a = derefActor(id, "drawLine"); a->drawActorToBackBuf(x1, y1); } else if (type == 3) { WizImage wi; @@ -649,7 +649,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int wi.state = 0; displayWizImage(&wi); } else { - unknownE0Helper(x1, y1, id); + drawPixel(x1, y1, id); } x1 = 0; @@ -701,7 +701,7 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int continue; if (type == 2) { - Actor *a = derefActor(id, "unknownE0"); + Actor *a = derefActor(id, "drawLine"); a->drawActorToBackBuf(x, y); } else if (type == 3) { WizImage wi; @@ -712,12 +712,12 @@ void ScummEngine_v80he::unknownE0(int x1, int y1, int x, int unk1, int unk2, int wi.state = 0; displayWizImage(&wi); } else { - unknownE0Helper(x, y, id); + drawPixel(x, y, id); } } } -void ScummEngine_v80he::unknownE0Helper(int x, int y, int flags) { +void ScummEngine_v80he::drawPixel(int x, int y, int flags) { VirtScreen *vs; if (x < 0 || x > 639) @@ -744,7 +744,7 @@ void ScummEngine_v80he::unknownE0Helper(int x, int y, int flags) { } } -void ScummEngine_v80he::o80_unknownE0() { +void ScummEngine_v80he::o80_drawLine() { int id, unk1, unk2, x, x1, y1; unk2 = pop(); @@ -758,16 +758,16 @@ void ScummEngine_v80he::o80_unknownE0() { switch (subOp) { case 55: - unknownE0(x1, y1, x, unk1, unk2, 2, id); + drawLine(x1, y1, x, unk1, unk2, 2, id); break; case 63: - unknownE0(x1, y1, x, unk1, unk2, 3, id); + drawLine(x1, y1, x, unk1, unk2, 3, id); break; case 66: - unknownE0(x1, y1, x, unk1, unk2, 1, id); + drawLine(x1, y1, x, unk1, unk2, 1, id); break; default: - error("o80_unknownE0: default case %d", subOp); + error("o80_drawLine: default case %d", subOp); } } diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 1ae0591958..c120ddd6ad 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -323,7 +323,7 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o72_deleteFile), OPCODE(o72_rename), /* E0 */ - OPCODE(o80_unknownE0), + OPCODE(o80_drawLine), OPCODE(o72_getPixel), OPCODE(o60_localizeArrayToScript), OPCODE(o80_pickVarRandom), |