[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.101,1.102 simon.cpp,1.340,1.341 simon.h,1.101,1.102
Travis Howell
kirben at users.sourceforge.net
Sun Nov 30 21:23:02 CET 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv18720/simon
Modified Files:
items.cpp simon.cpp simon.h
Log Message:
cleanup
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- items.cpp 30 Oct 2003 01:05:08 -0000 1.101
+++ items.cpp 1 Dec 2003 05:22:04 -0000 1.102
@@ -376,10 +376,10 @@
uint var = getVarOrByte();
uint string_id = getNextStringID();
if (_game & GF_TALKIE) {
- uint value = getNextWord();
+ uint speech_id = getNextWord();
if (var < 20) {
_stringid_array_3[var] = string_id;
- _array_4[var] = value;
+ _speechid_array_4[var] = speech_id;
}
} else {
if (var < 20)
@@ -991,20 +991,20 @@
break;
case 179:{ /* conversation responses */
- uint vga_struct_id = getVarOrByte(); /* and room descriptions */
+ uint vga_sprite_id = getVarOrByte(); /* and room descriptions */
uint color = getVarOrByte();
uint string_id = getVarOrByte();
uint speech_id = 0;
const char *string_ptr = (const char *)getStringPtrByID(_stringid_array_3[string_id]);
- ThreeValues *tv = getThreeValues(vga_struct_id);
+ ThreeValues *tv = getThreeValues(vga_sprite_id);
if (_game & GF_TALKIE)
- speech_id = _array_4[string_id];
+ speech_id = _speechid_array_4[string_id];
if (_speech && speech_id != 0)
- talk_with_speech(speech_id, vga_struct_id);
+ talk_with_speech(speech_id, vga_sprite_id);
if (string_ptr != NULL && _subtitles)
- talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c);
+ talk_with_text(vga_sprite_id, color, string_ptr, tv->a, tv->b, tv->c);
}
break;
@@ -1231,7 +1231,7 @@
}
void SimonEngine::o_inventory_descriptions() {
- uint vga_struct_id = getVarOrByte();
+ uint vga_sprite_id = getVarOrByte();
uint color = getVarOrByte();
const char *string_ptr = NULL;
ThreeValues *tv = NULL;
@@ -1240,7 +1240,7 @@
Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2);
if (child != NULL && child->avail_props & 1) {
string_ptr = (const char *)getStringPtrByID(child->array[0]);
- tv = getThreeValues(vga_struct_id);
+ tv = getThreeValues(vga_sprite_id);
}
if ((_game & GF_SIMON2) && (_game & GF_TALKIE)) {
@@ -1292,16 +1292,16 @@
}
if (_speech)
- talk_with_speech(var200, vga_struct_id);
+ talk_with_speech(var200, vga_sprite_id);
}
} else if (_game & GF_TALKIE) {
if (child != NULL && child->avail_props & 0x200) {
uint offs = getOffsetOfChild2Param(child, 0x200);
- talk_with_speech(child->array[offs], vga_struct_id);
+ talk_with_speech(child->array[offs], vga_sprite_id);
} else if (child != NULL && child->avail_props & 0x100) {
uint offs = getOffsetOfChild2Param(child, 0x100);
- talk_with_speech(child->array[offs] + 3550, vga_struct_id);
+ talk_with_speech(child->array[offs] + 3550, vga_sprite_id);
}
}
@@ -1311,7 +1311,7 @@
string_ptr = buf;
}
if (string_ptr != NULL)
- talk_with_text(vga_struct_id, color, string_ptr, tv->a, tv->b, tv->c);
+ talk_with_text(vga_sprite_id, color, string_ptr, tv->a, tv->b, tv->c);
}
}
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -d -r1.340 -r1.341
--- simon.cpp 1 Dec 2003 00:54:50 -0000 1.340
+++ simon.cpp 1 Dec 2003 05:22:04 -0000 1.341
@@ -419,7 +419,7 @@
memset(_stringid_array_2, 0, sizeof(_stringid_array_2));
memset(_stringid_array_3, 0, sizeof(_stringid_array_3));
- memset(_array_4, 0, sizeof(_array_4));
+ memset(_speechid_array_4, 0, sizeof(_speechid_array_4));
memset(_bit_array, 0, sizeof(_bit_array));
memset(_variableArray, 0, sizeof(_variableArray));
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- simon.h 1 Dec 2003 00:45:16 -0000 1.101
+++ simon.h 1 Dec 2003 05:22:04 -0000 1.102
@@ -295,7 +295,7 @@
uint16 _stringid_array_2[20];
uint16 _stringid_array_3[20];
- uint16 _array_4[20];
+ uint16 _speechid_array_4[20];
uint16 _bit_array[32];
int16 _variableArray[256];
More information about the Scummvm-git-logs
mailing list