From c6f7c504836d40823e288d3ec8284e78f9119fd2 Mon Sep 17 00:00:00 2001
From: Jamieson Christian <jamieson630@users.sourceforge.net>
Date: Thu, 12 Jun 2003 19:06:52 +0000
Subject: [PATCH] Removed S&M Bumpusville hack made unnecessary by another fix
 (presumably the BOT Diner fix).

svn-id: r8453
---
 scumm/script_v6.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 21434048321..7ee4eb09d95 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2047,17 +2047,6 @@ void Scumm_v6::o6_wait() {
 			break;
 		return;
 	case 169:
-		// HACK: For Conroy Bumpus' song in Sam & Max.
-		// During the song three calls to o6_wait() appear,
-		// but because of the way in which the actor talk is done
-		// and the fact that the song extends beyond the span
-		// of each individual line, no end-of-talk is ever
-		// detected and the script hangs on o6_wait().
-		if (_gameId == GID_SAMNMAX && vm.slot[_currentScript].number == 99 && _sound->isSoundRunning (64)) {
-			debug (2, "Sam & Max hack: Bypassing o6_wait() during Conroy's song.");
-			return;
-		}
-
 		if (VAR(VAR_HAVE_MSG))
 			break;
 		return;