[Scummvm-cvs-logs] SF.net SVN: scummvm:[49696] scummvm/trunk/engines/saga

sev at users.sourceforge.net sev at users.sourceforge.net
Tue Jun 15 12:16:13 CEST 2010


Revision: 49696
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49696&view=rev
Author:   sev
Date:     2010-06-15 10:16:13 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SAGA: Moved more code under ENABLE_IHNM

Modified Paths:
--------------
    scummvm/trunk/engines/saga/interface.cpp
    scummvm/trunk/engines/saga/scene.cpp
    scummvm/trunk/engines/saga/sfuncs.cpp
    scummvm/trunk/engines/saga/sfuncs_ihnm.cpp

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2010-06-15 10:15:51 UTC (rev 49695)
+++ scummvm/trunk/engines/saga/interface.cpp	2010-06-15 10:16:13 UTC (rev 49696)
@@ -544,8 +544,10 @@
 			return true;
 		}
 
+#ifdef ENABLE_IHNM
 		if (_vm->_scene->isNonInteractiveIHNMDemoPart())
 			_vm->_scene->showIHNMDemoSpecialScreen();
+#endif
 		break;
 	case kPanelCutaway:
 		if (keystate.keycode == Common::KEYCODE_ESCAPE) {
@@ -555,8 +557,10 @@
 			return true;
 		}
 
+#ifdef ENABLE_INHM
 		if (_vm->_scene->isNonInteractiveIHNMDemoPart())
 			_vm->_scene->showIHNMDemoSpecialScreen();
+#endif
 		break;
 	case kPanelVideo:
 		if (keystate.keycode == Common::KEYCODE_ESCAPE) {
@@ -570,8 +574,10 @@
 			return true;
 		}
 
+#ifdef ENABLE_IHNM
 		if (_vm->_scene->isNonInteractiveIHNMDemoPart())
 			_vm->_scene->showIHNMDemoSpecialScreen();
+#endif
 		break;
 	case kPanelOption:
 		// TODO: check input dialog keys
@@ -1866,8 +1872,10 @@
 		break;
 
 	case kPanelNull:
+#ifdef ENABLE_IHNM
 		if (_vm->_scene->isNonInteractiveIHNMDemoPart() && (updateFlag & UPDATE_MOUSECLICK))
 			_vm->_scene->showIHNMDemoSpecialScreen();
+#endif
 		break;
 	}
 

Modified: scummvm/trunk/engines/saga/scene.cpp
===================================================================
--- scummvm/trunk/engines/saga/scene.cpp	2010-06-15 10:15:51 UTC (rev 49695)
+++ scummvm/trunk/engines/saga/scene.cpp	2010-06-15 10:16:13 UTC (rev 49696)
@@ -1425,6 +1425,8 @@
 	q_event = _vm->_events->chain(q_event, &event);
 }
 
+#ifdef ENABLE_IHNM
+
 void Scene::showPsychicProfile(const char *text) {
 	int textHeight;
 	static PalEntry cur_pal[PAL_ENTRIES];
@@ -1531,4 +1533,6 @@
 	_vm->_scene->changeScene(150, 0, kTransitionFade);
 }
 
+#endif // IHNM
+
 } // End of namespace Saga

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2010-06-15 10:15:51 UTC (rev 49695)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2010-06-15 10:16:13 UTC (rev 49696)
@@ -1153,18 +1153,6 @@
 	_vm->_scene->clearPlacard();
 }
 
-void Script::sfPsychicProfile(SCRIPTFUNC_PARAMS) {
-	thread->wait(kWaitTypePlacard);
-
-	_vm->_scene->showPsychicProfile(thread->_strings->getString(thread->pop()));
-}
-
-void Script::sfPsychicProfileOff(SCRIPTFUNC_PARAMS) {
-	// This is called a while after the psychic profile is
-	// opened, to close it automatically
-	_vm->_scene->clearPsychicProfile();
-}
-
 // Script function #50 (0x32)
 void Script::sfSetProtagState(SCRIPTFUNC_PARAMS) {
 	_vm->_actor->setProtagState(thread->pop());

Modified: scummvm/trunk/engines/saga/sfuncs_ihnm.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs_ihnm.cpp	2010-06-15 10:15:51 UTC (rev 49695)
+++ scummvm/trunk/engines/saga/sfuncs_ihnm.cpp	2010-06-15 10:16:13 UTC (rev 49696)
@@ -440,6 +440,18 @@
 	_vm->_interface->disableAbortSpeeches(thread->pop() != 0);
 }
 
+void Script::sfPsychicProfile(SCRIPTFUNC_PARAMS) {
+	thread->wait(kWaitTypePlacard);
+
+	_vm->_scene->showPsychicProfile(thread->_strings->getString(thread->pop()));
+}
+
+void Script::sfPsychicProfileOff(SCRIPTFUNC_PARAMS) {
+	// This is called a while after the psychic profile is
+	// opened, to close it automatically
+	_vm->_scene->clearPsychicProfile();
+}
+
 } // End of namespace Saga
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list