[Scummvm-cvs-logs] CVS: scummvm/saga ihnm_introproc.cpp,1.55,1.56 interface.cpp,1.142,1.143 interface.h,1.76,1.77

[Torbjörn Andersson]

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

Modified Files:
	ihnm_introproc.cpp interface.cpp interface.h 
Log Message:
Added a "video" panel mode. From what I understand, the beginning of the
IHNM intro should use this, so now it does.


Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ihnm_introproc.cpp	1 Oct 2005 11:09:49 -0000	1.55
+++ ihnm_introproc.cpp	7 Oct 2005 15:36:27 -0000	1.56
@@ -28,6 +28,7 @@
 
 #include "saga/animation.h"
 #include "saga/events.h"
+#include "saga/interface.h"
 #include "saga/sndres.h"
 #include "saga/music.h"
 
@@ -91,6 +92,11 @@
 
 	LoadSceneParams firstScene;
 
+	// The original used the "play video" mechanism for the first part of
+	// the intro. We just use that panel mode.
+
+	_vm->_interface->setMode(kPanelVideo);
+
 	n_introscenes = ARRAYSIZE(IHNM_IntroList);
 
 	for (i = 0; i < n_introscenes; i++) {

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- interface.cpp	6 Oct 2005 15:56:06 -0000	1.142
+++ interface.cpp	7 Oct 2005 15:36:28 -0000	1.143
@@ -352,6 +352,17 @@
 			return true;
 		}
 		break;
+	case kPanelVideo:
+		if (ascii == 27) { // Esc
+			if (_vm->_scene->isInIntro()) {
+				_vm->_scene->skipScene();
+			} else {
+				if (!_disableAbortSpeeches)
+					_vm->_actor->abortAllSpeeches();
+			}
+			_vm->_scene->cutawaySkip();
+		}
+		break;
 	case kPanelOption:
 		// TODO: check input dialog keys
 		if (ascii == 27 || ascii == 13) { // Esc or Enter

Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- interface.h	6 Oct 2005 15:56:06 -0000	1.76
+++ interface.h	7 Oct 2005 15:36:28 -0000	1.77
@@ -69,7 +69,8 @@
 	kPanelMap,
 	kPanelSceneSubstitute,
 	kPanelChapterSelection,
-	kPanelCutaway
+	kPanelCutaway,
+	kPanelVideo
 //	kPanelInventory
 };