[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.123,1.124 resnames.h,1.33,1.34

[Eugene Sandulenko]

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

Modified Files:
	saga.cpp resnames.h 
Log Message:
Simulate bootparams.


Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- saga.cpp	30 Jul 2005 14:41:24 -0000	1.123
+++ saga.cpp	4 Aug 2005 10:48:54 -0000	1.124
@@ -298,9 +298,11 @@
 
 	if (ConfMan.hasKey("start_scene")) {
 		_scene->changeScene(ConfMan.getInt("start_scene"), 0, kTransitionNoFade);
-	}
-	else
-	if (ConfMan.hasKey("save_slot")) {
+	} else if (ConfMan.hasKey("boot_param")) {
+		if (getGameType() == GType_ITE)
+			_interface->addToInventory(_actor->objIndexToId(ITE_MAGIC_HAT));
+		_scene->changeScene(ConfMan.getInt("boot_param"), 0, kTransitionNoFade);
+	} else if (ConfMan.hasKey("save_slot")) {
 		// First scene sets up palette
 		_scene->changeScene(getStartSceneNumber(), 0, kTransitionNoFade);
 		_events->handleEvents(0); // Process immediate events

Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- resnames.h	30 Jul 2005 14:37:06 -0000	1.33
+++ resnames.h	4 Aug 2005 10:48:54 -0000	1.34
@@ -42,6 +42,7 @@
 
 //obj names
 #define ITE_OBJ_MAP 14
+#define ITE_MAGIC_HAT 0
 
 //actor names
 #define ITE_ACTOR_PUZZLE 176