[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.8,1.9 res.cpp,1.8,1.9 simon.cpp,1.51,1.52 simon.h,1.8,1.9
Travis Howell
kirben at users.sourceforge.net
Tue Nov 5 02:37:04 CET 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv27624/simon
Modified Files:
items.cpp res.cpp simon.cpp simon.h
Log Message:
Add simon1talkie and simon2talkie targets
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- items.cpp 5 Nov 2002 05:41:51 -0000 1.8
+++ items.cpp 5 Nov 2002 10:36:31 -0000 1.9
@@ -386,7 +386,7 @@
break;
case 67:{ /* set array 3 and 4 */
- if (_game & GAME_WIN) {
+ if (_game & GAME_TALKIE || _game & GAME_WIN) {
uint var = getVarOrByte();
uint string_id = getNextStringID();
uint value = getNextWord();
@@ -1008,14 +1008,14 @@
break;
case 179:{
- if (_game == GAME_SIMON1WIN) {
+ if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
uint b = getVarOrByte();
/*uint c = */ getVarOrByte();
uint a = getVarOrByte();
uint d = _array_4[a];
if (d != 0)
talk_with_speech(d, b);
- } else if ((_game == GAME_SIMON1DEMO) || (_game == GAME_SIMON1DOS)) {
+ } else if (_game == GAME_SIMON1DEMO || _game == GAME_SIMON1DOS) {
uint b = getVarOrByte();
uint c = getVarOrByte();
uint a = getVarOrByte();
@@ -1040,7 +1040,7 @@
}
talk_with_text(b, c, s, tv->a, tv->b, tv->c);
- } else if (_game == GAME_SIMON2WIN) {
+ } else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
uint b = getVarOrByte();
uint c = getVarOrByte();
uint a = getVarOrByte();
@@ -1303,7 +1303,7 @@
void SimonState::o_177()
{
- if (_game == GAME_SIMON1WIN) {
+ if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
uint a = getVarOrByte();
/*uint b = */ getVarOrByte();
uint offs;
@@ -1348,7 +1348,7 @@
talk_with_text(a, b, s, tv->a, tv->b, tv->c);
}
- } else if (_game == GAME_SIMON2WIN) {
+ } else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
uint a = getVarOrByte();
uint b = getVarOrByte();
Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2);
Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- res.cpp 31 Oct 2002 01:27:05 -0000 1.8
+++ res.cpp 5 Nov 2002 10:36:31 -0000 1.9
@@ -253,12 +253,14 @@
const char *const *table;
switch (_game) {
+ case GAME_SIMON1TALKIE:
case GAME_SIMON1WIN:
table = opcode_arg_table_simon1win;
break;
case GAME_SIMON2DOS:
table = opcode_arg_table_simon2dos;
break;
+ case GAME_SIMON2TALKIE:
case GAME_SIMON2WIN:
table = opcode_arg_table_simon2win;
break;
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- simon.cpp 5 Nov 2002 05:41:51 -0000 1.51
+++ simon.cpp 5 Nov 2002 10:36:31 -0000 1.52
@@ -1713,6 +1713,7 @@
switch (_game) {
+ case GAME_SIMON1TALKIE:
case GAME_SIMON1WIN:
if (string_id != 0xFFFF)
string_ptr = getStringPtrByID(string_id);
@@ -1720,6 +1721,7 @@
speech_id = (uint16)getNextWord();
break;
+ case GAME_SIMON2TALKIE:
case GAME_SIMON2WIN:
if (string_id != 0xFFFF)
string_ptr = getStringPtrByID(string_id);
@@ -1759,6 +1761,7 @@
switch (_game) {
+ case GAME_SIMON1TALKIE:
case GAME_SIMON1WIN:
#ifdef USE_TEXT_HACK
if (speech_id != 0) {
@@ -1792,6 +1795,7 @@
talk_with_text(num_1, num_2, (char *)string_ptr, tv->a, tv->b, tv->c);
break;
+ case GAME_SIMON2TALKIE:
case GAME_SIMON2WIN:
if (speech_id != 0 && num_1 == 1 && !_vk_t_toggle)
talk_with_speech(speech_id, num_1);
@@ -4347,7 +4351,7 @@
_sdl_buf = (byte *)calloc(320 * 200, 1);
_sdl_buf_attached = (byte *)calloc(320 * 200, 1);
- if (_game == GAME_SIMON2WIN) {
+ if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
gss = &simon2win_settings;
} else if (_game == GAME_SIMON2DOS) {
gss = &simon2dos_settings;
@@ -4675,7 +4679,7 @@
void SimonState::initSound()
{
/* only read voice file in windows game */
- if (_game & GAME_WIN) {
+ if (_game & GAME_TALKIE || _game & GAME_WIN) {
const char *m = gss->mp3_filename;
const char *s = gss->wav_filename;
const char *s2 = gss->voc_filename;
@@ -4985,7 +4989,7 @@
#ifdef USE_MAD
}
#endif
- } else if (_game & GAME_WIN) { /* ? sound simon 1/2 win talkie */
+ } else if (_game & GAME_TALKIE || _game & GAME_WIN) { /* ? sound simon 1/2 win talkie */
byte *p;
@@ -5027,7 +5031,7 @@
/* Simon 2 dos music isn't supported */
if (_voice_type == FORMAT_WAV) {
midi.shutdown();
- if (_game & GAME_WIN) {
+ if (_game & GAME_TALKIE || _game & GAME_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.read_all_songs(_game_file);
}
@@ -5037,7 +5041,7 @@
} else if (!(_game & GAME_SIMON2)){
midi.shutdown();
- if (_game & GAME_WIN) {
+ if (_game & GAME_TALKIE || _game & GAME_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
midi.read_all_songs_old(_game_file);
} else {
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- simon.h 31 Oct 2002 01:55:11 -0000 1.8
+++ simon.h 5 Nov 2002 10:36:31 -0000 1.9
@@ -114,12 +114,16 @@
enum {
GAME_SIMON2 = 1,
GAME_WIN = 2,
+ GAME_TALKIE = 4,
+ GAME_DEMO = 8,
GAME_SIMON1DOS = 0,
- GAME_SIMON1WIN = GAME_WIN,
GAME_SIMON2DOS = GAME_SIMON2,
- GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN,
- GAME_SIMON1DEMO = 4,
+ GAME_SIMON1TALKIE = GAME_TALKIE,
+ GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE,
+ GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE,
+ GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE,
+ GAME_SIMON1DEMO = GAME_DEMO,
};
typedef enum {
More information about the Scummvm-git-logs
mailing list