[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.67,1.68 input.cpp,1.53,1.54 interface.cpp,1.141,1.142 interface.h,1.75,1.76 saga.cpp,1.137,1.138

[Torbjörn Andersson]

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

Modified Files:
	animation.cpp input.cpp interface.cpp interface.h saga.cpp 
Log Message:
It should always be possible to interrupt the intro with Escape now. Most
of the job was already done, though. Only the final bit was missing.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- animation.cpp	5 Oct 2005 01:40:55 -0000	1.67
+++ animation.cpp	6 Oct 2005 15:56:06 -0000	1.68
@@ -86,9 +86,8 @@
 		_vm->_gfx->showCursor(false);
 		_vm->_interface->setStatusText("");
 		_vm->_interface->setSaveReminderState(0);
-
-		// TODO: Hide the inventory. Perhaps a new panel mode?
-
+		_vm->_interface->rememberMode();
+		_vm->_interface->setMode(kPanelCutaway);
 		_cutawayActive = true;
 	}
 
@@ -195,6 +194,7 @@
 			_cutawayAnimations[i] = NULL;
 		}
 
+		_vm->_interface->restoreMode();
 		_vm->_gfx->showCursor(true);
 	}
 }

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- input.cpp	28 Sep 2005 21:38:07 -0000	1.53
+++ input.cpp	6 Oct 2005 15:56:06 -0000	1.54
@@ -104,7 +104,6 @@
 			// Actual game keys
 			case 32: // space
 				_actor->abortSpeech();
-				_scene->cutawaySkip();
 				break;
 			case 19:  // pause
 			case 'z':

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- interface.cpp	4 Oct 2005 23:59:09 -0000	1.141
+++ interface.cpp	6 Oct 2005 15:56:06 -0000	1.142
@@ -341,8 +341,14 @@
 				if (!_disableAbortSpeeches)
 					_vm->_actor->abortAllSpeeches();
 			}
+			return true;
+		}
+		break;
+	case kPanelCutaway:
+		if (ascii == 27) { // Esc
+			if (!_disableAbortSpeeches)
+				_vm->_actor->abortAllSpeeches();
 			_vm->_scene->cutawaySkip();
-
 			return true;
 		}
 		break;

Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- interface.h	4 Oct 2005 23:38:19 -0000	1.75
+++ interface.h	6 Oct 2005 15:56:06 -0000	1.76
@@ -68,7 +68,8 @@
 	kPanelPlacard,
 	kPanelMap,
 	kPanelSceneSubstitute,
-	kPanelChapterSelection
+	kPanelChapterSelection,
+	kPanelCutaway
 //	kPanelInventory
 };
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- saga.cpp	5 Oct 2005 01:31:46 -0000	1.137
+++ saga.cpp	6 Oct 2005 15:56:06 -0000	1.138
@@ -327,6 +327,7 @@
 			} else if (!_scene->isInIntro()) {
 				if (_interface->getMode() == kPanelMain ||
 						 _interface->getMode() == kPanelConverse ||
+						 _interface->getMode() == kPanelCutaway ||
 						 _interface->getMode() == kPanelNull)
 					_actor->direct(msec);
 			}