ZVISION: normalized file endings

1 files changed, 253 insertions, 253 deletions

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index f8ed6a749b..5488ae5be4 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -1,256 +1,256 @@
-/* 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.

- *

- *

- */

-

-#include "base/plugins.h"

-

-#include "engines/advancedDetector.h"

-

-#include "common/translation.h"

-#include "common/savefile.h"

-#include "common/str-array.h"

-#include "common/system.h"

-

-#include "zvision/zvision.h"

-

-

-namespace ZVision {

-

-struct ZVisionGameDescription {

-	ADGameDescription desc;

-};

-

-uint32 ZVision::getFeatures() const {

-	return _gameDescription->desc.flags;

-}

-

-Common::Language ZVision::getLanguage() const {

-	return _gameDescription->desc.language;

-}

-

-}

-

-static const PlainGameDescriptor zVisionGames[] = {

-	{"zvision",  "ZVision Game"},

-	{"znemesis", "Zork Nemesis: The Forbidden Lands"},

-	{"zgi",      "Zork: Grand Inquisitor"},

-	{0, 0}

-};

-

-

-namespace ZVision {

-

-static const ZVisionGameDescription gameDescriptions[] = {

-

-	{

-		// Zork Nemesis English version

-		{

-			"znemesis",

-			0,

-			AD_ENTRY1s("CSCR.ZFS", "88226e51a205d2e50c67a5237f3bd5f2", 2397741),

-			Common::EN_ANY,

-			Common::kPlatformDOS,

-			ADGF_NO_FLAGS,

-			GUIO1(GUIO_NONE)

-		},

-	},

-

-	{ AD_TABLE_END_MARKER }

-};

-

-} // End of namespace ZVision

-

+/* 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.
+ *
+ *
+ */
+
+#include "base/plugins.h"
+
+#include "engines/advancedDetector.h"
+
+#include "common/translation.h"
+#include "common/savefile.h"
+#include "common/str-array.h"
+#include "common/system.h"
+
+#include "zvision/zvision.h"
+
+
+namespace ZVision {
+
+struct ZVisionGameDescription {
+	ADGameDescription desc;
+};
+
+uint32 ZVision::getFeatures() const {
+	return _gameDescription->desc.flags;
+}
+
+Common::Language ZVision::getLanguage() const {
+	return _gameDescription->desc.language;
+}
+
+}
+
+static const PlainGameDescriptor zVisionGames[] = {
+	{"zvision",  "ZVision Game"},
+	{"znemesis", "Zork Nemesis: The Forbidden Lands"},
+	{"zgi",      "Zork: Grand Inquisitor"},
+	{0, 0}
+};
+
+
+namespace ZVision {
+
+static const ZVisionGameDescription gameDescriptions[] = {
+
+	{
+		// Zork Nemesis English version
+		{
+			"znemesis",
+			0,
+			AD_ENTRY1s("CSCR.ZFS", "88226e51a205d2e50c67a5237f3bd5f2", 2397741),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+	},
+
+	{ AD_TABLE_END_MARKER }
+};
+
+} // End of namespace ZVision
+
 static const char *directoryGlobs[] = {
 	"znemscr",
 	0
-};

-

-static const ExtraGuiOption ZVisionExtraGuiOption = {

-	_s("Use original save/load screens"),

-	_s("Use the original save/load screens, instead of the ScummVM ones"),

-	"originalsaveload",

-	false

-};

-

-class ZVisionMetaEngine : public AdvancedMetaEngine {

-public:

-	ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), zVisionGames) {

-		_maxScanDepth = 2;

-		_directoryGlobs = directoryGlobs;

-		_singleid = "zvision";

-	}

-

-	virtual const char *getName() const {

-		return "ZVision";

-	}

-

-	virtual const char *getOriginalCopyright() const {

-		return "ZVision Activision (C) 1996";

-	}

-

-	virtual bool hasFeature(MetaEngineFeature f) const;

-	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;

-	virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;

-	SaveStateList listSaves(const char *target) const;

-	virtual int getMaximumSaveSlot() const;

-	void removeSaveState(const char *target, int slot) const;

-	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;

-};

-

-bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {

-	return false;

-		/*

-		(f == kSupportsListSaves) ||

-		(f == kSupportsLoadingDuringStartup) ||

-		(f == kSupportsDeleteSave) ||

-		(f == kSavesSupportMetaInfo) ||

-		(f == kSavesSupportThumbnail) ||

-		(f == kSavesSupportCreationDate) ||

-		(f == kSavesSupportPlayTime);

-		*/

-}

-

