Implemented (quick-)save/load support for kyra3.

svn-id: r31747

4 files changed, 272 insertions, 5 deletions

diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp
index cd624b27d8..c162209b5e 100644
--- a/engines/kyra/kyra_v3.cpp
+++ b/engines/kyra/kyra_v3.cpp
@@ -1004,7 +1004,7 @@ void KyraEngine_v3::runLoop() {
 		if (_system->getMillis() >= _nextIdleAnim)
 			showIdleAnim();
 
-		int inputFlag = checkInput(_mainButtonList);
+		int inputFlag = checkInput(_mainButtonList, true);
 		removeInputTop();
 
 		update();
@@ -1368,7 +1368,7 @@ int KyraEngine_v3::checkInput(Button *buttonList, bool mainLoop) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode >= '1' && event.kbd.keycode <= '9' &&
 					(event.kbd.flags == Common::KBD_CTRL || event.kbd.flags == Common::KBD_ALT) && mainLoop) {
-				/*const char *saveLoadSlot = getSavegameFilename(9 - (event.kbd.keycode - '0') + 990);
+				const char *saveLoadSlot = getSavegameFilename(9 - (event.kbd.keycode - '0') + 990);
 
 				if (event.kbd.flags == Common::KBD_CTRL) {
 					loadGame(saveLoadSlot);
@@ -1378,7 +1378,7 @@ int KyraEngine_v3::checkInput(Button *buttonList, bool mainLoop) {
 					char savegameName[14];
 					sprintf(savegameName, "Quicksave %d", event.kbd.keycode - '0');
 					saveGame(saveLoadSlot, savegameName);
-				}*/
+				}
 			} else if (event.kbd.flags == Common::KBD_CTRL) {
 				if (event.kbd.keycode == 'd')
 					_debugger->attach();
diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h
index f4a8ed39dd..58fbbdace6 100644
--- a/engines/kyra/kyra_v3.h
+++ b/engines/kyra/kyra_v3.h
@@ -502,7 +502,7 @@ private:
 		uint8 facing;
 		uint16 animFrame;
 		//uint8 unk8, unk9;
-		uint32 walkspeed;
+		byte walkspeed;
 		uint16 inventory[10];
 		int16 x1, y1;
 		int16 x2, y2;
@@ -579,7 +579,7 @@ private:
 
 	void malcolmSceneStartupChat();
 
-	bool _newSceneDlgState[40];
+	byte _newSceneDlgState[40];
 	int8 _conversationState[30][30];
 	bool _chatAltFlag;
 	void setDlgIndex(uint16 index);
@@ -688,6 +688,10 @@ private:
 	bool updateScore(int scoreId, int strId);
 	void scoreIncrease(int count, const char *str);
 
+	// save/load
+	void saveGame(const char *fileName, const char *saveName);
+	void loadGame(const char *fileName);
+
 	// opcodes
 	int o3_getMalcolmShapes(ScriptState *script);
 	int o3_setCharacterPos(ScriptState *script);
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index bfb0e057fe..d53479b133 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -21,6 +21,7 @@ MODULE_OBJS := \
 	saveload.o \
 	saveload_v1.o \
 	saveload_v2.o \
+	saveload_v3.o \
 	scene.o \
 	scene_v1.o \
 	scene_v2.o \
diff --git a/engines/kyra/saveload_v3.cpp b/engines/kyra/saveload_v3.cpp
new file mode 100644
index 0000000000..09d7d244e0
--- /dev/null
+++ b/engines/kyra/saveload_v3.cpp
@@ -0,0 +1,262 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/endian.h"
+#include "common/savefile.h"
+#include "common/system.h"
+
+#include "kyra/kyra_v3.h"
+#include "kyra/timer.h"
+
+namespace Kyra {
+
+void KyraEngine_v3::saveGame(const char *fileName, const char *saveName) {
+	debugC(9, kDebugLevelMain, "KyraEngine_v3::saveGame('%s', '%s')", fileName, saveName);
+
+	Common::OutSaveFile *out = openSaveForWriting(fileName, saveName);
+	if (!out) {
+		warning("Can't open file '%s', game not loadable", fileName);
+		return;
+	}
+
+	_timer->saveDataToFile(*out);
+
+	out->writeUint32BE(sizeof(_flagsTable));
+	out->write(_flagsTable, sizeof(_flagsTable));
+
+	out->writeSint16BE(_curMusicTrack);
+	out->writeByte(_curChapter);
+	out->writeByte(_malcolmShapes);
+	//XXX
+	out->writeSint16BE(_score);
+	out->writeSint16BE(_scoreMax);
+	out->writeByte(_malcolmsMood);
+	out->write(_conversationState, sizeof(_conversationState));
+	out->write(_newSceneDlgState, sizeof(_newSceneDlgState));
+	for (int i = 0; i < 100; ++i)
+		out->writeUint16BE(_hiddenItems[i]);
+	out->write(_scoreFlagTable, sizeof(_scoreFlagTable));
+
+	out->writeUint16BE(_mainCharacter.sceneId);
+	out->writeUint16BE(_mainCharacter.dlgIndex);
+	out->writeByte(_mainCharacter.height);
+	out->writeByte(_mainCharacter.facing);
+	out->writeUint16BE(_mainCharacter.animFrame);
+	out->writeByte(_mainCharacter.walkspeed);
+	for (int i = 0; i < 10; ++i)
+		out->writeUint16BE(_mainCharacter.inventory[i]);
+	out->writeSint16BE(_mainCharacter.x1);
+	out->writeSint16BE(_mainCharacter.y1);
+	out->writeSint16BE(_mainCharacter.x2);
+	out->writeSint16BE(_mainCharacter.y2);
+	out->writeSint16BE(_mainCharacter.x3);
+	out->writeSint16BE(_mainCharacter.y3);
+
+	for (int i = 0; i < 50; ++i) {
+		out->writeUint16BE(_itemList[i].id);
+		out->writeUint16BE(_itemList[i].sceneId);
+		out->writeSint16BE(_itemList[i].x);
+		out->writeSint16BE(_itemList[i].y);
+		out->writeUint16BE(_itemList[i].unk8);
+	}
+
+	for (int i = 0; i < 88; ++i) {
+		out->write(_talkObjectList[i].filename, 13);
+		out->writeByte(_talkObjectList[i].sceneAnim);
+		out->writeByte(_talkObjectList[i].sceneScript);
+		out->writeSint16BE(_talkObjectList[i].x);
+		out->writeSint16BE(_talkObjectList[i].y);
+		out->writeByte(_talkObjectList[i].color);
+	}
+
+	for (int i = 0; i < 98; ++i) {
+		out->write(_sceneList[i].filename1, 10);
+		out->write(_sceneList[i].filename2, 10);
+		out->writeUint16BE(_sceneList[i].exit1);
+		out->writeUint16BE(_sceneList[i].exit2);
+		out->writeUint16BE(_sceneList[i].exit3);
+		out->writeUint16BE(_sceneList[i].exit4);
+		out->writeByte(_sceneList[i].flags);
+		out->writeByte(_sceneList[i].sound);
+	}
+
+	out->writeSint16BE(_itemInHand);
+	out->writeUint16BE(_sceneExit1);
+	out->writeUint16BE(_sceneExit2);
+	out->writeUint16BE(_sceneExit3);
+	out->writeUint16BE(_sceneExit4);
+
+	out->finalize();
+
+	// check for errors
+	if (out->ioFailed())
+		warning("Can't write file '%s'. (Disk full?)", fileName);
+	else
+		debugC(1, kDebugLevelMain, "Saved game '%s.'", saveName);
+
+	delete out;
+}
+
+void KyraEngine_v3::loadGame(const char *fileName) {
+	debugC(9, kDebugLevelMain, "KyraEngine_v3::loadGame('%s')", fileName);
+
+	SaveHeader header;
+	Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
+	if (!saveFile) {
+		showMessageFromCCode(17, 0xB3, 0);
+		playSoundEffect(0x0D, 0xC8);
+		return;
+	}
+
+	if (_inventoryState) {
+		updateCharacterAnim(0);
+		restorePage3();
+		drawAnimObjects();
+		_inventoryState = true;
+		refreshAnimObjects(0);
+		hideInventory();
+	}
+
+	_deathHandler = -1;
+	if (!_unkSceneScreenFlag1)
+		_curMusicTrack = -1;
+
+	int curShapes = _malcolmShapes;
+
+	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, true);
+
+	_screen->hideMouse();
+
+	_timer->loadDataFromFile(in, header.version);
+
+	uint32 flagsSize = in.readUint32BE();
+	assert(flagsSize <= sizeof(_flagsTable));
+	in.read(_flagsTable, flagsSize);
+
+	// usually we have to save the flag set by opcode 10 here
+	_curMusicTrack = in.readSint16();
+	_curChapter = in.readByte();
+	_malcolmShapes = in.readByte();
+	//XXX
+	_score = in.readSint16();
+	_scoreMax = in.readSint16();
+	_malcolmsMood = in.readByte();
+	in.read(_conversationState, sizeof(_conversationState));
+	in.read(_newSceneDlgState, sizeof(_newSceneDlgState));
+	for (int i = 0; i < 100; ++i)
+		_hiddenItems[i] = in.readUint16();
+	in.read(_scoreFlagTable, sizeof(_scoreFlagTable));
+
+	_mainCharacter.sceneId = in.readUint16();
+	_mainCharacter.dlgIndex = in.readUint16();
+	_mainCharacter.height = in.readByte();
+	_mainCharacter.facing = in.readByte();
+	_mainCharacter.animFrame = in.readUint16();
+	_mainCharacter.walkspeed = in.readByte();
+	for (int i = 0; i < 10; ++i)
+		_mainCharacter.inventory[i] = in.readUint16();
+	_mainCharacter.x1 = in.readSint16();
+	_mainCharacter.y1 = in.readSint16();
+	_mainCharacter.x2 = in.readSint16();
+	_mainCharacter.y2 = in.readSint16();
+	_mainCharacter.x3 = in.readSint16();
+	_mainCharacter.y3 = in.readSint16();
+
+	for (int i = 0; i < 50; ++i) {
+		_itemList[i].id = in.readUint16();
+		_itemList[i].sceneId = in.readUint16();
+		_itemList[i].x = in.readSint16();
+		_itemList[i].y = in.readSint16();
+		_itemList[i].unk8 = in.readUint16();
+	}
+
+	for (int i = 0; i < 88; ++i) {
+		in.read(_talkObjectList[i].filename, 13);
+		_talkObjectList[i].sceneAnim = in.readByte();
+		_talkObjectList[i].sceneScript = in.readByte();
+		_talkObjectList[i].x = in.readSint16();
+		_talkObjectList[i].y = in.readSint16();
+		_talkObjectList[i].color = in.readByte();
+	}
+
+	for (int i = 0; i < 86; ++i) {
+		in.read(_sceneList[i].filename1, 10);
+		in.read(_sceneList[i].filename2, 10);
+		_sceneList[i].exit1 = in.readUint16();
+		_sceneList[i].exit2 = in.readUint16();
+		_sceneList[i].exit3 = in.readUint16();
+		_sceneList[i].exit4 = in.readUint16();
+		_sceneList[i].flags = in.readByte();
+		_sceneList[i].sound = in.readByte();
+	}
+
+	_itemInHand = in.readSint16();
+	_sceneExit1 = in.readUint16();
+	_sceneExit2 = in.readUint16();
+	_sceneExit3 = in.readUint16();
+	_sceneExit4 = in.readUint16();
+
+	if (saveFile->ioFailed())
+		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
+	else
+		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());
+
+	_loadingState = true;
+	updateCharacterAnim(0);
+	_loadingState = false;
+
+	if (curShapes != _malcolmShapes)
+		loadMalcolmShapes(_malcolmShapes);
+
+	_mainCharX = _mainCharacter.x2 = _mainCharacter.x1;
+	_mainCharY = _mainCharacter.y2 = _mainCharacter.y1;
+	_mainCharacter.facing = 4;
+	_badConscienceShown = false;
+	_badConsciencePosition = false;
+	//_goodConscienceShown = false;
+	//_goodConsciencePosition = false;
+	
+	enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
+	setHandItem(_itemInHand);
+
+	if (_curMusicTrack >= 0 && !_unkSceneScreenFlag1)
+		playMusicTrack(_curMusicTrack, 1);
+	else if (_curMusicTrack == -1)
+		playMusicTrack(28, 1);
+
+	while (!_screen->isMouseVisible())
+		_screen->showMouse();
+
+	setCommandLineRestoreTimer(7);
+	_shownMessage = " ";
+	_restoreCommandLine = false;
+
+	// We didn't explicitly set the walk speed, but it's saved as part of
+	// the _timers array, so we need to re-sync it with _configWalkspeed.
+	setWalkspeed(_configWalkspeed);
+}
+
+} // end of namespace Kyra
+