aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h16
-rw-r--r--scumm/script_v100he.cpp34
-rw-r--r--scumm/script_v90he.cpp34
3 files changed, 42 insertions, 42 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index a7e7439a19..01033b76a9 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -883,10 +883,10 @@ protected:
void o90_jumpToScriptUnk();
void o90_wizImageOps();
void o90_getDistanceBetweenPoints();
- void o90_unknown25();
- void o90_unknown26();
- void o90_unknown27();
- void o90_unknown28();
+ void o90_getSpriteInfo();
+ void o90_setSpriteInfo();
+ void o90_getSpriteGroupInfo();
+ void o90_setSpriteGroupInfo();
void o90_getWizData();
void o90_unknown2F();
void o90_mod();
@@ -933,7 +933,7 @@ protected:
void o100_redim2dimArray();
void o100_dimArray();
void o100_drawObject();
- void o100_unknown28();
+ void o100_setSpriteGroupInfo();
void o100_resourceRoutines();
void o100_wizImageOps();
void o100_loadSBNG();
@@ -942,16 +942,16 @@ protected:
void o100_redimArray();
void o100_roomOps();
void o100_startSound();
- void o100_unknown26();
+ void o100_setSpriteInfo();
void o100_quitPauseRestart();
void o100_cursorCommand();
void o100_wait();
void o100_writeFile();
void o100_getResourceSize();
- void o100_unknown27();
+ void o100_getSpriteGroupInfo();
void o100_getPaletteData();
void o100_readFile();
- void o100_unknown25();
+ void o100_getSpriteInfo();
void o100_getWizData();
};
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 2c72cd4fde..a4c85e2273 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -103,7 +103,7 @@ void ScummEngine_v100he::setupOpcodes() {
/* 30 */
OPCODE(o6_ge),
OPCODE(o6_getDateTime),
- OPCODE(o100_unknown28),
+ OPCODE(o100_setSpriteGroupInfo),
OPCODE(o6_gt),
/* 34 */
OPCODE(o100_resourceRoutines),
@@ -192,7 +192,7 @@ void ScummEngine_v100he::setupOpcodes() {
OPCODE(o100_startSound),
/* 78 */
OPCODE(o6_invalid),
- OPCODE(o100_unknown26),
+ OPCODE(o100_setSpriteInfo),
OPCODE(o6_stampObject),
OPCODE(o72_startObject),
/* 7C */
@@ -271,7 +271,7 @@ void ScummEngine_v100he::setupOpcodes() {
OPCODE(o72_checkGlobQueue),
OPCODE(o100_getResourceSize),
/* B8 */
- OPCODE(o100_unknown27),
+ OPCODE(o100_getSpriteGroupInfo),
OPCODE(o6_invalid),
OPCODE(o100_getWizData),
OPCODE(o6_isActorInBox),
@@ -314,7 +314,7 @@ void ScummEngine_v100he::setupOpcodes() {
OPCODE(o72_getSoundElapsedTimeOfSound),
OPCODE(o6_isSoundRunning),
OPCODE(o80_getSoundVar),
- OPCODE(o100_unknown25),
+ OPCODE(o100_getSpriteInfo),
/* DC */
OPCODE(o90_sqrt),
OPCODE(o6_startObjectQuick),
@@ -831,7 +831,7 @@ void ScummEngine_v100he::o100_drawObject() {
}
}
-void ScummEngine_v100he::o100_unknown28() {
+void ScummEngine_v100he::o100_setSpriteGroupInfo() {
byte string[260];
byte subOp = fetchScriptByte();
@@ -877,7 +877,7 @@ void ScummEngine_v100he::o100_unknown28() {
pop();
break;
default:
- error("o100_unknown28 subOp 38: Unknown case %d", subOp);
+ error("o100_setSpriteGroupInfo subOp 38: Unknown case %d", subOp);
}
break;
case 40:
@@ -906,9 +906,9 @@ void ScummEngine_v100he::o100_unknown28() {
case 89:
break;
default:
- error("o100_unknown28: Unknown case %d", subOp);
+ error("o100_setSpriteGroupInfo: Unknown case %d", subOp);
}
- debug(1,"o100_unknown28 stub (%d)", subOp);
+ debug(1,"o100_setSpriteGroupInfo stub (%d)", subOp);
}
void ScummEngine_v100he::o100_resourceRoutines() {
@@ -1498,7 +1498,7 @@ void ScummEngine_v100he::o100_startSound() {
}
}
-void ScummEngine_v100he::o100_unknown26() {
+void ScummEngine_v100he::o100_setSpriteInfo() {
int args[16];
byte string[80];
@@ -1597,9 +1597,9 @@ void ScummEngine_v100he::o100_unknown26() {
case 89:
break;
default:
- error("o100_unknown26: Unknown case %d", subOp);
+ error("o100_setSpriteInfo: Unknown case %d", subOp);
}
- debug(1,"o100_unknown26 stub (%d)", subOp);
+ debug(1,"o100_setSpriteInfo stub (%d)", subOp);
}
void ScummEngine_v100he::o100_quitPauseRestart() {
@@ -1788,7 +1788,7 @@ void ScummEngine_v100he::o100_getResourceSize() {
push(size);
}
-void ScummEngine_v100he::o100_unknown27() {
+void ScummEngine_v100he::o100_getSpriteGroupInfo() {
byte subOp = fetchScriptByte();
switch (subOp) {
case 5:
@@ -1815,11 +1815,11 @@ void ScummEngine_v100he::o100_unknown27() {
pop();
break;
default:
- error("o100_unknown27: Unknown case %d", subOp);
+ error("o100_getSpriteGroupInfo: Unknown case %d", subOp);
}
push(0);
- debug(1,"o100_unknown27 stub (%d)", subOp);
+ debug(1,"o100_getSpriteGroupInfo stub (%d)", subOp);
}
void ScummEngine_v100he::o100_getWizData() {
@@ -1976,7 +1976,7 @@ void ScummEngine_v100he::o100_readFile() {
debug(1, "o100_readFile: slot %d, subOp %d val %d", slot, subOp, val);
}
-void ScummEngine_v100he::o100_unknown25() {
+void ScummEngine_v100he::o100_getSpriteInfo() {
int args[16];
byte subOp = fetchScriptByte();
@@ -2072,10 +2072,10 @@ void ScummEngine_v100he::o100_unknown25() {
pop();
break;
default:
- error("o100_unknown25: Unknown case %d", subOp);
+ error("o100_getSpriteInfo: Unknown case %d", subOp);
}
push(0);
- debug(1,"o100_unknown25 stub (%d)", subOp);
+ debug(1,"o100_getSpriteInfo stub (%d)", subOp);
}
void ScummEngine_v100he::decodeParseString(int m, int n) {
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 37c9141f2a..8c4a70ce11 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -87,11 +87,11 @@ void ScummEngine_v90he::setupOpcodes() {
OPCODE(o90_getSegmentAngle),
/* 24 */
OPCODE(o90_getDistanceBetweenPoints),
- OPCODE(o90_unknown25), // o90_getSpriteInfo
- OPCODE(o90_unknown26), // o90_setSpriteInfo
- OPCODE(o90_unknown27), // o90_getSpriteGroupInfo
+ OPCODE(o90_getSpriteInfo),
+ OPCODE(o90_setSpriteInfo),
+ OPCODE(o90_getSpriteGroupInfo),
/* 28 */
- OPCODE(o90_unknown28), // o90_setSpriteGroupInfo
+ OPCODE(o90_setSpriteGroupInfo),
OPCODE(o90_getWizData),
OPCODE(o6_invalid),
OPCODE(o90_startScriptUnk),
@@ -696,12 +696,12 @@ void ScummEngine_v90he::o90_getDistanceBetweenPoints() {
}
}
-void ScummEngine_v90he::o90_unknown25() {
+void ScummEngine_v90he::o90_getSpriteInfo() {
int args[16];
byte subOp = fetchScriptByte();
subOp -= 30;
- debug(1,"o90_unknown25 stub (%d)", subOp);
+ debug(1,"o90_getSpriteInfo stub (%d)", subOp);
switch (subOp) {
case 0:
pop();
@@ -791,12 +791,12 @@ void ScummEngine_v90he::o90_unknown25() {
pop();
break;
default:
- error("o90_unknown25: Unknown case %d", subOp);
+ error("o90_getSpriteInfo: Unknown case %d", subOp);
}
push(0);
}
-void ScummEngine_v90he::o90_unknown26() {
+void ScummEngine_v90he::o90_setSpriteInfo() {
int args[16];
byte subOp = fetchScriptByte();
subOp -= 34;
@@ -887,12 +887,12 @@ void ScummEngine_v90he::o90_unknown26() {
case 183:
break;
default:
- error("o90_unknown26: Unknown case %d", subOp);
+ error("o90_setSpriteInfo: Unknown case %d", subOp);
}
- debug(1,"o90_unknown26 stub (%d)", subOp);
+ debug(1,"o90_setSpriteInfo stub (%d)", subOp);
}
-void ScummEngine_v90he::o90_unknown27() {
+void ScummEngine_v90he::o90_getSpriteGroupInfo() {
byte subOp = fetchScriptByte();
switch (subOp) {
case 8: // HE 99+
@@ -919,14 +919,14 @@ void ScummEngine_v90he::o90_unknown27() {
pop();
break;
default:
- error("o90_unknown27: Unknown case %d", subOp);
+ error("o90_getSpriteGroupInfo: Unknown case %d", subOp);
}
push(0);
- debug(1,"o90_unknown27 stub (%d)", subOp);
+ debug(1,"o90_getSpriteGroupInfo stub (%d)", subOp);
}
-void ScummEngine_v90he::o90_unknown28() {
+void ScummEngine_v90he::o90_setSpriteGroupInfo() {
byte subOp = fetchScriptByte();
subOp -= 37;
@@ -958,7 +958,7 @@ void ScummEngine_v90he::o90_unknown28() {
pop();
break;
default:
- error("o90_unknown28 subOp 0: Unknown case %d", subOp);
+ error("o90_setSpriteGroupInfo subOp 0: Unknown case %d", subOp);
}
break;
case 5:
@@ -993,9 +993,9 @@ void ScummEngine_v90he::o90_unknown28() {
case 180:
break;
default:
- error("o90_unknown28: Unknown case %d", subOp);
+ error("o90_setSpriteGroupInfo: Unknown case %d", subOp);
}
- debug(1,"o90_unknown28 stub (%d)", subOp);
+ debug(1,"o90_setSpriteGroupInfo stub (%d)", subOp);
}
void ScummEngine_v90he::o90_getWizData() {