-/*bool ZVision::ZVision::hasFeature(EngineFeature f) const {

-	return

-		(f == kSupportsRTL) ||

-		(f == kSupportsLoadingDuringRuntime) ||

-		(f == kSupportsSavingDuringRuntime);

-}*/

-

-bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {

-	const ZVision::ZVisionGameDescription *gd = (const ZVision::ZVisionGameDescription *)desc;

-	if (gd) {

-		*engine = new ZVision::ZVision(syst, gd);

-	}

-	return gd != 0;

-}

-

-const ExtraGuiOptions ZVisionMetaEngine::getExtraGuiOptions(const Common::String &target) const {

-	ExtraGuiOptions options;

-	options.push_back(ZVisionExtraGuiOption);

-	return options;

-}

-

-SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {

-	//Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();

-	/*ZVision::ZVision::SaveHeader header;

-	Common::String pattern = target;

-	pattern += ".???";

-

-	Common::StringArray filenames;

-	filenames = saveFileMan->listSavefiles(pattern.c_str());

-	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)*/

-

-	SaveStateList saveList;

-/*	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) {

-		// Obtain the last 3 digits of the filename, since they correspond to the save slot

-		int slotNum = atoi(file->c_str() + file->size() - 3);

-

-		if (slotNum >= 0 && slotNum <= 999) {

-			Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());

-			if (in) {

-				if (ZVision::ZVision::readSaveHeader(in, false, header) == ZVision::ZVision::kRSHENoError) {

-					saveList.push_back(SaveStateDescriptor(slotNum, header.description));

-				}

-				delete in;

-			}

-		}

-	}*/

-

-	return saveList;

-}

-

-int ZVisionMetaEngine::getMaximumSaveSlot() const {

-	return 999;

-}

-

-void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {

-	/*

-	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();

-	Common::String filename = ZVision::ZVision::getSavegameFilename(target, slot);

-

-	saveFileMan->removeSavefile(filename.c_str());

-

-	Common::StringArray filenames;

-	Common::String pattern = target;

-	pattern += ".???";

-	filenames = saveFileMan->listSavefiles(pattern.c_str());

-	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)

-

-	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {

-		// Obtain the last 3 digits of the filename, since they correspond to the save slot

-		int slotNum = atoi(file->c_str() + file->size() - 3);

-

-		// Rename every slot greater than the deleted slot,

-		if (slotNum > slot) {

-			saveFileMan->renameSavefile(file->c_str(), filename.c_str());

-			filename = ZVision::ZVision::getSavegameFilename(target, ++slot);

-		}

-	}

-	*/

-}

-

-SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, int slot) const {

-	/*

-	Common::String filename = ZVision::ZVision::getSavegameFilename(target, slot);

-	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());

-

-	if (in) {

-		ZVision::ZVision::SaveHeader header;

-		ZVision::ZVision::kReadSaveHeaderError error;

-

-		error = ZVision::ZVision::readSaveHeader(in, true, header);

-		delete in;

-

-		if (error == ZVision::ZVision::kRSHENoError) {

-			SaveStateDescriptor desc(slot, header.description);

-

-			desc.setThumbnail(header.thumbnail);

-

-			if (header.version > 0) {

-				int day = (header.saveDate >> 24) & 0xFF;

-				int month = (header.saveDate >> 16) & 0xFF;

-				int year = header.saveDate & 0xFFFF;

-

-				desc.setSaveDate(year, month, day);

-

-				int hour = (header.saveTime >> 16) & 0xFF;

-				int minutes = (header.saveTime >> 8) & 0xFF;

-

-				desc.setSaveTime(hour, minutes);

-

-				desc.setPlayTime(header.playTime * 1000);

-			}

-

-			return desc;

-		}

-	}

-	*/

-

-	return SaveStateDescriptor();

-}

-

-#if PLUGIN_ENABLED_DYNAMIC(ZVISION)

-	REGISTER_PLUGIN_DYNAMIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);

-#else

-	REGISTER_PLUGIN_STATIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);

-#endif

