aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-03-12 04:05:26 +0000
committerTravis Howell2005-03-12 04:05:26 +0000
commit8b484a2acfdc04da16d1739970efefd34d30c877 (patch)
tree43f958ee194c822b6e05cdad823a2d72a4c7f4b4 /scumm
parent3a7588c9833d976c3559463f69fdf14ab9a361df (diff)
downloadscummvm-rg350-8b484a2acfdc04da16d1739970efefd34d30c877.tar.gz
scummvm-rg350-8b484a2acfdc04da16d1739970efefd34d30c877.tar.bz2
scummvm-rg350-8b484a2acfdc04da16d1739970efefd34d30c877.zip
Missing pop
svn-id: r17086
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h2
-rw-r--r--scumm/script_v80he.cpp9
-rw-r--r--scumm/scumm.cpp1
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 -