[Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.57,1.58 interface.cpp,1.134,1.135 saga.cpp,1.128,1.129 scene.h,1.74,1.75

[Eugene Sandulenko]

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

Modified Files:
	gfx.cpp interface.cpp saga.cpp scene.h 
Log Message:
Fix bug #1258537 "ITE: Introduction text is black"


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- gfx.cpp	11 Aug 2005 19:11:15 -0000	1.57
+++ gfx.cpp	13 Aug 2005 19:41:11 -0000	1.58
@@ -26,6 +26,7 @@
 #include "saga/saga.h"
 #include "saga/gfx.h"
 #include "saga/interface.h"
+#include "saga/scene.h"
 
 #include "common/system.h"
 
@@ -175,7 +176,7 @@
 	}
 
 	// Make 256th color black. See bug #1256368
-	if (_vm->getFeatures() & GF_MAC_RESOURCES)
+	if (_vm->getFeatures() & GF_MAC_RESOURCES && !_vm->_scene->isInIntro())
 		memset(&_currentPal[255 * 4], 0, 4);
 
 	_system->setPalette(_currentPal, 0, PAL_ENTRIES);
@@ -238,7 +239,7 @@
 	}
 
 	// Make 256th color black. See bug #1256368
-	if (_vm->getFeatures() & GF_MAC_RESOURCES)
+	if (_vm->getFeatures() & GF_MAC_RESOURCES && !_vm->_scene->isInIntro())
 		memset(&_currentPal[255 * 4], 0, 4);
 
 	_system->setPalette(_currentPal, 0, PAL_ENTRIES);
@@ -312,7 +313,7 @@
 	}
 
 	// Make 256th color black. See bug #1256368
-	if (_vm->getFeatures() & GF_MAC_RESOURCES)
+	if (_vm->getFeatures() & GF_MAC_RESOURCES && !_vm->_scene->isInIntro())
 		memset(&_currentPal[255 * 4], 0, 4);
 
 	_system->setPalette(_currentPal, 0, PAL_ENTRIES);

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- interface.cpp	13 Aug 2005 01:05:59 -0000	1.134
+++ interface.cpp	13 Aug 2005 19:41:11 -0000	1.135
@@ -329,7 +329,7 @@
 	switch (_panelMode) {
 	case kPanelNull:
 		if (ascii == 27) { // Esc
-			if (_vm->_scene->isInDemo()) {
+			if (_vm->_scene->isInIntro()) {
 				_vm->_scene->skipScene();
 			} else {
 				_vm->_actor->abortAllSpeeches();
@@ -558,7 +558,7 @@
 
 	backBuffer = _vm->_gfx->getBackBuffer();
 
-	if (_vm->_scene->isInDemo() || _fadeMode == kFadeOut)
+	if (_vm->_scene->isInIntro() || _fadeMode == kFadeOut)
 		return;
 
 	// Disable this for IHNM for now, since that game uses the full screen
@@ -1258,7 +1258,7 @@
 	if (!_active && _panelMode == kPanelNull && (updateFlag & UPDATE_MOUSECLICK))
 		_vm->_actor->abortSpeech();
 
-	if (_vm->_scene->isInDemo() || _fadeMode == kFadeOut || !_active) {
+	if (_vm->_scene->isInIntro() || _fadeMode == kFadeOut || !_active) {
 		return;
 	}
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- saga.cpp	11 Aug 2005 15:28:08 -0000	1.128
+++ saga.cpp	13 Aug 2005 19:41:11 -0000	1.129
@@ -314,7 +314,7 @@
 			// Since Puzzle is actorless, we do it here
 			if (_puzzle->isActive()) {
 				_actor->handleSpeech(msec);
-			} else if (!_scene->isInDemo() && getGameType() == GType_ITE) {
+			} else if (!_scene->isInIntro() && getGameType() == GType_ITE) {
 				if (_interface->getMode() == kPanelMain ||
 						 _interface->getMode() == kPanelConverse ||
 						 _interface->getMode() == kPanelNull)

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- scene.h	10 Aug 2005 15:01:23 -0000	1.74
+++ scene.h	13 Aug 2005 19:41:11 -0000	1.75
@@ -226,7 +226,7 @@
 	void draw();
 	int getFlags() const { return _sceneDescription.flags; }
 	int getScriptModuleNumber() const { return _sceneDescription.scriptModuleNumber; }
-	bool isInDemo() { return !_inGame; }
+	bool isInIntro() { return !_inGame; }
 	const Rect& getSceneClip() const { return _sceneClip; }
 
 	void getBGMaskInfo(int &width, int &height, byte *&buffer, size_t &bufferLength);