+};
+
+static const ExtraGuiOption ZVisionExtraGuiOption = {
+	_s("Use original save/load screens"),
+	_s("Use the original save/load screens, instead of the ScummVM ones"),
+	"originalsaveload",
+	false
+};
+
+class ZVisionMetaEngine : public AdvancedMetaEngine {
+public:
+	ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), zVisionGames) {
+		_maxScanDepth = 2;
+		_directoryGlobs = directoryGlobs;
+		_singleid = "zvision";
+	}
+
+	virtual const char *getName() const {
+		return "ZVision";
+	}
+
+	virtual const char *getOriginalCopyright() const {
+		return "ZVision Activision (C) 1996";
+	}
+
+	virtual bool hasFeature(MetaEngineFeature f) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+	virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
+	SaveStateList listSaves(const char *target) const;
+	virtual int getMaximumSaveSlot() const;
+	void removeSaveState(const char *target, int slot) const;
+	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+};
+
+bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {
+	return false;
+		/*
+		(f == kSupportsListSaves) ||
+		(f == kSupportsLoadingDuringStartup) ||
+		(f == kSupportsDeleteSave) ||
+		(f == kSavesSupportMetaInfo) ||
+		(f == kSavesSupportThumbnail) ||
+		(f == kSavesSupportCreationDate) ||
+		(f == kSavesSupportPlayTime);
+		*/
+}
+
+/*bool ZVision::ZVision::hasFeature(EngineFeature f) const {
+	return
+		(f == kSupportsRTL) ||
+		(f == kSupportsLoadingDuringRuntime) ||
+		(f == kSupportsSavingDuringRuntime);
+}*/
+
+bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+	const ZVision::ZVisionGameDescription *gd = (const ZVision::ZVisionGameDescription *)desc;
+	if (gd) {
+		*engine = new ZVision::ZVision(syst, gd);
+	}
+	return gd != 0;
+}
+
+const ExtraGuiOptions ZVisionMetaEngine::getExtraGuiOptions(const Common::String &target) const {
+	ExtraGuiOptions options;
+	options.push_back(ZVisionExtraGuiOption);
+	return options;
+}
+
+SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
+	//Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	/*ZVision::ZVision::SaveHeader header;
+	Common::String pattern = target;
+	pattern += ".???";
+
+	Common::StringArray filenames;
+	filenames = saveFileMan->listSavefiles(pattern.c_str());
+	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)*/
+
+	SaveStateList saveList;
+/*	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
+		// Obtain the last 3 digits of the filename, since they correspond to the save slot
+		int slotNum = atoi(file->c_str() + file->size() - 3);
+
+		if (slotNum >= 0 && slotNum <= 999) {
+			Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
+			if (in) {
+				if (ZVision::ZVision::readSaveHeader(in, false, header) == ZVision::ZVision::kRSHENoError) {
+					saveList.push_back(SaveStateDescriptor(slotNum, header.description));
+				}
+				delete in;
+			}
+		}
+	}*/
+
+	return saveList;
+}
+
+int ZVisionMetaEngine::getMaximumSaveSlot() const {
+	return 999;
+}
+
+void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {
+	/*
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::String filename = ZVision::ZVision::getSavegameFilename(target, slot);
+
+	saveFileMan->removeSavefile(filename.c_str());
+
+	Common::StringArray filenames;
+	Common::String pattern = target;
+	pattern += ".???";
+	filenames = saveFileMan->listSavefiles(pattern.c_str());
+	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
+
+	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+		// Obtain the last 3 digits of the filename, since they correspond to the save slot
+		int slotNum = atoi(file->c_str() + file->size() - 3);
+
+		// Rename every slot greater than the deleted slot,
+		if (slotNum > slot) {
+			saveFileMan->renameSavefile(file->c_str(), filename.c_str());
+			filename = ZVision::ZVision::getSavegameFilename(target, ++slot);
+		}
+	}
+	*/
+}
+
+SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+	/*
+	Common::String filename = ZVision::ZVision::getSavegameFilename(target, slot);
+	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
+
+	if (in) {
+		ZVision::ZVision::SaveHeader header;
+		ZVision::ZVision::kReadSaveHeaderError error;
+
+		error = ZVision::ZVision::readSaveHeader(in, true, header);
+		delete in;
+
+		if (error == ZVision::ZVision::kRSHENoError) {
+			SaveStateDescriptor desc(slot, header.description);
+
+			desc.setThumbnail(header.thumbnail);
+
+			if (header.version > 0) {
+				int day = (header.saveDate >> 24) & 0xFF;
+				int month = (header.saveDate >> 16) & 0xFF;
+				int year = header.saveDate & 0xFFFF;
+
+				desc.setSaveDate(year, month, day);
+
+				int hour = (header.saveTime >> 16) & 0xFF;
+				int minutes = (header.saveTime >> 8) & 0xFF;
+
+				desc.setSaveTime(hour, minutes);
+
+				desc.setPlayTime(header.playTime * 1000);
+			}
+
+			return desc;
+		}
+	}
+	*/
+
+	return SaveStateDescriptor();
+}
+
+#if PLUGIN_ENABLED_DYNAMIC(ZVISION)
+	REGISTER_PLUGIN_DYNAMIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);
+#else
+	REGISTER_PLUGIN_STATIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);
+#endif