[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.105,1.106 simon.cpp,1.381,1.382 simon.h,1.114,1.115
Travis Howell
kirben at users.sourceforge.net
Fri Dec 19 22:01:01 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.380,1.381 vga.cpp,1.100,1.101
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.382,1.383 simon.h,1.115,1.116 vga.cpp,1.101,1.102
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv23381/simon
Modified Files:
items.cpp simon.cpp simon.h
Log Message:
Revert bug work around, still can't detect conversation will enough yet.
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- items.cpp 18 Dec 2003 09:04:13 -0000 1.105
+++ items.cpp 20 Dec 2003 06:00:55 -0000 1.106
@@ -378,9 +378,7 @@
if (_game & GF_TALKIE) {
uint speech_id = getNextWord();
if (var < 20) {
- _stringid_array_3_backup[var] = _stringid_array_3[var];
_stringid_array_3[var] = string_id;
- _speechid_array_4_backup[var] = _speechid_array_4[var];
_speechid_array_4[var] = speech_id;
}
} else {
@@ -936,8 +934,6 @@
_show_preposition = true;
o_setup_cond_c();
_show_preposition = false;
- if (!(_game & GF_SIMON2) && (_game & GF_TALKIE))
- _reset_arrays = true;
}
break;
@@ -1010,18 +1006,6 @@
talk_with_speech(speech_id, vga_sprite_id);
if (string_ptr != NULL && _subtitles)
talk_with_text(vga_sprite_id, color, string_ptr, tv->a, tv->b, tv->c);
-
- if (_reset_arrays) {
- // Work around for bug in original Simon the Sorcerer 1
- // The game wouldn't reset array back to room descriptions
- // after a conversation.
- uint i;
- for (i = 0; i < 21; i++) {
- _stringid_array_3[i] = _stringid_array_3_backup[i];
- _speechid_array_4[i] = _speechid_array_4_backup[i];
- }
- _reset_arrays = 0;
- }
}
break;
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- simon.cpp 20 Dec 2003 04:34:24 -0000 1.381
+++ simon.cpp 20 Dec 2003 06:00:55 -0000 1.382
@@ -453,10 +453,7 @@
memset(_stringid_array_2, 0, sizeof(_stringid_array_2));
memset(_stringid_array_3, 0, sizeof(_stringid_array_3));
- memset(_stringid_array_3_backup, 0, sizeof(_stringid_array_3_backup));
memset(_speechid_array_4, 0, sizeof(_speechid_array_4));
- memset(_speechid_array_4_backup, 0, sizeof(_speechid_array_4_backup));
- _reset_arrays = 0;
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.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- simon.h 20 Dec 2003 04:20:22 -0000 1.114
+++ simon.h 20 Dec 2003 06:00:55 -0000 1.115
@@ -298,10 +298,7 @@
uint16 _stringid_array_2[20];
uint16 _stringid_array_3[20];
- uint16 _stringid_array_3_backup[20];
uint16 _speechid_array_4[20];
- uint16 _speechid_array_4_backup[20];
- bool _reset_arrays;
uint16 _bit_array[32];
int16 _variableArray[256];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.380,1.381 vga.cpp,1.100,1.101
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.382,1.383 simon.h,1.115,1.116 vga.cpp,1.101,1.102
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list