[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.102,1.103
Travis Howell
kirben at users.sourceforge.net
Fri Dec 5 18:09:02 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common/scaler hq2x.h,NONE,1.1 hq3x.h,NONE,1.1 hq2x.cpp,1.8,1.9 hq3x.cpp,1.6,1.7 intern.h,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.93,1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv20179/simon
Modified Files:
items.cpp
Log Message:
Cleanup
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- items.cpp 1 Dec 2003 05:22:04 -0000 1.102
+++ items.cpp 6 Dec 2003 02:08:51 -0000 1.103
@@ -1245,54 +1245,54 @@
if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) {
if (child != NULL && child->avail_props & 0x200) {
- uint var200 = child->array[getOffsetOfChild2Param(child, 0x200)];
+ uint speech_id = child->array[getOffsetOfChild2Param(child, 0x200)];
if (child->avail_props & 0x100) {
- uint var100 = child->array[getOffsetOfChild2Param(child, 0x100)];
+ uint speech_id_offs = child->array[getOffsetOfChild2Param(child, 0x100)];
- if (var200 == 116)
- var200 = var100 + 115;
- if (var200 == 92)
- var200 = var100 + 98;
- if (var200 == 99)
- var200 = 9;
- if (var200 == 97) {
- switch (var100) {
+ if (speech_id == 116)
+ speech_id = speech_id_offs + 115;
+ if (speech_id == 92)
+ speech_id = speech_id_offs + 98;
+ if (speech_id == 99)
+ speech_id = 9;
+ if (speech_id == 97) {
+ switch (speech_id_offs) {
case 12:
- var200 = 109;
+ speech_id = 109;
break;
case 14:
- var200 = 108;
+ speech_id = 108;
break;
case 18:
- var200 = 107;
+ speech_id = 107;
break;
case 20:
- var200 = 106;
+ speech_id = 106;
break;
case 22:
- var200 = 105;
+ speech_id = 105;
break;
case 28:
- var200 = 104;
+ speech_id = 104;
break;
case 90:
- var200 = 103;
+ speech_id = 103;
break;
case 92:
- var200 = 102;
+ speech_id = 102;
break;
case 100:
- var200 = 51;
+ speech_id = 51;
break;
default:
- error("o_177: invalid case %d", var100);
+ error("o_177: invalid case %d", speech_id_offs);
}
}
}
if (_speech)
- talk_with_speech(var200, vga_sprite_id);
+ talk_with_speech(speech_id, vga_sprite_id);
}
} else if (_game & GF_TALKIE) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common/scaler hq2x.h,NONE,1.1 hq3x.h,NONE,1.1 hq2x.cpp,1.8,1.9 hq3x.cpp,1.6,1.7 intern.h,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.93,1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list