aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-07-21 16:25:16 +0000
committerTravis Howell2003-07-21 16:25:16 +0000
commit760bfb2245c1296d94c36c63f843968143f7d831 (patch)
treef9bcd0ea394b2c91938160106bac95ad4f2878c8
parent0bb6f3497d0f011458823b369f6d6cb84a914c36 (diff)
downloadscummvm-rg350-760bfb2245c1296d94c36c63f843968143f7d831.tar.gz
scummvm-rg350-760bfb2245c1296d94c36c63f843968143f7d831.tar.bz2
scummvm-rg350-760bfb2245c1296d94c36c63f843968143f7d831.zip
Rename function, update comments
svn-id: r9108
-rw-r--r--simon/items.cpp22
-rw-r--r--simon/simon.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 8dcfacdc35..7191e45068 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -362,7 +362,7 @@ int SimonEngine::runScript() {
}
break;
- case 66:{ /* set array 2 */
+ case 66:{ /* set item name */
uint var = getVarOrByte();
uint string_id = getNextStringID();
if (var < 20)
@@ -370,7 +370,7 @@ int SimonEngine::runScript() {
}
break;
- case 67:{ /* set array 3 and 4 */
+ case 67:{ /* set item description */
uint var = getVarOrByte();
uint string_id = getNextStringID();
if (_game & GF_TALKIE) {
@@ -413,7 +413,7 @@ int SimonEngine::runScript() {
}
break;
- case 76:{ /* add event */
+ case 76:{ /* add timeout */
uint timeout = getVarOrWord();
addTimeEvent(timeout, getVarOrWord());
}
@@ -452,7 +452,7 @@ int SimonEngine::runScript() {
return -10;
}
- case 87:{ /* dummy opcode? */
+ case 87:{ /* dummy opcode */
getNextStringID();
}
break;
@@ -712,12 +712,12 @@ int SimonEngine::runScript() {
}
break;
- case 128:{ /* dummy instruction? */
+ case 128:{ /* dummy instruction */
getVarOrWord();
}
break;
- case 129:{ /* dummy instruction? */
+ case 129:{ /* dummy instruction */
getVarOrWord();
condition = true;
}
@@ -759,7 +759,7 @@ int SimonEngine::runScript() {
}
break;
- case 134:{
+ case 134:{ /* dummy opcode? */
midi.stop();
_last_music_played = -1;
}
@@ -923,7 +923,7 @@ int SimonEngine::runScript() {
break;
case 163:{ /* play sound */
- o_unk_163(getVarOrWord());
+ o_play_sound(getVarOrWord());
}
break;
@@ -988,8 +988,8 @@ int SimonEngine::runScript() {
}
break;
- case 179:{ /* room descriptions */
- uint b = getVarOrByte();
+ case 179:{ /* conversation responses */
+ uint b = getVarOrByte(); /* and room descriptions */
uint c = getVarOrByte();
uint a = getVarOrByte();
uint d = 0;
@@ -1540,7 +1540,7 @@ void SimonEngine::o_unk_120(uint a) {
}
}
-void SimonEngine::o_unk_163(uint a) {
+void SimonEngine::o_play_sound(uint a) {
if (_game == GAME_SIMON1DOS)
playSting(a);
else
diff --git a/simon/simon.h b/simon/simon.h
index ac0e7515e5..7a95dc910f 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -475,7 +475,7 @@ protected:
uint getOffsetOfChild2Param(Child2 *child, uint prop);
void o_unk_160(uint a);
- void o_unk_163(uint a);
+ void o_play_sound(uint a);
void o_unk_175();
void o_unk_176();
void o_pathfind(int x, int y, uint var_1, uint var_2);