[Scummvm-cvs-logs] SF.net SVN: scummvm: [28730] scummvm/trunk/engines/saga/sfuncs.cpp

[thebluegr at users.sourceforge.net]

Revision: 28730
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28730&view=rev
Author:   thebluegr
Date:     2007-08-25 11:24:32 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
The palette is set correctly now when chapter points change and a cutaway is up

Modified Paths:
--------------
    scummvm/trunk/engines/saga/sfuncs.cpp

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-25 17:20:58 UTC (rev 28729)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-25 18:24:32 UTC (rev 28730)
@@ -1871,6 +1871,7 @@
 	int16 ethics = thread->pop();
 	int16 barometer = thread->pop();
 	int chapter = _vm->_scene->currentChapterNumber();
+	static PalEntry cur_pal[PAL_ENTRIES];
 
 	_vm->_ethicsPoints[chapter] = ethics;
 	_vm->_spiritualBarometer = ethics * 256 / barometer;
@@ -1884,9 +1885,8 @@
 			_vm->_spiritualBarometer * _vm->_interface->_portraitBgColor.green / 256,
 			_vm->_spiritualBarometer * _vm->_interface->_portraitBgColor.blue / 256);
 
-	PalEntry *palPointer;
-	_vm->_scene->getBGPal(palPointer);
-	_vm->_gfx->setPalette(palPointer);
+	_vm->_gfx->getCurrentPal(cur_pal);
+	_vm->_gfx->setPalette(cur_pal);
 }
 
 void Script::sfSetPortraitBgColor(SCRIPTFUNC_PARAMS) {


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