[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.4,1.5 simon.cpp,1.38,1.39 simon.h,1.7,1.8

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv9904

Modified Files:
	items.cpp simon.cpp simon.h 
Log Message:
hopeyfully this fixes simon2dos

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- items.cpp	30 Oct 2002 23:52:19 -0000	1.4
+++ items.cpp	31 Oct 2002 01:55:11 -0000	1.5
@@ -1322,7 +1322,7 @@
 
 			talk_with_text(a, b, s, tv->a, tv->b, tv->c);
 		}
-	} else if (_game == GAME_SIMON2WIN || _game == GAME_SIMON2DOS) {
+	} else if (_game & GAME_SIMON2) {
 		uint a = getVarOrByte();
 		uint b = getVarOrByte();
 		Child2 *child = (Child2 *)findChildOfType(getNextItemPtr(), 2);

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- simon.cpp	31 Oct 2002 01:27:05 -0000	1.38
+++ simon.cpp	31 Oct 2002 01:55:11 -0000	1.39
@@ -4941,10 +4941,13 @@
 	
 		midi.initialize();
 		midi.play();
-	} else {
+	} else if (!(_game & GAME_SIMON2)){
 		midi.shutdown();
 
-		if (_game == GAME_SIMON1DOS) {
+		if (_game & GAME_WIN) {
+			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
+			midi.read_all_songs_old(_game_file);
+		} else {
 			char buf[50];
 			File *f = new File();
 			sprintf(buf, "MOD%d.MUS", music);
@@ -4955,9 +4958,6 @@
 			}
 			midi.read_all_songs_old(f);
 			delete f;
-		} else if (_game == GAME_SIMON1WIN) {
-			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
-			midi.read_all_songs_old(_game_file);
 		}
 
 		midi.initialize();

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- simon.h	30 Oct 2002 23:52:19 -0000	1.7
+++ simon.h	31 Oct 2002 01:55:11 -0000	1.8
@@ -116,9 +116,9 @@
 		GAME_WIN = 2,
 
 		GAME_SIMON1DOS = 0,
-		GAME_SIMON1WIN = 2,
-		GAME_SIMON2DOS = 1,
-		GAME_SIMON2WIN = 3,
+		GAME_SIMON1WIN = GAME_WIN,
+		GAME_SIMON2DOS = GAME_SIMON2,
+		GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN,
 		GAME_SIMON1DEMO = 4,
 	};