aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-04-07 11:15:10 +0000
committerTravis Howell2005-04-07 11:15:10 +0000
commit810861fdf593ddf0204cb7931eec15cd89983a5d (patch)
tree7f68bf031b2a166fded8ee43db9e6d3058efeb0f
parent638674645009ebd014ae99e8489dfe1d62e41741 (diff)
downloadscummvm-rg350-810861fdf593ddf0204cb7931eec15cd89983a5d.tar.gz
scummvm-rg350-810861fdf593ddf0204cb7931eec15cd89983a5d.tar.bz2
scummvm-rg350-810861fdf593ddf0204cb7931eec15cd89983a5d.zip
Move hePalettes allocation to HE99.
svn-id: r17434
-rw-r--r--scumm/intern.h2
-rw-r--r--scumm/scumm.cpp7
2 files changed, 8 insertions, 1 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 9971510e4d..47e37c8811 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -1093,6 +1093,8 @@ class ScummEngine_v99he : public ScummEngine_v90he {
public:
ScummEngine_v99he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v90he(detector, syst, gs, md5sum) {}
+ virtual void scummInit();
+
protected:
virtual void copyPalColor(int dst, int src);
virtual void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor);
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 5a3f6a4940..2a924cad5b 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1629,10 +1629,15 @@ void ScummEngine_v90he::scummInit() {
_hePaletteNum = 0;
spritesResetTables(0);
- _hePalettes = (uint8 *)malloc((_numPalettes + 1) * 1024);
memset(&_wizParams, 0, sizeof(_wizParams));
}
+void ScummEngine_v99he::scummInit() {
+ ScummEngine_v90he::scummInit();
+
+ _hePalettes = (uint8 *)malloc((_numPalettes + 1) * 1024);
+}
+
void ScummEngine::setupMusic(int midi) {
_midiDriver = MidiDriver::detectMusicDriver(midi);
_native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32));