[Scummvm-cvs-logs] SF.net SVN: scummvm:[55298] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Tue Jan 18 12:53:21 CET 2011


Revision: 55298
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55298&view=rev
Author:   drmccoy
Date:     2011-01-18 11:53:21 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
GOB: Give Inca2 its own SaveLoad class

Add an quick hack to fudge reading of the "voice.inf" file,
so that the voice match the selected text language.

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/module.mk
    scummvm/trunk/engines/gob/save/saveload.h

Added Paths:
-----------
    scummvm/trunk/engines/gob/save/saveload_inca2.cpp

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2011-01-18 11:52:44 UTC (rev 55297)
+++ scummvm/trunk/engines/gob/gob.cpp	2011-01-18 11:53:21 UTC (rev 55298)
@@ -476,7 +476,7 @@
 		_map      = new Map_v2(this);
 		_goblin   = new Goblin_v3(this);
 		_scenery  = new Scenery_v2(this);
-		_saveLoad = new SaveLoad_v3(this, _targetName.c_str(), SaveLoad_v3::kScreenshotTypeGob3);
+		_saveLoad = new SaveLoad_Inca2(this, _targetName.c_str());
 		break;
 
 	case kGameTypeLostInTime:

Modified: scummvm/trunk/engines/gob/module.mk
===================================================================
--- scummvm/trunk/engines/gob/module.mk	2011-01-18 11:52:44 UTC (rev 55297)
+++ scummvm/trunk/engines/gob/module.mk	2011-01-18 11:53:21 UTC (rev 55298)
@@ -70,6 +70,7 @@
 	save/saveload_v4.o \
 	save/saveload_v6.o \
 	save/saveload_fascin.o \
+	save/saveload_inca2.o \
 	save/saveload_playtoons.o \
 	save/saveconverter.o \
 	save/saveconverter_v2.o \

Modified: scummvm/trunk/engines/gob/save/saveload.h
===================================================================
--- scummvm/trunk/engines/gob/save/saveload.h	2011-01-18 11:52:44 UTC (rev 55297)
+++ scummvm/trunk/engines/gob/save/saveload.h	2011-01-18 11:53:21 UTC (rev 55298)
@@ -334,6 +334,44 @@
 	SaveFile *getSaveFile(const char *fileName);
 };
 
+/** Save/Load class for Inca 2. */
+class SaveLoad_Inca2 : public SaveLoad {
+public:
+	SaveLoad_Inca2(GobEngine *vm, const char *targetName);
+	virtual ~SaveLoad_Inca2();
+
+	SaveMode getSaveMode(const char *fileName) const;
+
+protected:
+	struct SaveFile {
+		const char *sourceName;
+		SaveMode mode;
+		SaveHandler *handler;
+		const char *description;
+	};
+
+	/** Handles the voice language info file. */
+	class VoiceHandler : public SaveHandler {
+	public:
+		VoiceHandler(GobEngine *vm);
+		~VoiceHandler();
+
+		int32 getSize();
+		bool load(int16 dataVar, int32 size, int32 offset);
+		bool save(int16 dataVar, int32 size, int32 offset);
+	};
+
+	static SaveFile _saveFiles[];
+
+	VoiceHandler *_voiceHandler;
+
+	SaveHandler *getHandler(const char *fileName) const;
+	const char *getDescription(const char *fileName) const;
+
+	const SaveFile *getSaveFile(const char *fileName) const;
+	SaveFile *getSaveFile(const char *fileName);
+};
+
 /** Save/Load class for Woodruff. */
 class SaveLoad_v4 : public SaveLoad {
 public:

Added: scummvm/trunk/engines/gob/save/saveload_inca2.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_inca2.cpp	                        (rev 0)
+++ scummvm/trunk/engines/gob/save/saveload_inca2.cpp	2011-01-18 11:53:21 UTC (rev 55298)
@@ -0,0 +1,121 @@
+/* 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 "gob/save/saveload.h"
+#include "gob/save/saveconverter.h"
+#include "gob/global.h"
+#include "gob/inter.h"
+
+namespace Gob {
+
+SaveLoad_Inca2::SaveFile SaveLoad_Inca2::_saveFiles[] = {
+	{"speak.inf", kSaveModeExists, 0, 0}, // Exists = speech enabled
+	{"voice.inf", kSaveModeSave  , 0, 0}  // Contains the language of the voices
+};
+
+
+SaveLoad_Inca2::VoiceHandler::VoiceHandler(GobEngine *vm) : SaveHandler(vm) {
+}
+
+SaveLoad_Inca2::VoiceHandler::~VoiceHandler() {
+}
+
+int32 SaveLoad_Inca2::VoiceHandler::getSize() {
+	return 1;
+}
+
+bool SaveLoad_Inca2::VoiceHandler::load(int16 dataVar, int32 size, int32 offset) {
+	if ((size != 1) || (offset != 0)) {
+		warning("Invalid voice language loading?!? (%d, %d, %d)", dataVar, size, offset);
+		return false;
+	}
+
+	WRITE_VARO_UINT8(dataVar, _vm->_global->_language);
+	return true;
+}
+
+bool SaveLoad_Inca2::VoiceHandler::save(int16 dataVar, int32 size, int32 offset) {
+	return false;
+}
+
+
+SaveLoad_Inca2::SaveLoad_Inca2(GobEngine *vm, const char *targetName) : SaveLoad(vm) {
+	_voiceHandler = new VoiceHandler(vm);
+
+	_saveFiles[1].handler = _voiceHandler;
+}
+
+SaveLoad_Inca2::~SaveLoad_Inca2() {
+	delete _voiceHandler;
+}
+
+const SaveLoad_Inca2::SaveFile *SaveLoad_Inca2::getSaveFile(const char *fileName) const {
+	fileName = stripPath(fileName);
+
+	for (int i = 0; i < ARRAYSIZE(_saveFiles); i++)
+		if (!scumm_stricmp(fileName, _saveFiles[i].sourceName))
+			return &_saveFiles[i];
+
+	return 0;
+}
+
+SaveLoad_Inca2::SaveFile *SaveLoad_Inca2::getSaveFile(const char *fileName) {
+	fileName = stripPath(fileName);
+
+	for (int i = 0; i < ARRAYSIZE(_saveFiles); i++)
+		if (!scumm_stricmp(fileName, _saveFiles[i].sourceName))
+			return &_saveFiles[i];
+
+	return 0;
+}
+
+SaveHandler *SaveLoad_Inca2::getHandler(const char *fileName) const {
+	const SaveFile *saveFile = getSaveFile(fileName);
+
+	if (saveFile)
+		return saveFile->handler;
+
+	return 0;
+}
+
+const char *SaveLoad_Inca2::getDescription(const char *fileName) const {
+	const SaveFile *saveFile = getSaveFile(fileName);
+
+	if (saveFile)
+		return saveFile->description;
+
+	return 0;
+}
+
+SaveLoad::SaveMode SaveLoad_Inca2::getSaveMode(const char *fileName) const {
+	const SaveFile *saveFile = getSaveFile(fileName);
+
+	if (saveFile)
+		return saveFile->mode;
+
+	return kSaveModeNone;
+}
+
+} // End of namespace Gob


Property changes on: scummvm/trunk/engines/gob/save/saveload_inca2.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native


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