[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.423,2.424 scumm.cpp,1.408,1.409

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13129/scumm

Modified Files:
	intern.h scumm.cpp 
Log Message:

Move hePalettes allocation to HE99.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.423
retrieving revision 2.424
diff -u -d -r2.423 -r2.424
--- intern.h	7 Apr 2005 10:43:50 -0000	2.423
+++ intern.h	7 Apr 2005 11:15:09 -0000	2.424
@@ -1093,6 +1093,8 @@
 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);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -d -r1.408 -r1.409
--- scumm.cpp	7 Apr 2005 10:54:35 -0000	1.408
+++ scumm.cpp	7 Apr 2005 11:15:10 -0000	1.409
@@ -1629,10 +1629,15 @@
 	_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));