From 8b484a2acfdc04da16d1739970efefd34d30c877 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 12 Mar 2005 04:05:26 +0000
Subject: Missing pop

svn-id: r17086
---
 scumm/intern.h         | 2 +-
 scumm/script_v80he.cpp | 9 ++++++---
 scumm/scumm.cpp        | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scumm/intern.h b/scumm/intern.h
index 4ef80496be..f48309c5b4 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -647,7 +647,7 @@ protected:
 	Win32ResExtractor *_win32ResExtractor;
 	MacResExtractor *_macResExtractor;
 
-	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndFlags;
+	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndFlags, _heSBNGId;
 
 public:
 	ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]);
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 209bd21a57..904be46a8e 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -380,17 +380,20 @@ void ScummEngine_v80he::o80_loadSBNG() {
 
 	switch (subOp) {
 	case 27:
-		pop();
 		//loadSBNG(_heSBNGId, pop();
+		pop();
 		break;
 	case 217:
 		//loadSBNG(_heSBNGId, -1);
 		break;
 	case 232:
-		//_heSBNGId = pop();
+		_heSBNGId = pop();
+		break;
+	case 255:
+		// dummy case
 		break;
 	default:
-		warning("o80_loadSBNG: default case %d", subOp);
+		error("o80_loadSBNG: default case %d", subOp);
 	}
 	debug(1,"o80_loadSBNG stub (%d)",subOp);
 }
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index ff270a6760..f53e05daa0 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1175,6 +1175,7 @@ ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, cons
 	_heSndChannel = 0;
 	_heSndFlags = 0;
 	_heSndSoundFreq = 0;
+	_heSBNGId = 0;
 }
 
 #pragma mark -
-- 
cgit v1.2.3