[Scummvm-cvs-logs] SF.net SVN: scummvm:[43743] scummvm/trunk/engines/cine

[lordhoto at users.sourceforge.net]

Revision: 43743
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43743&view=rev
Author:   lordhoto
Date:     2009-08-25 23:11:17 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Fix for bugs #2843081 "FW: Assert starting demo (regression)" and #2843080 "OS: Assert starting demo (regression)".

Modified Paths:
--------------
    scummvm/trunk/engines/cine/cine.cpp
    scummvm/trunk/engines/cine/gfx.cpp
    scummvm/trunk/engines/cine/gfx.h

Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp	2009-08-25 23:02:57 UTC (rev 43742)
+++ scummvm/trunk/engines/cine/cine.cpp	2009-08-25 23:11:17 UTC (rev 43743)
@@ -144,6 +144,8 @@
 		renderer = new FWRenderer;
 	}
 
+	renderer->initialize();
+
 	collisionPage = new byte[320 * 200];
 
 	// Clear part buffer as there's nothing loaded into it yet.

Modified: scummvm/trunk/engines/cine/gfx.cpp
===================================================================
--- scummvm/trunk/engines/cine/gfx.cpp	2009-08-25 23:02:57 UTC (rev 43742)
+++ scummvm/trunk/engines/cine/gfx.cpp	2009-08-25 23:11:17 UTC (rev 43743)
@@ -107,6 +107,11 @@
 	delete[] _backBuffer;
 }
 
+bool FWRenderer::initialize() {
+	_activePal = Palette(kLowPalFormat, kLowPalNumColors);
+	return true;
+}
+
 /* \brief Reset renderer state
  */
 void FWRenderer::clear() {
@@ -888,6 +893,11 @@
 	}
 }
 
+bool OSRenderer::initialize() {
+	_activePal = Palette(kHighPalFormat, kHighPalNumColors);
+	return true;
+}
+
 /*! \brief Reset Operation Stealth renderer state
  */
 void OSRenderer::clear() {

Modified: scummvm/trunk/engines/cine/gfx.h
===================================================================
--- scummvm/trunk/engines/cine/gfx.h	2009-08-25 23:02:57 UTC (rev 43742)
+++ scummvm/trunk/engines/cine/gfx.h	2009-08-25 23:11:17 UTC (rev 43743)
@@ -109,6 +109,8 @@
 	FWRenderer();
 	virtual ~FWRenderer();
 
+	virtual bool initialize();
+
 	/*! \brief Test if renderer is ready to draw */
 	virtual bool ready() { return _background != NULL; }
 
@@ -167,6 +169,8 @@
 	OSRenderer();
 	~OSRenderer();
 
+	bool initialize();
+
 	/*! \brief Test if renderer is ready to draw */
 	bool ready() { return _bgTable[_currentBg].bg != NULL; }
 


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