Fix Indy4 bootparam, some more Zak256 work, and a few minor things.

svn-id: r3887

1 files changed, 16 insertions, 1 deletions

diff --git a/script_v2.cpp b/script_v2.cpp
index 058dabd7c5..f675ff9d09 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -1224,7 +1224,15 @@ void Scumm::o6_setCameraAt() {
 }
 
 void Scumm::o6_loadRoom() {
-	int room = pop();
+	int room;
+	/* Begin: Autosave 
+	_saveLoadSlot = 0;
+	sprintf(_saveLoadName, "Autosave", _saveLoadSlot);
+	_saveLoadFlag = 1;
+	_saveLoadCompatible = false;
+	End: Autosave */
+
+	room = pop();
 	startScene(room, 0, 0);
 	_fullRedraw = 1;
 }
@@ -1381,6 +1389,13 @@ void Scumm::o6_loadRoomWithEgo() {
 	Actor *a;
 	int room,obj,x,y;
 
+	/* Begin: Autosave 
+	_saveLoadSlot = 0;
+	sprintf(_saveLoadName, "Autosave", _saveLoadSlot);
+	_saveLoadFlag = 1;
+	_saveLoadCompatible = false;
+	End: Autosave */
+
 	y = pop();
 	x = pop();