[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.103,1.104 interface.cpp,1.144,1.145 saga.cpp,1.139,1.140 scene.cpp,1.151,1.152 scene.h,1.80,1.81 sprite.cpp,1.67,1.68

[Eugene Sandulenko]

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

Modified Files:
	game.cpp interface.cpp saga.cpp scene.cpp scene.h sprite.cpp 
Log Message:
Now most artefacts are gone and we're in proper panel mode when running
character selection.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- game.cpp	7 Oct 2005 05:31:13 -0000	1.103
+++ game.cpp	8 Oct 2005 16:25:17 -0000	1.104
@@ -567,7 +567,7 @@
 	640, 480,	// logical width&height
 
 	0,			// scene path y offset
-	618,		// scene height
+	304,		// scene height
 
 	0,			// status x offset
 	304,		// status y offset

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- interface.cpp	8 Oct 2005 15:20:11 -0000	1.144
+++ interface.cpp	8 Oct 2005 16:25:18 -0000	1.145
@@ -257,7 +257,8 @@
 }
 
 void Interface::setMode(int mode) {
-	debug(5, "Interface::setMode %i", mode);
+	debug(0, "Interface::setMode %i", mode);
+
 	if (mode == kPanelMain) {
 		_inMainMode = true;
 		_saveReminderState = 1; //TODO: blinking timeout

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- saga.cpp	8 Oct 2005 15:35:07 -0000	1.139
+++ saga.cpp	8 Oct 2005 16:25:18 -0000	1.140
@@ -326,9 +326,10 @@
 				_actor->handleSpeech(msec);
 			} else if (!_scene->isInIntro()) {
 				if (_interface->getMode() == kPanelMain ||
-						 _interface->getMode() == kPanelConverse ||
-						 _interface->getMode() == kPanelCutaway ||
-						 _interface->getMode() == kPanelNull)
+						_interface->getMode() == kPanelConverse ||
+						_interface->getMode() == kPanelCutaway ||
+						_interface->getMode() == kPanelNull ||
+						_interface->getMode() == kPanelChapterSelection)
 					_actor->direct(msec);
 			}
 

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- scene.cpp	8 Oct 2005 15:20:11 -0000	1.151
+++ scene.cpp	8 Oct 2005 16:25:18 -0000	1.152
@@ -618,6 +618,8 @@
 		else
 			_vm->_interface->setMode(kPanelMain);
 
+		_inGame = true;
+
 		//_vm->_script->setVerb(kVerbIHNMWalkTo); uncomment then panel will be done
 
 		if (loadSceneParams->sceneDescriptor == -2) {
@@ -800,7 +802,7 @@
 	}
 
 	if (loadSceneParams->sceneProc == NULL) {
-		if (!_inGame) {
+		if (!_inGame && _vm->getGameType() == GType_ITE) {
 			_inGame = true;
 			_vm->_interface->setMode(kPanelMain);
 		}

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- scene.h	8 Oct 2005 15:20:11 -0000	1.80
+++ scene.h	8 Oct 2005 16:25:18 -0000	1.81
@@ -277,7 +277,7 @@
 
 	int getHeight() const {
 		if (_vm->_interface->getMode() == kPanelChapterSelection)
-			return _vm->_gameDisplayInfo.logicalWidth;
+			return _vm->_gameDisplayInfo.logicalHeight;
 		else
 			return _vm->_gameDisplayInfo.sceneHeight;
 	}

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- sprite.cpp	8 Oct 2005 15:20:11 -0000	1.67
+++ sprite.cpp	8 Oct 2005 16:25:18 -0000	1.68
@@ -118,7 +118,7 @@
 			spriteInfo->height = readS2.readUint16();
 
 			if (spriteInfo->width > 100) { // FIXME: HACK
-				warning("Width is too big: (%d x %d)", spriteInfo->width, spriteInfo->height);
+				warning("Sprite width is too big: (%d x %d)", spriteInfo->width, spriteInfo->height);
 				spriteInfo->width = spriteInfo->height = 0;
 			}
 			spriteDataPointer = spritePointer + readS2.pos();