removed ann's house music hack from scene.

svn-id: r44012

2 files changed, 13 insertions, 17 deletions

diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index 6b67d75336..82a15d849f 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -193,7 +193,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			Dialog::show(scene, 0x62dc);
 
 			SET_FLAG(0xDBDF, 1);
-			SET_FLAG(0xDB90, 5);
+			playMusic(5);
 		}
 		return true;
 
@@ -1254,7 +1254,10 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 	
 	case 0x593e://Enter annes house
 		playSound(89, 4);
+		playAnimation(980);
 		loadScene(23, 76, 199, 1);
+		if (CHECK_FLAG(0xDBEE, 1)) 
+			playMusic(7);
 		return true;
 		
 	case 0x5994:
@@ -1403,9 +1406,9 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 		}
 		return true;
 
-	case 0x5f73://Exit annes house
-		//Need to fully understand what this does, there is a compare in the asm
-		//I assume it is probably to do with the music
+	case 0x5f73: //exiting ann's house
+		if (CHECK_FLAG(0xDBEE, 1))
+			playMusic(6);
 		loadScene(21, 161, 165);
 
 		return true;
@@ -2407,7 +2410,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			displayMessage(0x4a6f);
 			inventory->clear();
 			inventory->add(29);
-			setMusic(10);
+			playMusic(10);
 		} else
 			displayMessage(0x4a29);
 		return true;
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp
index 1d61d18d51..eab6d62e6e 100644
--- a/engines/teenagent/scene.cpp
+++ b/engines/teenagent/scene.cpp
@@ -203,18 +203,11 @@ void Scene::init(int id, const Common::Point &pos) {
 		walkbox[i]->dump();
 	}
 	
-	if (id == 23 && res->dseg.get_byte(0xdbee) == 1) {
-		//talked to anne, lovers music
-		if (_engine->music->getId() != 7)
-			_engine->music->load(7);
-	} else {
-		//check music
-		int now_playing = _engine->music->getId();
-		
-		if (now_playing != res->dseg.get_byte(0xDB90)) 
-			_engine->music->load(res->dseg.get_byte(0xDB90));
-	}
+	//check music
+	int now_playing = _engine->music->getId();
 	
+	if (now_playing != res->dseg.get_byte(0xDB90)) 
+		_engine->music->load(res->dseg.get_byte(0xDB90));
 }
 
 void Scene::playAnimation(byte idx, uint id) {
@@ -345,7 +338,7 @@ bool Scene::render(OSystem * system) {
 	busy |= processEventQueue();
 	//if (!current_event.empty())
 	//	current_event.dump();
-    /*
+	/*
 	for (byte i = 0; i < walkboxes; ++i) {
 		Walkbox * w = walkbox[i];
 		w->rect.render(surface, 0xd0 + i);