From d7123f49085244405b059dcdd24de43495cafcbc Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 31 Oct 2002 01:55:11 +0000
Subject: hopeyfully this fixes simon2dos

svn-id: r5361
---
 simon/items.cpp |  2 +-
 simon/simon.cpp | 10 +++++-----
 simon/simon.h   |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'simon')

diff --git a/simon/items.cpp b/simon/items.cpp
index d173032d85..cf044e2991 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1322,7 +1322,7 @@ void SimonState::o_177()
 
 			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);
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 529e5a2c2a..7feb51c21c 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -4941,10 +4941,13 @@ void SimonState::playMusic(uint music)
 	
 		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 @@ void SimonState::playMusic(uint music)
 			}
 			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();
diff --git a/simon/simon.h b/simon/simon.h
index 9d6d367826..5d808dec10 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -116,9 +116,9 @@ public:
 		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,
 	};
 
-- 
cgit v1.2.3