[Scummvm-cvs-logs] CVS: scummvm/gob init.cpp,1.15,1.16

Sven Hesse drmccoy at users.sourceforge.net
Thu Jan 12 10:53:01 CET 2006


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

Modified Files:
	init.cpp 
Log Message:
Fixing bug #1402511 ("Invalid reads during startup")


Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/init.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- init.cpp	7 Jan 2006 22:28:54 -0000	1.15
+++ init.cpp	12 Jan 2006 18:51:56 -0000	1.16
@@ -82,7 +82,7 @@
 		_vm->_global->_colorCount = 256;
 
 	_vm->_global->_pPaletteDesc = &_vm->_global->_paletteStruct;
-	_vm->_global->_pPaletteDesc->vgaPal = _vm->_global->_vgaPalette;
+	_vm->_global->_pPaletteDesc->vgaPal = _vm->_draw->_vgaPalette;
 	_vm->_global->_pPaletteDesc->unused1 = _vm->_global->_unusedPalette1;
 	_vm->_global->_pPaletteDesc->unused2 = _vm->_global->_unusedPalette2;
 	_vm->_global->_pPrimarySurfDesc = &_vm->_global->_primarySurfDesc;





More information about the Scummvm-git-logs mailing list