[Scummvm-cvs-logs] SF.net SVN: scummvm:[39271] scummvm/trunk/engines/made

john_doe at users.sourceforge.net john_doe at users.sourceforge.net
Mon Mar 9 19:19:53 CET 2009


Revision: 39271
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39271&view=rev
Author:   john_doe
Date:     2009-03-09 18:19:53 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
- Applied patch #2668849 by sunmax

Modified Paths:
--------------
    scummvm/trunk/engines/made/screen.cpp
    scummvm/trunk/engines/made/screen.h
    scummvm/trunk/engines/made/screenfx.cpp
    scummvm/trunk/engines/made/screenfx.h

Modified: scummvm/trunk/engines/made/screen.cpp
===================================================================
--- scummvm/trunk/engines/made/screen.cpp	2009-03-09 18:03:46 UTC (rev 39270)
+++ scummvm/trunk/engines/made/screen.cpp	2009-03-09 18:19:53 UTC (rev 39271)
@@ -32,6 +32,10 @@
 
 Screen::Screen(MadeEngine *vm) : _vm(vm) {
 
+	_screenPalette = new byte[256 * 4];
+	_palette = new byte[768];
+	_newPalette = new byte[768];
+
 	_backgroundScreen = new Graphics::Surface();
 	_backgroundScreen->create(320, 200, 1);
 
@@ -90,6 +94,11 @@
 }
 
 Screen::~Screen() {
+
+	delete[] _screenPalette;
+	delete[] _palette;
+	delete[] _newPalette;
+
 	delete _backgroundScreen;
 	delete _workScreen;
 	if (_vm->getGameID() != GID_RTZ)

Modified: scummvm/trunk/engines/made/screen.h
===================================================================
--- scummvm/trunk/engines/made/screen.h	2009-03-09 18:03:46 UTC (rev 39270)
+++ scummvm/trunk/engines/made/screen.h	2009-03-09 18:19:53 UTC (rev 39271)
@@ -203,8 +203,8 @@
 	bool _screenLock;
 	bool _paletteLock;
 
-	byte _screenPalette[256 * 4];
-	byte _palette[768], _newPalette[768];
+	byte *_screenPalette;
+	byte *_palette, *_newPalette;
 	int _paletteColorCount, _oldPaletteColorCount;
 	bool _paletteInitialized, _needPalette;
 	int16 _textColor;

Modified: scummvm/trunk/engines/made/screenfx.cpp
===================================================================
--- scummvm/trunk/engines/made/screenfx.cpp	2009-03-09 18:03:46 UTC (rev 39270)
+++ scummvm/trunk/engines/made/screenfx.cpp	2009-03-09 18:19:53 UTC (rev 39271)
@@ -51,8 +51,15 @@
 	vfxY1 = 0;
 	vfxWidth = 0;
 	vfxHeight = 0;
+	
+	_fxPalette = new byte[768];
+	
 }
 
+ScreenEffects::~ScreenEffects() {
+	delete[] _fxPalette;
+}
+ 
 void ScreenEffects::run(int16 effectNum, Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
 
 	// TODO: Put effect functions into an array

Modified: scummvm/trunk/engines/made/screenfx.h
===================================================================
--- scummvm/trunk/engines/made/screenfx.h	2009-03-09 18:03:46 UTC (rev 39270)
+++ scummvm/trunk/engines/made/screenfx.h	2009-03-09 18:19:53 UTC (rev 39271)
@@ -40,11 +40,12 @@
 class ScreenEffects {
 public:
 	ScreenEffects(Screen *screen);
+	~ScreenEffects();
 	void run(int16 effectNum, Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount);
 	void flash(int count, byte *palette, int colorCount);
 private:
 	Screen *_screen;
-	byte _fxPalette[768];
+	byte *_fxPalette;
 	static const byte vfxOffsTable[64];
 	static const byte vfxOffsIndexTable[8];
 	const byte *vfxOffsTablePtr;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list