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

[wjpalenstijn at users.sourceforge.net]

Revision: 44640
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44640&view=rev
Author:   wjpalenstijn
Date:     2009-10-04 22:26:57 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
SCI: Fix cast, constness

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

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-04 22:15:19 UTC (rev 44639)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-04 22:26:57 UTC (rev 44640)
@@ -63,7 +63,7 @@
 	bool IsEGA = false;
 
 	_embeddedPal = false;
-	_EGAMapping = (byte *)&EGAMappingDefault;
+	_EGAMapping = EGAMappingDefault;
 	_loopCount = 0;
 
 	switch (_s->resMan->getViewType()) {

Modified: scummvm/trunk/engines/sci/gui/gui_view.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-04 22:15:19 UTC (rev 44639)
+++ scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-04 22:26:57 UTC (rev 44640)
@@ -77,7 +77,7 @@
 	sciViewLoopInfo *_loop;
 	bool _embeddedPal;
 	GUIPalette _palette;
-	byte *_EGAMapping; // simple translation map for all 16 colors
+	const byte *_EGAMapping; // simple translation map for all 16 colors
 };
 
 } // End of namespace Sci


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