[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.155,1.156 sfuncs.cpp,1.173,1.174

[Eugene Sandulenko]

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

Modified Files:
	interface.cpp sfuncs.cpp 
Log Message:
Fix portrait color. I just missed dependency from barometer.


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- interface.cpp	10 Oct 2005 17:23:28 -0000	1.155
+++ interface.cpp	11 Oct 2005 01:00:56 -0000	1.156
@@ -615,9 +615,9 @@
 			_vm->_gfx->setPaletteColor(kIHNMColorPortrait, 0xff, 0xff, 0xff);
 		else
 			_vm->_gfx->setPaletteColor(kIHNMColorPortrait,
-				_portraitBgColor.red,
-				_portraitBgColor.green,
-				_portraitBgColor.blue);
+				_vm->_spiritualBarometer * _portraitBgColor.red / 256,
+				_vm->_spiritualBarometer * _portraitBgColor.green / 256,
+				_vm->_spiritualBarometer * _portraitBgColor.blue / 256);
 	}
 
 	if (_panelMode == kPanelMain || _panelMode == kPanelConverse ||

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- sfuncs.cpp	9 Oct 2005 01:43:08 -0000	1.173
+++ sfuncs.cpp	11 Oct 2005 01:00:56 -0000	1.174
@@ -1848,7 +1848,7 @@
 	int chapter = _vm->_scene->currentChapterNumber();
 
 	_vm->_ethicsPoints[chapter] = ethics;
-	_vm->_spiritualBarometer = barometer;
+	_vm->_spiritualBarometer = ethics * 256 / barometer;
 }
 
 void Script::sfSetPortraitBgColor(SCRIPTFUNC_PARAMS) {