WINTERMUTE: Avoid starting up the engine to perform detection.

5 files changed, 120 insertions, 25 deletions

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index addce1dea4..d54fe96854 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -27,8 +27,6 @@
  */

 

 #include "engines/wintermute/base/base_file_manager.h"

-#include "engines/wintermute/utils/string_util.h"

-#include "engines/wintermute/utils/path_util.h"

 #include "engines/wintermute/base/file/base_disk_file.h"

 #include "engines/wintermute/base/file/base_save_thumb_file.h"

 #include "engines/wintermute/base/file/base_file_entry.h"

@@ -37,9 +35,8 @@
 #include "engines/wintermute/base/file/base_resources.h"

 #include "engines/wintermute/base/base_registry.h"

 #include "engines/wintermute/base/base_game.h"

-#include "engines/wintermute/dcpackage.h"

+#include "engines/wintermute/base/file/dcpackage.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 #include "common/str.h"

 #include "common/textconsole.h"

@@ -58,12 +55,11 @@ namespace WinterMute {
 //////////////////////////////////////////////////////////////////////

 

 //////////////////////////////////////////////////////////////////////

-BaseFileManager::BaseFileManager(BaseGame *inGame): BaseClass(inGame) {

+BaseFileManager::BaseFileManager(BaseGame *inGame) : _gameRef(inGame) {

 	initPaths();

 	registerPackages();

 }

 

-

 //////////////////////////////////////////////////////////////////////

 BaseFileManager::~BaseFileManager() {

 	cleanup();

@@ -207,6 +203,9 @@ bool BaseFileManager::reloadPaths() {
 #define TEMP_BUFFER_SIZE 32768

 //////////////////////////////////////////////////////////////////////////

 bool BaseFileManager::initPaths() {

+	if (!_gameRef) // This function only works when the game-registry is loaded

+		return STATUS_FAILED;

+

 	AnsiString pathList;

 	int numPaths;

 

@@ -506,6 +505,8 @@ Common::SeekableReadStream *BaseFileManager::openFileRaw(const Common::String &f
 	Common::SeekableReadStream *ret = NULL;

 

 	if (scumm_strnicmp(filename.c_str(), "savegame:", 9) == 0) {

+		if (!_gameRef)

+			error("Attempt to load filename: %s without BaseGame-object, this is unsupported", filename.c_str());

 		BaseSaveThumbFile *SaveThumbFile = new BaseSaveThumbFile(_gameRef);

 		if (DID_SUCCEED(SaveThumbFile->open(filename))) {

 			ret = SaveThumbFile->getMemStream();

diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h
index f859e39b00..cacdb8bf2d 100644
--- a/engines/wintermute/base/base_file_manager.h
+++ b/engines/wintermute/base/base_file_manager.h
@@ -29,20 +29,17 @@
 #ifndef WINTERMUTE_BFILEMANAGER_H

 #define WINTERMUTE_BFILEMANAGER_H

 

-#include "engines/wintermute/base/base.h"

-#include "engines/wintermute/base/file/base_package.h"

 #include "common/archive.h"

 #include "common/str.h"

 #include "common/fs.h"

-

-namespace Common {

-class File;

-}

+#include "common/file.h"

 

 namespace WinterMute {

 class BaseFile;

 class BaseFileEntry;

-class BaseFileManager: BaseClass {

+class BaseGame;

+class BasePackage;

+class BaseFileManager {

 public:

 	bool cleanup();

 

@@ -77,6 +74,7 @@ private:
 	bool findPackageSignature(Common::SeekableReadStream *f, uint32 *offset);

 	bool registerPackage(Common::FSNode package, const Common::String &filename = "", bool searchSignature = false);

 //	bool registerPackage(const Common::String &filename, bool searchSignature = false);

+	BaseGame *_gameRef;

 	Common::Array<BasePackage *> _packages;

 	Common::Array<Common::SeekableReadStream *> _openFiles;

 	Common::HashMap<Common::String, BaseFileEntry *> _files;

diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index 427f2f46f8..1706a7a50b 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -57,10 +57,10 @@ BasePackage::~BasePackage() {
 

 //////////////////////////////////////////////////////////////////////////

 bool BasePackage::open() {

-	if (_file) return STATUS_OK;

+	if (_file) return true;

 	else {

 		_file = getFilePointer();

-		return _file ? STATUS_OK : STATUS_FAILED;

+		return _file ? true : false;

 	}

 }

 

@@ -69,18 +69,18 @@ bool BasePackage::open() {
 bool BasePackage::close() {

 	delete _file;

 	_file = NULL;

-	return STATUS_OK;

+	return true;

 }

 

 

 //////////////////////////////////////////////////////////////////////////

 bool BasePackage::read(Common::SeekableReadStream *file, uint32 offset, byte *buffer, uint32 size) {

 	bool ret;

-	if (DID_FAIL(ret = open())) return ret;

+	if (!(ret = open())) return ret;

 	else {

-		if (file->seek(offset, SEEK_SET)) return STATUS_FAILED;

-		if (file->read(buffer, size) != 1) return STATUS_FAILED;

-		else return STATUS_OK;

+		if (file->seek(offset, SEEK_SET)) return false;

+		if (file->read(buffer, size) != 1) return false;

+		else return true;

 	}

 }

 

diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h
new file mode 100644
index 0000000000..5e47edba56
--- /dev/null
+++ b/engines/wintermute/base/file/dcpackage.h
@@ -0,0 +1,96 @@
+/* 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.

+ *

+ */

+

+/*

+ * This file is based on WME Lite.

+ * http://dead-code.org/redir.php?target=wmelite

+ * Copyright (c) 2011 Jan Nedoma

+ */

+

+#ifndef _DCPACKAGE_H_

+#define _DCPACKAGE_H_

+

+

+#define PACKAGE_MAGIC_1   0xDEC0ADDE

+#define PACKAGE_MAGIC_2   0x4B4E554A    // "JUNK"

+#define PACKAGE_VERSION   0x00000200

+#define PACKAGE_EXTENSION "dcp"

+

+#include "common/stream.h"

+

+namespace WinterMute {

+

+struct TPackageHeader {

+	uint32 _magic1;

+	uint32 _magic2;

+	uint32 _packageVersion;

+	uint32 _gameVersion;

+	byte _priority;

+	byte _cd;

+	bool _masterIndex;

+	uint32 _creationTime;

+	char _desc[100];

+	uint32 _numDirs;

+	// TODO: Move this out of the header.

+	void readFromStream(Common::ReadStream *stream) {

+		_magic1 = stream->readUint32LE();

+		_magic2 = stream->readUint32LE();

+		_packageVersion = stream->readUint32LE();

+

+		_gameVersion = stream->readUint32LE();

+

+		_priority = stream->readByte();

+		_cd = stream->readByte();

+		_masterIndex = stream->readByte();

+		stream->readByte(); // To align the next byte...

+

+		_creationTime = stream->readUint32LE();

+

+		stream->read(_desc, 100);

+		_numDirs = stream->readUint32LE();

+	}

+};

+

+/*

+v2:  uint32 DirOffset

+

+

+Dir: byte NameLength

+     char Name [NameLength]

+     byte CD;

+     uint32 NumEntries

+

+

+Entry: byte NameLength

+       char Name [NameLength]

+       uint32 Offset

+       uint32 Length

+       uint32 CompLength

+       uint32 Flags

+v2:    uint32 TimeDate1

+       uint32 TimeDate2  // not used

+

+*/

+

+} // end of namespace WinterMute

+

+#endif // _DCPACKAGE_H_

diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp
index bdc7cb76e2..2c18b64110 100644
--- a/engines/wintermute/base/gfx/base_image.cpp
+++ b/engines/wintermute/base/gfx/base_image.cpp
@@ -82,14 +82,14 @@ bool BaseImage::loadFile(const Common::String &filename) {
 	}

 	_filename = filename;

 	Common::SeekableReadStream *file = _fileManager->openFile(filename.c_str());

-	if (!file) return STATUS_FAILED;

+	if (!file) return false;

 

 	_decoder->loadStream(*file);

 	_surface = _decoder->getSurface();

 	_palette = _decoder->getPalette();

 	_fileManager->closeFile(file);

 

-	return STATUS_OK;

+	return true;

 }

 

 byte BaseImage::getAlphaAt(int x, int y) {

@@ -113,7 +113,7 @@ bool BaseImage::saveBMPFile(const char *filename) {
 	if (FreeImage_Save(FIF_BMP, _bitmap, filename)) return STATUS_OK;

 	else return STATUS_FAILED;

 #endif

-	return STATUS_FAILED;

+	return false;

 }

 

 

@@ -133,7 +133,7 @@ bool BaseImage::resize(int newWidth, int newHeight) {
 		return STATUS_OK;

 	} else return STATUS_FAILED;

 #endif

-	return STATUS_FAILED;

+	return false;

 }

 

 

@@ -258,7 +258,7 @@ bool BaseImage::copyFrom(BaseImage *origImage, int newWidth, int newHeight) {
 		_deletableSurface = NULL;

 	}

 	_surface = _deletableSurface = temp.scale(newWidth, newHeight);

-	return STATUS_OK;

+	return true;

 }

 

 } // end of namespace WinterMute