[Scummvm-cvs-logs] SF.net SVN: scummvm:[45544] scummvm/trunk/engines/sci/gui

[thebluegr at users.sourceforge.net]

Revision: 45544
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45544&view=rev
Author:   thebluegr
Date:     2009-10-30 18:32:55 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Fixed a crash in the old graphics code from commit #45542

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.h
    scummvm/trunk/engines/sci/gui32/gui32.cpp

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-30 18:01:27 UTC (rev 45543)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-30 18:32:55 UTC (rev 45544)
@@ -144,13 +144,13 @@
 	EngineState *_s;
 	SciGuiScreen *_screen;
 	SciGuiPalette *_palette;
+	SciGuiGfx *_gfx;
 
 private:
 	virtual void initPriorityBands();
 	virtual void animateShowPic();
 	virtual void addToPicSetPicNotValid();
 
-	SciGuiGfx *_gfx;
 	SciGuiWindowMgr *_windowMgr;
 	SciGuiAnimate *_animate;
 	SciGuiControls *_controls;

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-30 18:01:27 UTC (rev 45543)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-30 18:32:55 UTC (rev 45544)
@@ -40,6 +40,7 @@
 #include "sci/gui32/gui32.h"
 #include "sci/gui/gui_animate.h"
 #include "sci/gui/gui_cursor.h"
+#include "sci/gui/gui_gfx.h"
 
 // This is the real width of a text with a specified width of 0
 #define MAX_TEXT_WIDTH_MAGIC_VALUE 192
@@ -380,6 +381,7 @@
 	_screen = screen;
 	_palette = palette;
 	_cursor = cursor;
+	_gfx = new SciGuiGfx(_s, _screen, _palette);
 }
 
 SciGui32::~SciGui32() {


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