[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.87,1.88 simon.h,1.81,1.82
Travis Howell
kirben at users.sourceforge.net
Mon Jul 21 09:30:24 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv13241/simon
Modified Files:
items.cpp simon.h
Log Message:
Rename function, update comments
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- items.cpp 21 Jul 2003 09:11:21 -0000 1.87
+++ items.cpp 21 Jul 2003 16:25:16 -0000 1.88
@@ -362,7 +362,7 @@
}
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 @@
}
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 @@
}
break;
- case 76:{ /* add event */
+ case 76:{ /* add timeout */
uint timeout = getVarOrWord();
addTimeEvent(timeout, getVarOrWord());
}
@@ -452,7 +452,7 @@
return -10;
}
- case 87:{ /* dummy opcode? */
+ case 87:{ /* dummy opcode */
getNextStringID();
}
break;
@@ -712,12 +712,12 @@
}
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 @@
}
break;
- case 134:{
+ case 134:{ /* dummy opcode? */
midi.stop();
_last_music_played = -1;
}
@@ -923,7 +923,7 @@
break;
case 163:{ /* play sound */
- o_unk_163(getVarOrWord());
+ o_play_sound(getVarOrWord());
}
break;
@@ -988,8 +988,8 @@
}
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_163(uint a) {
+void SimonEngine::o_play_sound(uint a) {
if (_game == GAME_SIMON1DOS)
playSting(a);
else
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- simon.h 21 Jul 2003 09:11:21 -0000 1.81
+++ simon.h 21 Jul 2003 16:25:16 -0000 1.82
@@ -475,7 +475,7 @@
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);
More information about the Scummvm-git-logs
mailing list