[Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.14,1.15 items.cpp,1.56,1.57 simon.cpp,1.174,1.175

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv1546/simon

Modified Files:
	debug.cpp items.cpp simon.cpp 
Log Message:

Add a few Amiga games corrections and todos


Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- debug.cpp	6 Mar 2003 21:46:46 -0000	1.14
+++ debug.cpp	1 May 2003 07:55:55 -0000	1.15
@@ -39,7 +39,7 @@
 		return NULL;
 	if (_game == GAME_SIMON1DOS || _game == GAME_SIMON1DEMO) {
 	st = s = simon1dos_opcode_name_table[opcode];
-	} else if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
+	} else if (_game == GAME_SIMON1CD32 || _game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
 	st = s = simon1talkie_opcode_name_table[opcode];
 	} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
 	st = s = simon2talkie_opcode_name_table[opcode];

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- items.cpp	23 Mar 2003 12:40:40 -0000	1.56
+++ items.cpp	1 May 2003 07:55:55 -0000	1.57
@@ -1228,7 +1228,7 @@
 		tv = getThreeValues(a);
 	}
 
-	if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
+	if (_game == GAME_SIMON1CD32 || _game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
 		if (child != NULL && child->avail_props & 0x200) {
 			uint offs = getOffsetOfChild2Param(child, 0x200);
 			if (!_subtitles)

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- simon.cpp	29 Apr 2003 04:44:00 -0000	1.174
+++ simon.cpp	1 May 2003 07:55:55 -0000	1.175
@@ -1430,6 +1430,7 @@
 void SimonState::loadIconFile() {
 	File in;
 	if (_game & GF_AMIGAS)
+		/* TODO Add support for decruncher */
 		in.open("icon.pkd", _gameDataPath);
 	else
 		in.open("ICON.DAT", _gameDataPath);
@@ -4419,6 +4420,7 @@
 		if (_game == GAME_SIMON1CD32) {
 			sprintf(buf, "0%d.out", vga_id); 
 		} else if (_game == GAME_SIMON1AMIGA) {
+			/* TODO Add support for decruncher */
 			sprintf(buf, "0%d.pkd", vga_id); 
 		} else {
 			sprintf(buf, "0%d.VGA", vga_id); 
@@ -4452,6 +4454,7 @@
 		if (_game == GAME_SIMON1CD32) {
 			sprintf(buf, "%.3d%d.out", id >> 1, (id & 1) + 1);
 		} else if (_game == GAME_SIMON1AMIGA) {
+			/* TODO Add support for decruncher */
 			sprintf(buf, "%.3d%d.pkd", id >> 1, (id & 1) + 1);
 		} else {
 			sprintf(buf, "%.3d%d.VGA", id >> 1, (id & 1) + 1);
@@ -4734,7 +4737,7 @@
 		_subtitles = true;
 
 	midi._midi_sfx_toggle = false;
-	
+
 	while (1) {
 		hitarea_stuff();
 		handle_verb_clicked(_verb_hitarea);
@@ -5054,28 +5057,37 @@
 		_vc70_var1 = 0xFFFF;
 		_vc72_var3 = 0xFFFF;
 		_midi_unk2 = 0xFFFF;
-	} else if (!(_game & GF_DEMO) && !(_game & GF_AMIGAS)){ // Simon 1 music
-		midi.shutdown();
-		if (_game & GF_WIN) {	
-			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
-			midi.read_all_songs(_game_file, music);
-		} else if (_game & GF_TALKIE) {
-			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
-			midi.read_all_songs_old(_game_file, music);
+	} else { // Simon 1 music
+		if (_game & GF_AMIGAS) {
+			if (_game != GAME_SIMON1CD32) {
+				/* TODO Add support for decruncher */
+			}
+			/* TODO Add Protracker support for simon1amiga/cd32 */
+		} else if (_game & GF_DEMO) {
+			/* TODO Add music support for simon1demo */
 		} else {
-			char buf[50];
-			File *f = new File();
-			sprintf(buf, "MOD%d.MUS", music);
-			f->open(buf, _gameDataPath);
-			if (f->isOpen() == false) {
-				warning("Can't load music from '%s'", buf);
-				return;
+			midi.shutdown();
+			if (_game & GF_WIN) {	
+				_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
+				midi.read_all_songs(_game_file, music);
+			} else if (_game & GF_TALKIE) {
+				_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
+				midi.read_all_songs_old(_game_file, music);
+			} else {
+				char buf[50];
+				File *f = new File();
+				sprintf(buf, "MOD%d.MUS", music);
+				f->open(buf, _gameDataPath);
+				if (f->isOpen() == false) {
+					warning("Can't load music from '%s'", buf);
+					return;
+				}
+				midi.read_all_songs_old(f, music);
+				delete f;
 			}
-			midi.read_all_songs_old(f, music);
-			delete f;
+			midi.initialize();
+			midi.play();
 		}
-		midi.initialize();
-		midi.play();
 	}
 }