From c10f87f9c88b7ffd0a0652727fa91fd76929786f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Sep 2012 09:09:09 +1000
Subject: HOPKINS: Beginnings of file manager code

---
 engines/hopkins/files.cpp | 127 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 engines/hopkins/files.cpp

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
new file mode 100644
index 0000000000..1f3434517e
--- /dev/null
+++ b/engines/hopkins/files.cpp
@@ -0,0 +1,127 @@
+/* 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 "hopkins/files.h"
+#include "hopkins/hopkins.h"
+#include "hopkins/globals.h"
+#include "common/system.h"
+#include "common/debug.h"
+#include "common/file.h"
+#include "common/str.h"
+#include "common/savefile.h"
+
+namespace Hopkins {
+
+void FileManager::initSaves() {
+	Common::String dataFilename = "HISCORE.DAT";
+	byte data[100];
+	Common::fill(&data[0], &data[100], 0);
+	
+	SAUVE_FICHIER(dataFilename, data, 100);
+}
+
+bool FileManager::SAUVE_FICHIER(const Common::String &file, const void *buf, size_t n) {
+	return bsave(file, buf, n);
+}
+
+bool FileManager::bsave(const Common::String &file, const void *buf, size_t n) {
+	Common::OutSaveFile *f = g_system->getSavefileManager()->openForSaving(file);
+
+	if (f) {
+		size_t bytesWritten = f->write(buf, n);
+		f->finalize();
+		delete f;
+
+		return bytesWritten == n;
+	} else 
+		return false;
+}
+
+void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
+	char *iniData = (char *)CHARGE_FICHIER("config.ini");
+	char *ptr = iniData;
+
+	bool endOfFile = false;
+	while (!endOfFile) {
+		if (*ptr == '%') {
+			if (*(ptr + 1) == '%') {
+				endOfFile = true;
+			} else {
+				++ptr;
+
+				// Get the parameter name
+				Common::String paramName;
+				while (*ptr == ' ') 
+					++ptr;
+				while (*ptr != '=') {
+					paramName += toupper(*ptr++);
+				}
+				while (paramName.lastChar() == ' ')
+					paramName.deleteLastChar();
+
+				// Get the parameter value
+				Common::String paramValue;
+				while (*++ptr == ' ') 
+					;
+				while (*ptr != ';') {
+					paramValue += toupper(*ptr++);
+				}
+				while (paramValue.lastChar() == ' ')
+					paramValue.deleteLastChar();
+
+				iniParams[paramName] = paramValue;
+			}
+		}
+    
+		++ptr;
+	}
+
+	free(iniData);
+}
+
+void *FileManager::CHARGE_FICHIER(const Common::String &file) {
+	DMESS1();
+
+	Common::File f;
+	if (!f.open(file))
+		error("Error opening %s", file.c_str());
+
+	// Allocate space for the file contents
+	size_t filesize = f.size();
+	void *data = malloc(filesize);
+	if (!data)
+		error("Error allocating space for file being loaded - %s", file.c_str());
+
+	bload_it(f, data, filesize);
+	f.close();
+  
+	return data;
+}
+
+void FileManager::DMESS1() {
+}
+
+int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes) {
+	return stream.read(buf, nbytes);
+}
+
+} // End of namespace Hopkins
-- 
cgit v1.2.3


From b8086aabc53f2359f9a6952f083701b4a01282be Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Sep 2012 18:45:22 +1000
Subject: HOPKINS: Commit of lots more initialisation code

---
 engines/hopkins/files.cpp | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 1f3434517e..1d9c3adb54 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -98,7 +98,7 @@ void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
 	free(iniData);
 }
 
-void *FileManager::CHARGE_FICHIER(const Common::String &file) {
+byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 	DMESS1();
 
 	Common::File f;
@@ -107,7 +107,7 @@ void *FileManager::CHARGE_FICHIER(const Common::String &file) {
 
 	// Allocate space for the file contents
 	size_t filesize = f.size();
-	void *data = malloc(filesize);
+	byte *data = (byte *)malloc(filesize);
 	if (!data)
 		error("Error allocating space for file being loaded - %s", file.c_str());
 
@@ -124,4 +124,38 @@ int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes)
 	return stream.read(buf, nbytes);
 }
 
+void FileManager::F_Censure() {
+	GLOBALS.CENSURE = false;
+
+	CONSTRUIT_SYSTEM("BLOOD.DAT");
+	char *data = (char *)CHARGE_FICHIER(GLOBALS.NFICHIER);
+  
+	if (*(data + 6) == 'f' && *(data + 7) == 'r')
+		GLOBALS.CENSURE = false;
+	if (*(data + 6) == 'F' && *(data + 7) == 'R')
+		GLOBALS.CENSURE = false;
+	if (*(data + 6) == 'u' && *(data + 7) == 'k')
+		GLOBALS.CENSURE = true;
+	if (*(data + 6) == 'U' && *(data + 7) == 'K')
+		GLOBALS.CENSURE = true;
+
+	free(data);
+}
+
+int FileManager::CONSTRUIT_SYSTEM(const Common::String &file) {
+	GLOBALS.NFICHIER = Common::String::format("system/%s", file.c_str());
+	return GLOBALS.NFICHIER.size();
+}
+
+void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::String &file) {
+	// At this point, the original program did a big switch statement to determine
+	// whether to preprend the CD or installed directory path into REPJEU
+
+	if (hop[0] == 'A' && hop[1] == 'N' && hop[2] == 'N') {
+		error("TODO: CONSTRUIT_FICHIER");
+	}
+
+	GLOBALS.NFICHIER = Common::String::format("%s/%s", hop.c_str(), file.c_str());
+}
+
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From ca84b2737f6bd1c6c971d5ff7451cfb164afadb8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Sep 2012 21:43:33 +1000
Subject: HOPKINS: Add object loading

---
 engines/hopkins/files.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 1d9c3adb54..40cd238d1e 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -158,4 +158,9 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::Str
 	GLOBALS.NFICHIER = Common::String::format("%s/%s", hop.c_str(), file.c_str());
 }
 
+byte *FileManager::LIBERE_FICHIER(byte *ptr) {
+	free(ptr);
+	return PTRNUL;
+}
+
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From ecee539bfde463648d69e0330500ab5ad3cde080 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Sep 2012 23:43:35 +1000
Subject: HOPKINS: Implement proper graphics initialisation code

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 40cd238d1e..cf6c06f22c 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -107,7 +107,7 @@ byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 
 	// Allocate space for the file contents
 	size_t filesize = f.size();
-	byte *data = (byte *)malloc(filesize);
+	byte *data = GLOBALS.dos_malloc2(filesize);
 	if (!data)
 		error("Error allocating space for file being loaded - %s", file.c_str());
 
-- 
cgit v1.2.3


From 97e84b2169e8f3084e568776b1a9561a2df6878e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Sep 2012 19:55:05 +1000
Subject: HOPKINS: Implemented image loading code

---
 engines/hopkins/files.cpp | 161 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index cf6c06f22c..565143d3ff 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -163,4 +163,165 @@ byte *FileManager::LIBERE_FICHIER(byte *ptr) {
 	return PTRNUL;
 }
 
+bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
+	byte *ptr; // [sp+1Ch] [bp-40h]@0
+	Common::File f;
+
+	switch (a2) {
+	case 1:
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_INI.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+		
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_INI.RES");
+		break;
+
+	case 2:
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_REP.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_REP.RES");
+		break;
+
+	case 3:
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_LIN.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_LIN.RES");
+		break;
+
+	case 4:
+		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_ANI.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_ANI.RES");
+		break;
+
+	case 5:
+		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_PER.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_PER.RES");
+		break;
+
+	case 6:
+		CONSTRUIT_FICHIER(GLOBALS.HOPIMAGE, "PIC.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		break;
+
+	case 7:
+		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_SAN.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		break;
+
+	case 8:
+		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_SLI.CAT");
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		break;
+
+	case 9:
+		switch (GLOBALS.FR) {
+		case 0:
+			CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_VAN.CAT");
+			break;
+		case 1:
+			CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_VFR.CAT");
+			break;
+		case 2:
+			CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_VES.CAT");
+			break;
+		}
+
+		if (!f.exists(GLOBALS.NFICHIER))
+			return PTRNUL;
+
+		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		break;
+		// Deliberate fall-through to
+	default:
+		break;
+	}
+
+	// Scan for an entry in the catalogue
+	const byte *startP = ptr;
+	int result; // eax@50
+	void *v22; // ebx@53
+	bool matchFlag = false;
+	int offsetVal = 0;
+	
+	do {
+		Common::String name = (const char *)startP;
+    
+		if (file == name) {
+			// Found entry for file, so get it's details from the catalogue entry
+			const byte *pData = startP + offsetVal;
+			startP += offsetVal + 15;
+			GLOBALS.CAT_POSI = READ_LE_UINT32(pData + 15);
+			GLOBALS.CAT_TAILLE = READ_LE_UINT32(pData + 19);
+			matchFlag = true;
+		}
+
+		const char *finishString = "FINIS";
+		const char *nameP = name.c_str();
+		int finishRemainingChars = 6;
+		int v19 = 0;
+	    bool finishMatch = true;
+
+		do {
+			if (!finishRemainingChars)
+				break;
+			finishMatch = *finishString++ == *nameP++;
+			--finishRemainingChars;
+		} while (finishMatch);
+
+		if (!finishMatch)
+			v19 = *(byte *)(finishString - 1) - *(byte *)(nameP - 1);
+		if (!v19) {
+			GLOBALS.dos_free2(ptr);
+			return PTRNUL;
+		}
+    
+		offsetVal += 23;
+	} while (!matchFlag);
+	GLOBALS.dos_free2(ptr);
+
+	// TODO: Double check whether this really should be an unsigned int comparison
+	if ((uint16)(a2 - 6) > 1 && (uint16)(a2 - 8) > 1) {
+		if (!f.open(GLOBALS.NFICHIER))
+			error("CHARGE_FICHIER");
+
+		f.seek(GLOBALS.CAT_POSI);
+
+		byte *catData = GLOBALS.dos_malloc2(GLOBALS.CAT_TAILLE);
+		if (catData == PTRNUL)
+			error("CHARGE_FICHIER");
+
+		bload_it(f, catData, GLOBALS.CAT_TAILLE);
+		f.close();
+		result = true;
+	} else {
+		result = false;
+	}
+
+	return result;
+}
+
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From e66ce45d0ab44bcc0e0ce10864da5bf0296cf075 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 13 Sep 2012 21:08:54 +1000
Subject: HOPKINS: Further work and bugfixes on palette processing

---
 engines/hopkins/files.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 565143d3ff..bbe3fbc7d0 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -164,7 +164,7 @@ byte *FileManager::LIBERE_FICHIER(byte *ptr) {
 }
 
 bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
-	byte *ptr; // [sp+1Ch] [bp-40h]@0
+	byte *ptr = NULL;
 	Common::File f;
 
 	switch (a2) {
@@ -262,8 +262,7 @@ bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 
 	// Scan for an entry in the catalogue
 	const byte *startP = ptr;
-	int result; // eax@50
-	void *v22; // ebx@53
+	int result;
 	bool matchFlag = false;
 	int offsetVal = 0;
 	
-- 
cgit v1.2.3


From 10bb7730ea559f62682db053eda2f532d25ffe68 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 15 Sep 2012 11:46:10 +1000
Subject: HOPKINS: Fix loading images other than the first item in a picture
 index

---
 engines/hopkins/files.cpp | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index bbe3fbc7d0..951db67483 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -261,45 +261,29 @@ bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	}
 
 	// Scan for an entry in the catalogue
-	const byte *startP = ptr;
 	int result;
 	bool matchFlag = false;
 	int offsetVal = 0;
 	
 	do {
-		Common::String name = (const char *)startP;
+		Common::String name = (const char *)ptr + offsetVal;
     
-		if (file == name) {
+		if (name == file) {
 			// Found entry for file, so get it's details from the catalogue entry
-			const byte *pData = startP + offsetVal;
-			startP += offsetVal + 15;
+			const byte *pData = ptr + offsetVal;
 			GLOBALS.CAT_POSI = READ_LE_UINT32(pData + 15);
 			GLOBALS.CAT_TAILLE = READ_LE_UINT32(pData + 19);
 			matchFlag = true;
 		}
 
-		const char *finishString = "FINIS";
-		const char *nameP = name.c_str();
-		int finishRemainingChars = 6;
-		int v19 = 0;
-	    bool finishMatch = true;
-
-		do {
-			if (!finishRemainingChars)
-				break;
-			finishMatch = *finishString++ == *nameP++;
-			--finishRemainingChars;
-		} while (finishMatch);
-
-		if (!finishMatch)
-			v19 = *(byte *)(finishString - 1) - *(byte *)(nameP - 1);
-		if (!v19) {
+		if (name == "FINIS") {
 			GLOBALS.dos_free2(ptr);
-			return PTRNUL;
+			return false;
 		}
     
 		offsetVal += 23;
 	} while (!matchFlag);
+
 	GLOBALS.dos_free2(ptr);
 
 	// TODO: Double check whether this really should be an unsigned int comparison
-- 
cgit v1.2.3


From d2bf3ae78c693e119ac765b1af3578eefecee773 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 16 Sep 2012 17:21:24 +1000
Subject: HOPKINS: Implementing code for CHARGE_ANIM and dependent methods

---
 engines/hopkins/files.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 951db67483..90b5cf0ae8 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -307,4 +307,17 @@ bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	return result;
 }
 
+uint32 FileManager::FLONG(const Common::String &filename) {
+	Common::File f;
+	uint32 size;
+
+	if (!f.open(filename))
+		error("Could not find file %s", filename.c_str());
+
+	size = f.size();
+	f.close();
+	
+	return size;
+}
+
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From 9900adf18cd88196c949ccbc3033bea5ef58d975 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 19 Sep 2012 21:34:23 +1000
Subject: HOPKINS: Initial implementation of some code that will be needed for
 cursor display

---
 engines/hopkins/files.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 90b5cf0ae8..68c32bfde0 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -117,7 +117,12 @@ byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 	return data;
 }
 
+void FileManager::DMESS() {
+	// No implementation in original
+}
+
 void FileManager::DMESS1() {
+	// No implementation in original
 }
 
 int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes) {
-- 
cgit v1.2.3


From 1885141be56d3ce0acc58098876488c73ad26d2b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 26 Sep 2012 23:34:10 +1000
Subject: HOPKINS: Starting implementation of talk manager

---
 engines/hopkins/files.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 68c32bfde0..4e8eb0d80f 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -168,7 +168,7 @@ byte *FileManager::LIBERE_FICHIER(byte *ptr) {
 	return PTRNUL;
 }
 
-bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
+byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	byte *ptr = NULL;
 	Common::File f;
 
@@ -266,7 +266,7 @@ bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	}
 
 	// Scan for an entry in the catalogue
-	int result;
+	byte *result;
 	bool matchFlag = false;
 	int offsetVal = 0;
 	
@@ -304,9 +304,9 @@ bool FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 
 		bload_it(f, catData, GLOBALS.CAT_TAILLE);
 		f.close();
-		result = true;
+		result = catData;
 	} else {
-		result = false;
+		result = NULL;
 	}
 
 	return result;
-- 
cgit v1.2.3


From 7c9ad56aac27ea9dc799abc50314a0cdaa3fe0d9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Sep 2012 22:15:59 +1000
Subject: HOPKINS: Implemented many of the previously stubbed methods

---
 engines/hopkins/files.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 4e8eb0d80f..f84b597c9a 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -125,6 +125,15 @@ void FileManager::DMESS1() {
 	// No implementation in original
 }
 
+void FileManager::bload(const Common::String &file, byte *buf) {
+	Common::File f;
+	if (!f.open(file))
+		error("Error openinig file - %s", file.c_str());
+	int32 filesize = f.size();
+	FileManager::bload_it(f, buf, filesize);
+	f.close();
+}
+
 int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes) {
 	return stream.read(buf, nbytes);
 }
@@ -325,4 +334,8 @@ uint32 FileManager::FLONG(const Common::String &filename) {
 	return size;
 }
 
+void FileManager::CONSTRUIT_LINUX(const Common::String &file) {
+	warning("TODO: CONSTRUIT_LINUX");
+}
+
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From 8fa33e7714fca1aeb80834ee5d97bcfdf8a3efb1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 30 Sep 2012 21:02:39 +1000
Subject: HOPKINS: Implemented more object manager methods

---
 engines/hopkins/files.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index f84b597c9a..0708c1d178 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -117,6 +117,19 @@ byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 	return data;
 }
 
+void FileManager::CHARGE_FICHIER2(const Common::String &file, byte *buf) {
+	Common::File f;
+	size_t filesize;
+
+	DMESS1();
+	if (!f.open(file))
+		error("Error opening file - %s", file.c_str());
+
+	filesize = f.size();
+	FileManager::bload_it(f, buf, filesize);
+	f.close();
+}
+
 void FileManager::DMESS() {
 	// No implementation in original
 }
@@ -334,8 +347,8 @@ uint32 FileManager::FLONG(const Common::String &filename) {
 	return size;
 }
 
-void FileManager::CONSTRUIT_LINUX(const Common::String &file) {
-	warning("TODO: CONSTRUIT_LINUX");
+Common::String FileManager::CONSTRUIT_LINUX(const Common::String &file) {
+	return file;
 }
 
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From 575f179f0f3fc62d4173115c141c6641f794c9ab Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Oct 2012 23:21:10 +1000
Subject: HOPKINS: Converted the file manager from static to a standard manager
 class

---
 engines/hopkins/files.cpp | 117 ++++++++++++++++++++++++----------------------
 1 file changed, 62 insertions(+), 55 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 0708c1d178..a6a0d28cf3 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -31,6 +31,13 @@
 
 namespace Hopkins {
 
+FileManager::FileManager() {
+}
+
+void FileManager::setParent(HopkinsEngine *vm) {
+	_vm = vm;
+}
+
 void FileManager::initSaves() {
 	Common::String dataFilename = "HISCORE.DAT";
 	byte data[100];
@@ -107,7 +114,7 @@ byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 
 	// Allocate space for the file contents
 	size_t filesize = f.size();
-	byte *data = GLOBALS.dos_malloc2(filesize);
+	byte *data = _vm->_globals.dos_malloc2(filesize);
 	if (!data)
 		error("Error allocating space for file being loaded - %s", file.c_str());
 
@@ -126,7 +133,7 @@ void FileManager::CHARGE_FICHIER2(const Common::String &file, byte *buf) {
 		error("Error opening file - %s", file.c_str());
 
 	filesize = f.size();
-	FileManager::bload_it(f, buf, filesize);
+	_vm->_fileManager.bload_it(f, buf, filesize);
 	f.close();
 }
 
@@ -143,7 +150,7 @@ void FileManager::bload(const Common::String &file, byte *buf) {
 	if (!f.open(file))
 		error("Error openinig file - %s", file.c_str());
 	int32 filesize = f.size();
-	FileManager::bload_it(f, buf, filesize);
+	_vm->_fileManager.bload_it(f, buf, filesize);
 	f.close();
 }
 
@@ -152,26 +159,26 @@ int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes)
 }
 
 void FileManager::F_Censure() {
-	GLOBALS.CENSURE = false;
+	_vm->_globals.CENSURE = false;
 
 	CONSTRUIT_SYSTEM("BLOOD.DAT");
-	char *data = (char *)CHARGE_FICHIER(GLOBALS.NFICHIER);
+	char *data = (char *)CHARGE_FICHIER(_vm->_globals.NFICHIER);
   
 	if (*(data + 6) == 'f' && *(data + 7) == 'r')
-		GLOBALS.CENSURE = false;
+		_vm->_globals.CENSURE = false;
 	if (*(data + 6) == 'F' && *(data + 7) == 'R')
-		GLOBALS.CENSURE = false;
+		_vm->_globals.CENSURE = false;
 	if (*(data + 6) == 'u' && *(data + 7) == 'k')
-		GLOBALS.CENSURE = true;
+		_vm->_globals.CENSURE = true;
 	if (*(data + 6) == 'U' && *(data + 7) == 'K')
-		GLOBALS.CENSURE = true;
+		_vm->_globals.CENSURE = true;
 
 	free(data);
 }
 
 int FileManager::CONSTRUIT_SYSTEM(const Common::String &file) {
-	GLOBALS.NFICHIER = Common::String::format("system/%s", file.c_str());
-	return GLOBALS.NFICHIER.size();
+	_vm->_globals.NFICHIER = Common::String::format("system/%s", file.c_str());
+	return _vm->_globals.NFICHIER.size();
 }
 
 void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::String &file) {
@@ -182,7 +189,7 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::Str
 		error("TODO: CONSTRUIT_FICHIER");
 	}
 
-	GLOBALS.NFICHIER = Common::String::format("%s/%s", hop.c_str(), file.c_str());
+	_vm->_globals.NFICHIER = Common::String::format("%s/%s", hop.c_str(), file.c_str());
 }
 
 byte *FileManager::LIBERE_FICHIER(byte *ptr) {
@@ -196,91 +203,91 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 
 	switch (a2) {
 	case 1:
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_INI.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 		
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_INI.RES");
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.RES");
 		break;
 
 	case 2:
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_REP.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_REP.RES");
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.RES");
 		break;
 
 	case 3:
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_LIN.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_LIN.RES");
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.RES");
 		break;
 
 	case 4:
-		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_ANI.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
-		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_ANI.RES");
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.RES");
 		break;
 
 	case 5:
-		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_PER.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
-		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_PER.RES");
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.RES");
 		break;
 
 	case 6:
-		CONSTRUIT_FICHIER(GLOBALS.HOPIMAGE, "PIC.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPIMAGE, "PIC.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
 
 	case 7:
-		CONSTRUIT_FICHIER(GLOBALS.HOPANIM, "RES_SAN.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_SAN.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
 
 	case 8:
-		CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_SLI.CAT");
-		if (!f.exists(GLOBALS.NFICHIER))
+		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_SLI.CAT");
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
 
 	case 9:
-		switch (GLOBALS.FR) {
+		switch (_vm->_globals.FR) {
 		case 0:
-			CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_VAN.CAT");
+			CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_VAN.CAT");
 			break;
 		case 1:
-			CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_VFR.CAT");
+			CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_VFR.CAT");
 			break;
 		case 2:
-			CONSTRUIT_FICHIER(GLOBALS.HOPLINK, "RES_VES.CAT");
+			CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_VES.CAT");
 			break;
 		}
 
-		if (!f.exists(GLOBALS.NFICHIER))
+		if (!f.exists(_vm->_globals.NFICHIER))
 			return PTRNUL;
 
-		ptr = CHARGE_FICHIER(GLOBALS.NFICHIER);
+		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
 		// Deliberate fall-through to
 	default:
@@ -298,33 +305,33 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 		if (name == file) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
-			GLOBALS.CAT_POSI = READ_LE_UINT32(pData + 15);
-			GLOBALS.CAT_TAILLE = READ_LE_UINT32(pData + 19);
+			_vm->_globals.CAT_POSI = READ_LE_UINT32(pData + 15);
+			_vm->_globals.CAT_TAILLE = READ_LE_UINT32(pData + 19);
 			matchFlag = true;
 		}
 
 		if (name == "FINIS") {
-			GLOBALS.dos_free2(ptr);
+			_vm->_globals.dos_free2(ptr);
 			return false;
 		}
     
 		offsetVal += 23;
 	} while (!matchFlag);
 
-	GLOBALS.dos_free2(ptr);
+	_vm->_globals.dos_free2(ptr);
 
 	// TODO: Double check whether this really should be an unsigned int comparison
 	if ((uint16)(a2 - 6) > 1 && (uint16)(a2 - 8) > 1) {
-		if (!f.open(GLOBALS.NFICHIER))
+		if (!f.open(_vm->_globals.NFICHIER))
 			error("CHARGE_FICHIER");
 
-		f.seek(GLOBALS.CAT_POSI);
+		f.seek(_vm->_globals.CAT_POSI);
 
-		byte *catData = GLOBALS.dos_malloc2(GLOBALS.CAT_TAILLE);
+		byte *catData = _vm->_globals.dos_malloc2(_vm->_globals.CAT_TAILLE);
 		if (catData == PTRNUL)
 			error("CHARGE_FICHIER");
 
-		bload_it(f, catData, GLOBALS.CAT_TAILLE);
+		bload_it(f, catData, _vm->_globals.CAT_TAILLE);
 		f.close();
 		result = catData;
 	} else {
-- 
cgit v1.2.3


From 4e0738af23f2e83ee30777d22cf63a13ddf5f08e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 9 Oct 2012 00:21:03 +1100
Subject: HOPKINS: Bugfixes for INILINK initialisatoin

---
 engines/hopkins/files.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index a6a0d28cf3..fec9d859ef 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -200,6 +200,9 @@ byte *FileManager::LIBERE_FICHIER(byte *ptr) {
 byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	byte *ptr = NULL;
 	Common::File f;
+	
+	Common::String filename = file;
+	filename.toUppercase();
 
 	switch (a2) {
 	case 1:
-- 
cgit v1.2.3


From 02df605f797a4d553d594cb77014bf3ed5950e26 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Oct 2012 20:42:25 +1100
Subject: HOPKINS: Fix for filename case comparisons in LIBERE_FICHIER

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index fec9d859ef..87c1490ea2 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -305,7 +305,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	do {
 		Common::String name = (const char *)ptr + offsetVal;
     
-		if (name == file) {
+		if (name == filename) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
 			_vm->_globals.CAT_POSI = READ_LE_UINT32(pData + 15);
-- 
cgit v1.2.3


From 7ca9d2100f3fe0b9d23497bbd9c4885f9b3a92b2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Oct 2012 21:03:29 +1100
Subject: HOPKINS: Changed PTRNUL from being 0 to an explicitly allocated
 pointer.

Some of the methods explicitly differentiate between having a 0 result for invalid/abort versus PTRNUL return values
---
 engines/hopkins/files.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 87c1490ea2..de501d884c 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -194,7 +194,7 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::Str
 
 byte *FileManager::LIBERE_FICHIER(byte *ptr) {
 	free(ptr);
-	return PTRNUL;
+	return g_PTRNUL;
 }
 
 byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
@@ -208,7 +208,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 1:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 		
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.RES");
@@ -217,7 +217,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 2:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.RES");
@@ -226,7 +226,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 3:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.RES");
@@ -235,7 +235,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 4:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.RES");
@@ -244,7 +244,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 5:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.RES");
@@ -253,7 +253,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 6:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPIMAGE, "PIC.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
@@ -261,7 +261,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 7:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_SAN.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
@@ -269,7 +269,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	case 8:
 		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_SLI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
@@ -288,7 +288,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 		}
 
 		if (!f.exists(_vm->_globals.NFICHIER))
-			return PTRNUL;
+			return g_PTRNUL;
 
 		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
 		break;
@@ -331,7 +331,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 		f.seek(_vm->_globals.CAT_POSI);
 
 		byte *catData = _vm->_globals.dos_malloc2(_vm->_globals.CAT_TAILLE);
-		if (catData == PTRNUL)
+		if (catData == g_PTRNUL)
 			error("CHARGE_FICHIER");
 
 		bload_it(f, catData, _vm->_globals.CAT_TAILLE);
-- 
cgit v1.2.3


From b4247f6265e980b65aeb3c97f3c8875892cb8e92 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 20 Oct 2012 18:59:06 +0200
Subject: HOPKINS: Add some translated comments to function names

---
 engines/hopkins/files.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index de501d884c..1fe4eba2ac 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -46,6 +46,7 @@ void FileManager::initSaves() {
 	SAUVE_FICHIER(dataFilename, data, 100);
 }
 
+// Save File
 bool FileManager::SAUVE_FICHIER(const Common::String &file, const void *buf, size_t n) {
 	return bsave(file, buf, n);
 }
@@ -63,6 +64,7 @@ bool FileManager::bsave(const Common::String &file, const void *buf, size_t n) {
 		return false;
 }
 
+// Load INI File
 void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
 	char *iniData = (char *)CHARGE_FICHIER("config.ini");
 	char *ptr = iniData;
@@ -105,6 +107,7 @@ void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
 	free(iniData);
 }
 
+// Load File
 byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 	DMESS1();
 
@@ -124,6 +127,7 @@ byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 	return data;
 }
 
+// Load File 2
 void FileManager::CHARGE_FICHIER2(const Common::String &file, byte *buf) {
 	Common::File f;
 	size_t filesize;
@@ -137,10 +141,12 @@ void FileManager::CHARGE_FICHIER2(const Common::String &file, byte *buf) {
 	f.close();
 }
 
+// Guess: Debug Message
 void FileManager::DMESS() {
 	// No implementation in original
 }
 
+// Guess: Debug Message 1
 void FileManager::DMESS1() {
 	// No implementation in original
 }
@@ -158,6 +164,7 @@ int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes)
 	return stream.read(buf, nbytes);
 }
 
+// Censorship
 void FileManager::F_Censure() {
 	_vm->_globals.CENSURE = false;
 
@@ -176,11 +183,13 @@ void FileManager::F_Censure() {
 	free(data);
 }
 
+// Build System
 int FileManager::CONSTRUIT_SYSTEM(const Common::String &file) {
 	_vm->_globals.NFICHIER = Common::String::format("system/%s", file.c_str());
 	return _vm->_globals.NFICHIER.size();
 }
 
+// Build File
 void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::String &file) {
 	// At this point, the original program did a big switch statement to determine
 	// whether to preprend the CD or installed directory path into REPJEU
@@ -192,11 +201,13 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::Str
 	_vm->_globals.NFICHIER = Common::String::format("%s/%s", hop.c_str(), file.c_str());
 }
 
+// Free File
 byte *FileManager::LIBERE_FICHIER(byte *ptr) {
 	free(ptr);
 	return g_PTRNUL;
 }
 
+// Search Cat
 byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	byte *ptr = NULL;
 	Common::File f;
@@ -344,6 +355,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	return result;
 }
 
+// File Size
 uint32 FileManager::FLONG(const Common::String &filename) {
 	Common::File f;
 	uint32 size;
@@ -357,6 +369,7 @@ uint32 FileManager::FLONG(const Common::String &filename) {
 	return size;
 }
 
+// Build Linux
 Common::String FileManager::CONSTRUIT_LINUX(const Common::String &file) {
 	return file;
 }
-- 
cgit v1.2.3


From c593f752968a0ceaa7bd7f70244c26caa2ab2efb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 23 Oct 2012 20:07:19 +1100
Subject: HOPKINS: Replaced loading configuration from .ini file to use
 hard-coded array

---
 engines/hopkins/files.cpp | 49 ++++++++++-------------------------------------
 1 file changed, 10 insertions(+), 39 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 1fe4eba2ac..151a9a84f8 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -66,45 +66,16 @@ bool FileManager::bsave(const Common::String &file, const void *buf, size_t n) {
 
 // Load INI File
 void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
-	char *iniData = (char *)CHARGE_FICHIER("config.ini");
-	char *ptr = iniData;
-
-	bool endOfFile = false;
-	while (!endOfFile) {
-		if (*ptr == '%') {
-			if (*(ptr + 1) == '%') {
-				endOfFile = true;
-			} else {
-				++ptr;
-
-				// Get the parameter name
-				Common::String paramName;
-				while (*ptr == ' ') 
-					++ptr;
-				while (*ptr != '=') {
-					paramName += toupper(*ptr++);
-				}
-				while (paramName.lastChar() == ' ')
-					paramName.deleteLastChar();
-
-				// Get the parameter value
-				Common::String paramValue;
-				while (*++ptr == ' ') 
-					;
-				while (*ptr != ';') {
-					paramValue += toupper(*ptr++);
-				}
-				while (paramValue.lastChar() == ' ')
-					paramValue.deleteLastChar();
-
-				iniParams[paramName] = paramValue;
-			}
-		}
-    
-		++ptr;
-	}
-
-	free(iniData);
+	// TODO: Review whether we can do something cleaner with ScummVM initialisation than 
+	// just initialising the INI array as if it had read in the INI file
+
+	iniParams["FULLSCREEN"] = "NO";
+	iniParams["SETMODE"] = "1";		// 640x480
+	iniParams["ZOOM"] = "100";		// No zooming
+	iniParams["VIDEOMEM"] = "YES";
+	iniParams["FORCE8BITS"] = "NO";
+	iniParams["FORCE16BITS"] = "YES";
+	iniParams["SOUND"] = "YES";
 }
 
 // Load File
-- 
cgit v1.2.3


From 38b5cf1efe0ab75c7100714fb886a704a4661fda Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 24 Oct 2012 22:49:32 +1100
Subject: HOPKINS: Created new SaveFileManager class to handle save file
 related code

---
 engines/hopkins/files.cpp | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 151a9a84f8..79b672ca33 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -38,32 +38,6 @@ void FileManager::setParent(HopkinsEngine *vm) {
 	_vm = vm;
 }
 
-void FileManager::initSaves() {
-	Common::String dataFilename = "HISCORE.DAT";
-	byte data[100];
-	Common::fill(&data[0], &data[100], 0);
-	
-	SAUVE_FICHIER(dataFilename, data, 100);
-}
-
-// Save File
-bool FileManager::SAUVE_FICHIER(const Common::String &file, const void *buf, size_t n) {
-	return bsave(file, buf, n);
-}
-
-bool FileManager::bsave(const Common::String &file, const void *buf, size_t n) {
-	Common::OutSaveFile *f = g_system->getSavefileManager()->openForSaving(file);
-
-	if (f) {
-		size_t bytesWritten = f->write(buf, n);
-		f->finalize();
-		delete f;
-
-		return bytesWritten == n;
-	} else 
-		return false;
-}
-
 // Load INI File
 void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
 	// TODO: Review whether we can do something cleaner with ScummVM initialisation than 
@@ -342,6 +316,7 @@ uint32 FileManager::FLONG(const Common::String &filename) {
 
 // Build Linux
 Common::String FileManager::CONSTRUIT_LINUX(const Common::String &file) {
+	_vm->_globals.NFICHIER = file;
 	return file;
 }
 
-- 
cgit v1.2.3


From 6d1db995408f3325824698b330300a0292a49931 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 16 Nov 2012 08:32:40 +0100
Subject: HOPKINS: Remove some magic values, add a safety check in
 Copy_Video_Vbe16

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 79b672ca33..aafa56691f 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -99,7 +99,7 @@ void FileManager::DMESS1() {
 void FileManager::bload(const Common::String &file, byte *buf) {
 	Common::File f;
 	if (!f.open(file))
-		error("Error openinig file - %s", file.c_str());
+		error("Error opening file - %s", file.c_str());
 	int32 filesize = f.size();
 	_vm->_fileManager.bload_it(f, buf, filesize);
 	f.close();
-- 
cgit v1.2.3


From 848dcbcf0993f7bb15d16db4d65daaa0d4ffaf82 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Nov 2012 15:13:52 +1100
Subject: HOPKINS: Properly implemented CONSTRUIT_FICHIER for animations.

The game has separate folders for selected animations at different resolutions.
---
 engines/hopkins/files.cpp | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index aafa56691f..daa618d7c2 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -134,16 +134,43 @@ int FileManager::CONSTRUIT_SYSTEM(const Common::String &file) {
 	return _vm->_globals.NFICHIER.size();
 }
 
-// Build File
-void FileManager::CONSTRUIT_FICHIER(const Common::String &hop, const Common::String &file) {
-	// At this point, the original program did a big switch statement to determine
-	// whether to preprend the CD or installed directory path into REPJEU
+void FileManager::CONSTRUIT_FICHIER(const Common::String &folder, const Common::String &file) {
+	Common::String folderToUse = folder;
 
-	if (hop[0] == 'A' && hop[1] == 'N' && hop[2] == 'N') {
-		error("TODO: CONSTRUIT_FICHIER");
+	// A lot of the code in the original engine based on COPIE_SEQ was used to determine
+	// whether a file resided on the CD or hard disk. Since the ScummVM implementatoin
+	// requires all the files in the same location, we only need to do a somewhat simpler
+	// check for animations that don't exist in the ANM folder, but rather in special
+	// sub-folders depending on the physical screen resolution being used.
+
+	if (folder == "ANM") {
+		switch (_vm->_globals.SVGA) {
+		case 1:
+			if (TEST_REP(folderToUse, file))
+				folderToUse = "TSVGA";
+			break;
+		case 2:
+			if (TEST_REP(folderToUse, file))
+				folderToUse = "SVGA";
+			break;
+		case 3:
+			if (TEST_REP(folderToUse, file))
+				folderToUse = "VGA";
+			break;
+		default:
+			break;
+		}
 	}
 
-	_vm->_globals.NFICHIER = Common::String::format("%s/%s", hop.c_str(), file.c_str());
+	_vm->_globals.NFICHIER = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
+}
+
+bool FileManager::TEST_REP(const Common::String &folder, const Common::String &file) {
+	Common::String filename = folder.empty() ? file : 
+		Common::String::format("%s/%s", folder.c_str(), file.c_str());
+
+	Common::File f;
+	return !f.exists(filename);
 }
 
 // Free File
-- 
cgit v1.2.3


From 8b0ae07969dbdbeb9ad955ab1f23c570ca300167 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 17 Nov 2012 09:59:50 +0100
Subject: HOPKINS: Use common::string instead of hardcoded values in
 CONSTRUIT_FICHIER

---
 engines/hopkins/files.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index daa618d7c2..bc523af254 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -143,19 +143,19 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &folder, const Common::
 	// check for animations that don't exist in the ANM folder, but rather in special
 	// sub-folders depending on the physical screen resolution being used.
 
-	if (folder == "ANM") {
+	if (folder == _vm->_globals.HOPANM) {
 		switch (_vm->_globals.SVGA) {
 		case 1:
 			if (TEST_REP(folderToUse, file))
-				folderToUse = "TSVGA";
+				folderToUse = _vm->_globals.HOPTSVGA;
 			break;
 		case 2:
 			if (TEST_REP(folderToUse, file))
-				folderToUse = "SVGA";
+				folderToUse = _vm->_globals.HOPSVGA;
 			break;
 		case 3:
 			if (TEST_REP(folderToUse, file))
-				folderToUse = "VGA";
+				folderToUse = _vm->_globals.HOPVGA;
 			break;
 		default:
 			break;
-- 
cgit v1.2.3


From cdbba33e38c341619222b93b3200776a1026304b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 17 Nov 2012 23:09:16 +0100
Subject: HOPKINS: Fix PCX loading when no present in CAT file.

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index bc523af254..13e54bb288 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -298,7 +298,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 
 		if (name == "FINIS") {
 			_vm->_globals.dos_free2(ptr);
-			return false;
+			return g_PTRNUL;
 		}
     
 		offsetVal += 23;
-- 
cgit v1.2.3


From 384ca5dd827c1a62d81a957fbfd3a18ed47a56e0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 23 Nov 2012 22:21:35 +0100
Subject: HOPKINS: Fix CppCheck warnings

---
 engines/hopkins/files.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 13e54bb288..a5d193fda7 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -285,7 +285,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	bool matchFlag = false;
 	int offsetVal = 0;
 	
-	do {
+	while (!matchFlag) {
 		Common::String name = (const char *)ptr + offsetVal;
     
 		if (name == filename) {
@@ -302,7 +302,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 		}
     
 		offsetVal += 23;
-	} while (!matchFlag);
+	}
 
 	_vm->_globals.dos_free2(ptr);
 
-- 
cgit v1.2.3


From 5ac76b5c5256f15f0f1b41d6c209139147a4d2e4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 6 Dec 2012 08:02:30 +0100
Subject: HOPKINS: Remove useless tests in CENSURE()

---
 engines/hopkins/files.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index a5d193fda7..fbbac191c2 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -115,11 +115,7 @@ void FileManager::F_Censure() {
 
 	CONSTRUIT_SYSTEM("BLOOD.DAT");
 	char *data = (char *)CHARGE_FICHIER(_vm->_globals.NFICHIER);
-  
-	if (*(data + 6) == 'f' && *(data + 7) == 'r')
-		_vm->_globals.CENSURE = false;
-	if (*(data + 6) == 'F' && *(data + 7) == 'R')
-		_vm->_globals.CENSURE = false;
+
 	if (*(data + 6) == 'u' && *(data + 7) == 'k')
 		_vm->_globals.CENSURE = true;
 	if (*(data + 6) == 'U' && *(data + 7) == 'K')
-- 
cgit v1.2.3


From 867cbbf4ff6ddfca826724a7ff74f44a06e8d044 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 9 Dec 2012 20:22:12 +0100
Subject: HOPKINS: Refactor fileManager

---
 engines/hopkins/files.cpp | 172 ++++++++++++++++++++--------------------------
 1 file changed, 74 insertions(+), 98 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index fbbac191c2..f251d51388 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -38,8 +38,10 @@ void FileManager::setParent(HopkinsEngine *vm) {
 	_vm = vm;
 }
 
-// Load INI File
-void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
+/**
+ * Load INI File
+ */
+void FileManager::loadIniFile(Common::StringMap &iniParams) {
 	// TODO: Review whether we can do something cleaner with ScummVM initialisation than 
 	// just initialising the INI array as if it had read in the INI file
 
@@ -52,10 +54,10 @@ void FileManager::Chage_Inifile(Common::StringMap &iniParams) {
 	iniParams["SOUND"] = "YES";
 }
 
-// Load File
-byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
-	DMESS1();
-
+/**
+ * Load a file
+ */
+byte *FileManager::loadFile(const Common::String &file) {
 	Common::File f;
 	if (!f.open(file))
 		error("Error opening %s", file.c_str());
@@ -66,55 +68,27 @@ byte *FileManager::CHARGE_FICHIER(const Common::String &file) {
 	if (!data)
 		error("Error allocating space for file being loaded - %s", file.c_str());
 
-	bload_it(f, data, filesize);
+	readStream(f, data, filesize);
 	f.close();
   
 	return data;
 }
 
-// Load File 2
-void FileManager::CHARGE_FICHIER2(const Common::String &file, byte *buf) {
-	Common::File f;
-	size_t filesize;
-
-	DMESS1();
-	if (!f.open(file))
-		error("Error opening file - %s", file.c_str());
-
-	filesize = f.size();
-	_vm->_fileManager.bload_it(f, buf, filesize);
-	f.close();
-}
-
-// Guess: Debug Message
-void FileManager::DMESS() {
-	// No implementation in original
-}
-
-// Guess: Debug Message 1
-void FileManager::DMESS1() {
-	// No implementation in original
-}
-
-void FileManager::bload(const Common::String &file, byte *buf) {
-	Common::File f;
-	if (!f.open(file))
-		error("Error opening file - %s", file.c_str());
-	int32 filesize = f.size();
-	_vm->_fileManager.bload_it(f, buf, filesize);
-	f.close();
-}
-
-int FileManager::bload_it(Common::ReadStream &stream, void *buf, size_t nbytes) {
+/**
+ * Read a given number of bytes from a Stream into a pre-allocated buffer
+ */
+int FileManager::readStream(Common::ReadStream &stream, void *buf, size_t nbytes) {
 	return stream.read(buf, nbytes);
 }
 
-// Censorship
-void FileManager::F_Censure() {
+/**
+ * Initialize censorship based on blood.dat file
+ */
+void FileManager::initCensorship() {
 	_vm->_globals.CENSURE = false;
 
-	CONSTRUIT_SYSTEM("BLOOD.DAT");
-	char *data = (char *)CHARGE_FICHIER(_vm->_globals.NFICHIER);
+	constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
+	char *data = (char *)loadFile(_vm->_globals.NFICHIER);
 
 	if (*(data + 6) == 'u' && *(data + 7) == 'k')
 		_vm->_globals.CENSURE = true;
@@ -124,13 +98,12 @@ void FileManager::F_Censure() {
 	free(data);
 }
 
-// Build System
-int FileManager::CONSTRUIT_SYSTEM(const Common::String &file) {
-	_vm->_globals.NFICHIER = Common::String::format("system/%s", file.c_str());
-	return _vm->_globals.NFICHIER.size();
-}
-
-void FileManager::CONSTRUIT_FICHIER(const Common::String &folder, const Common::String &file) {
+/**
+ * Construct a filename based on a suggested folder and filename.
+ * @param folder		Folder to use. May be overriden for animations.
+ * @param file			Filename
+ */
+void FileManager::constructFilename(const Common::String &folder, const Common::String &file) {
 	Common::String folderToUse = folder;
 
 	// A lot of the code in the original engine based on COPIE_SEQ was used to determine
@@ -142,15 +115,15 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &folder, const Common::
 	if (folder == _vm->_globals.HOPANM) {
 		switch (_vm->_globals.SVGA) {
 		case 1:
-			if (TEST_REP(folderToUse, file))
+			if (fileExists(folderToUse, file))
 				folderToUse = _vm->_globals.HOPTSVGA;
 			break;
 		case 2:
-			if (TEST_REP(folderToUse, file))
+			if (fileExists(folderToUse, file))
 				folderToUse = _vm->_globals.HOPSVGA;
 			break;
 		case 3:
-			if (TEST_REP(folderToUse, file))
+			if (fileExists(folderToUse, file))
 				folderToUse = _vm->_globals.HOPVGA;
 			break;
 		default:
@@ -161,7 +134,18 @@ void FileManager::CONSTRUIT_FICHIER(const Common::String &folder, const Common::
 	_vm->_globals.NFICHIER = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
 }
 
-bool FileManager::TEST_REP(const Common::String &folder, const Common::String &file) {
+/**
+ * Construct Linux filename
+ */
+Common::String FileManager::constructLinuxFilename(const Common::String &file) {
+	_vm->_globals.NFICHIER = file;
+	return file;
+}
+
+/**
+ * Check if a file is present in a given (optional) folder
+ */
+bool FileManager::fileExists(const Common::String &folder, const Common::String &file) {
 	Common::String filename = folder.empty() ? file : 
 		Common::String::format("%s/%s", folder.c_str(), file.c_str());
 
@@ -169,14 +153,10 @@ bool FileManager::TEST_REP(const Common::String &folder, const Common::String &f
 	return !f.exists(filename);
 }
 
-// Free File
-byte *FileManager::LIBERE_FICHIER(byte *ptr) {
-	free(ptr);
-	return g_PTRNUL;
-}
-
-// Search Cat
-byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
+/**
+ * Search file in Cat file
+ */
+byte *FileManager::searchCat(const Common::String &file, int a2) {
 	byte *ptr = NULL;
 	Common::File f;
 	
@@ -185,91 +165,91 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 
 	switch (a2) {
 	case 1:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.CAT");
+		constructFilename(_vm->_globals.HOPLINK, "RES_INI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 		
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_INI.RES");
+		ptr = loadFile(_vm->_globals.NFICHIER);
+		constructFilename(_vm->_globals.HOPLINK, "RES_INI.RES");
 		break;
 
 	case 2:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.CAT");
+		constructFilename(_vm->_globals.HOPLINK, "RES_REP.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_REP.RES");
+		ptr = loadFile(_vm->_globals.NFICHIER);
+		constructFilename(_vm->_globals.HOPLINK, "RES_REP.RES");
 		break;
 
 	case 3:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.CAT");
+		constructFilename(_vm->_globals.HOPLINK, "RES_LIN.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_LIN.RES");
+		ptr = loadFile(_vm->_globals.NFICHIER);
+		constructFilename(_vm->_globals.HOPLINK, "RES_LIN.RES");
 		break;
 
 	case 4:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.CAT");
+		constructFilename(_vm->_globals.HOPANIM, "RES_ANI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
-		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_ANI.RES");
+		ptr = loadFile(_vm->_globals.NFICHIER);
+		constructFilename(_vm->_globals.HOPANIM, "RES_ANI.RES");
 		break;
 
 	case 5:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.CAT");
+		constructFilename(_vm->_globals.HOPANIM, "RES_PER.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
-		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_PER.RES");
+		ptr = loadFile(_vm->_globals.NFICHIER);
+		constructFilename(_vm->_globals.HOPANIM, "RES_PER.RES");
 		break;
 
 	case 6:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPIMAGE, "PIC.CAT");
+		constructFilename(_vm->_globals.HOPIMAGE, "PIC.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals.NFICHIER);
 		break;
 
 	case 7:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPANIM, "RES_SAN.CAT");
+		constructFilename(_vm->_globals.HOPANIM, "RES_SAN.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals.NFICHIER);
 		break;
 
 	case 8:
-		CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_SLI.CAT");
+		constructFilename(_vm->_globals.HOPLINK, "RES_SLI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals.NFICHIER);
 		break;
 
 	case 9:
 		switch (_vm->_globals.FR) {
 		case 0:
-			CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_VAN.CAT");
+			constructFilename(_vm->_globals.HOPLINK, "RES_VAN.CAT");
 			break;
 		case 1:
-			CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_VFR.CAT");
+			constructFilename(_vm->_globals.HOPLINK, "RES_VFR.CAT");
 			break;
 		case 2:
-			CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, "RES_VES.CAT");
+			constructFilename(_vm->_globals.HOPLINK, "RES_VES.CAT");
 			break;
 		}
 
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
 
-		ptr = CHARGE_FICHIER(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals.NFICHIER);
 		break;
 		// Deliberate fall-through to
 	default:
@@ -313,7 +293,7 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 		if (catData == g_PTRNUL)
 			error("CHARGE_FICHIER");
 
-		bload_it(f, catData, _vm->_globals.CAT_TAILLE);
+		readStream(f, catData, _vm->_globals.CAT_TAILLE);
 		f.close();
 		result = catData;
 	} else {
@@ -323,8 +303,10 @@ byte *FileManager::RECHERCHE_CAT(const Common::String &file, int a2) {
 	return result;
 }
 
-// File Size
-uint32 FileManager::FLONG(const Common::String &filename) {
+/**
+ * Returns the size of a file. Throws an error if the file can't be found
+ */
+uint32 FileManager::fileSize(const Common::String &filename) {
 	Common::File f;
 	uint32 size;
 
@@ -337,10 +319,4 @@ uint32 FileManager::FLONG(const Common::String &filename) {
 	return size;
 }
 
-// Build Linux
-Common::String FileManager::CONSTRUIT_LINUX(const Common::String &file) {
-	_vm->_globals.NFICHIER = file;
-	return file;
-}
-
 } // End of namespace Hopkins
-- 
cgit v1.2.3


From eece86d78e6821638772da0a5198e690c0f08745 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Dec 2012 08:05:04 +0100
Subject: HOPKINS: Homogenization of memory management

---
 engines/hopkins/files.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index f251d51388..998ab57fc5 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -64,7 +64,7 @@ byte *FileManager::loadFile(const Common::String &file) {
 
 	// Allocate space for the file contents
 	size_t filesize = f.size();
-	byte *data = _vm->_globals.dos_malloc2(filesize);
+	byte *data = _vm->_globals.allocMemory(filesize);
 	if (!data)
 		error("Error allocating space for file being loaded - %s", file.c_str());
 
@@ -273,14 +273,14 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		}
 
 		if (name == "FINIS") {
-			_vm->_globals.dos_free2(ptr);
+			_vm->_globals.freeMemory(ptr);
 			return g_PTRNUL;
 		}
     
 		offsetVal += 23;
 	}
 
-	_vm->_globals.dos_free2(ptr);
+	_vm->_globals.freeMemory(ptr);
 
 	// TODO: Double check whether this really should be an unsigned int comparison
 	if ((uint16)(a2 - 6) > 1 && (uint16)(a2 - 8) > 1) {
@@ -289,7 +289,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 
 		f.seek(_vm->_globals.CAT_POSI);
 
-		byte *catData = _vm->_globals.dos_malloc2(_vm->_globals.CAT_TAILLE);
+		byte *catData = _vm->_globals.allocMemory(_vm->_globals.CAT_TAILLE);
 		if (catData == g_PTRNUL)
 			error("CHARGE_FICHIER");
 
-- 
cgit v1.2.3


From 95025312a7c3b184fef3818ece1f1d55b7fb19d1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 14 Dec 2012 01:49:22 +0100
Subject: HOPKINS: Janitorial - Remove trailing space and double semi columns

---
 engines/hopkins/files.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 998ab57fc5..04d4dab3cd 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -42,7 +42,7 @@ void FileManager::setParent(HopkinsEngine *vm) {
  * Load INI File
  */
 void FileManager::loadIniFile(Common::StringMap &iniParams) {
-	// TODO: Review whether we can do something cleaner with ScummVM initialisation than 
+	// TODO: Review whether we can do something cleaner with ScummVM initialisation than
 	// just initialising the INI array as if it had read in the INI file
 
 	iniParams["FULLSCREEN"] = "NO";
@@ -70,7 +70,7 @@ byte *FileManager::loadFile(const Common::String &file) {
 
 	readStream(f, data, filesize);
 	f.close();
-  
+
 	return data;
 }
 
@@ -146,7 +146,7 @@ Common::String FileManager::constructLinuxFilename(const Common::String &file) {
  * Check if a file is present in a given (optional) folder
  */
 bool FileManager::fileExists(const Common::String &folder, const Common::String &file) {
-	Common::String filename = folder.empty() ? file : 
+	Common::String filename = folder.empty() ? file :
 		Common::String::format("%s/%s", folder.c_str(), file.c_str());
 
 	Common::File f;
@@ -159,7 +159,7 @@ bool FileManager::fileExists(const Common::String &folder, const Common::String
 byte *FileManager::searchCat(const Common::String &file, int a2) {
 	byte *ptr = NULL;
 	Common::File f;
-	
+
 	Common::String filename = file;
 	filename.toUppercase();
 
@@ -168,7 +168,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		constructFilename(_vm->_globals.HOPLINK, "RES_INI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
-		
+
 		ptr = loadFile(_vm->_globals.NFICHIER);
 		constructFilename(_vm->_globals.HOPLINK, "RES_INI.RES");
 		break;
@@ -260,10 +260,10 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 	byte *result;
 	bool matchFlag = false;
 	int offsetVal = 0;
-	
+
 	while (!matchFlag) {
 		Common::String name = (const char *)ptr + offsetVal;
-    
+
 		if (name == filename) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
@@ -276,7 +276,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 			_vm->_globals.freeMemory(ptr);
 			return g_PTRNUL;
 		}
-    
+
 		offsetVal += 23;
 	}
 
@@ -315,7 +315,7 @@ uint32 FileManager::fileSize(const Common::String &filename) {
 
 	size = f.size();
 	f.close();
-	
+
 	return size;
 }
 
-- 
cgit v1.2.3


From 3c31d91d97c6f621e7f9bc22e3efe3b8ca38a079 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 16 Dec 2012 00:26:54 +0100
Subject: HOPKINS: Remove zoom, mode, SDL Zoom and fullscreen variables

Also remove functions related to the loading of INI files
---
 engines/hopkins/files.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 04d4dab3cd..3e840ed60e 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -38,22 +38,6 @@ void FileManager::setParent(HopkinsEngine *vm) {
 	_vm = vm;
 }
 
-/**
- * Load INI File
- */
-void FileManager::loadIniFile(Common::StringMap &iniParams) {
-	// TODO: Review whether we can do something cleaner with ScummVM initialisation than
-	// just initialising the INI array as if it had read in the INI file
-
-	iniParams["FULLSCREEN"] = "NO";
-	iniParams["SETMODE"] = "1";		// 640x480
-	iniParams["ZOOM"] = "100";		// No zooming
-	iniParams["VIDEOMEM"] = "YES";
-	iniParams["FORCE8BITS"] = "NO";
-	iniParams["FORCE16BITS"] = "YES";
-	iniParams["SOUND"] = "YES";
-}
-
 /**
  * Load a file
  */
-- 
cgit v1.2.3


From 076546d41d1454c87317b5e53c2b322865331d92 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 19 Dec 2012 08:00:22 +0100
Subject: HOPKINS: More renaming

---
 engines/hopkins/files.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 3e840ed60e..8ab86bb180 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -251,8 +251,8 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		if (name == filename) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
-			_vm->_globals.CAT_POSI = READ_LE_UINT32(pData + 15);
-			_vm->_globals.CAT_TAILLE = READ_LE_UINT32(pData + 19);
+			_vm->_globals._catalogPos = READ_LE_UINT32(pData + 15);
+			_vm->_globals._catalogSize = READ_LE_UINT32(pData + 19);
 			matchFlag = true;
 		}
 
@@ -271,13 +271,13 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		if (!f.open(_vm->_globals.NFICHIER))
 			error("CHARGE_FICHIER");
 
-		f.seek(_vm->_globals.CAT_POSI);
+		f.seek(_vm->_globals._catalogPos);
 
-		byte *catData = _vm->_globals.allocMemory(_vm->_globals.CAT_TAILLE);
+		byte *catData = _vm->_globals.allocMemory(_vm->_globals._catalogSize);
 		if (catData == g_PTRNUL)
 			error("CHARGE_FICHIER");
 
-		readStream(f, catData, _vm->_globals.CAT_TAILLE);
+		readStream(f, catData, _vm->_globals._catalogSize);
 		f.close();
 		result = catData;
 	} else {
-- 
cgit v1.2.3


From 0120107a6d0884ddf4655b4c22d13f2b75319152 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 22 Dec 2012 14:26:07 +0100
Subject: HOPKINS: Implement code for OS/2 version

---
 engines/hopkins/files.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 8ab86bb180..c888bcbd67 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -71,15 +71,18 @@ int FileManager::readStream(Common::ReadStream &stream, void *buf, size_t nbytes
 void FileManager::initCensorship() {
 	_vm->_globals.CENSURE = false;
 
-	constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
-	char *data = (char *)loadFile(_vm->_globals.NFICHIER);
+	// If file doesn't exist, fallback to uncensored
+	if (!fileExists(_vm->_globals.HOPSYSTEM, "BLOOD.DAT")) {
+		constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
+		char *data = (char *)loadFile(_vm->_globals.NFICHIER);
 
-	if (*(data + 6) == 'u' && *(data + 7) == 'k')
-		_vm->_globals.CENSURE = true;
-	if (*(data + 6) == 'U' && *(data + 7) == 'K')
-		_vm->_globals.CENSURE = true;
+		if (*(data + 6) == 'u' && *(data + 7) == 'k')
+			_vm->_globals.CENSURE = true;
+		if (*(data + 6) == 'U' && *(data + 7) == 'K')
+			_vm->_globals.CENSURE = true;
 
-	free(data);
+		free(data);
+	}
 }
 
 /**
-- 
cgit v1.2.3


From 8c1f422bd68fe23c4e73ba3d3b13de028c905134 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Dec 2012 11:36:53 +0100
Subject: HOPKINS: Remove magic values used to check language, some renaming
 and refactoring

---
 engines/hopkins/files.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index c888bcbd67..6fefd1eb22 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -221,14 +221,14 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		break;
 
 	case 9:
-		switch (_vm->_globals.FR) {
-		case 0:
+		switch (_vm->_globals._language) {
+		case LANG_EN:
 			constructFilename(_vm->_globals.HOPLINK, "RES_VAN.CAT");
 			break;
-		case 1:
+		case LANG_FR:
 			constructFilename(_vm->_globals.HOPLINK, "RES_VFR.CAT");
 			break;
-		case 2:
+		case LANG_SP:
 			constructFilename(_vm->_globals.HOPLINK, "RES_VES.CAT");
 			break;
 		}
-- 
cgit v1.2.3


From 59e85997b3debece5e920d7612fe33ccc9931934 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 26 Dec 2012 00:31:42 +0100
Subject: HOPKINS: Load correct voice ressource file in BeOS and OS/2 versions

---
 engines/hopkins/files.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 6fefd1eb22..1971b82a2a 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -221,16 +221,21 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		break;
 
 	case 9:
-		switch (_vm->_globals._language) {
-		case LANG_EN:
-			constructFilename(_vm->_globals.HOPLINK, "RES_VAN.CAT");
-			break;
-		case LANG_FR:
-			constructFilename(_vm->_globals.HOPLINK, "RES_VFR.CAT");
-			break;
-		case LANG_SP:
-			constructFilename(_vm->_globals.HOPLINK, "RES_VES.CAT");
-			break;
+		if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
+			_vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "ENG_VOI.RES");
+		// Win95 and Linux versions uses another set of names
+		else {
+			switch (_vm->_globals._language) {
+			case LANG_EN:
+				constructFilename(_vm->_globals.HOPLINK, "RES_VAN.CAT");
+				break;
+			case LANG_FR:
+				constructFilename(_vm->_globals.HOPLINK, "RES_VFR.CAT");
+				break;
+			case LANG_SP:
+				constructFilename(_vm->_globals.HOPLINK, "RES_VES.CAT");
+				break;
+			}
 		}
 
 		if (!f.exists(_vm->_globals.NFICHIER))
-- 
cgit v1.2.3


From c9343637902ed94f0a511ff9fa0d1bffe346d5e3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 28 Dec 2012 08:26:27 +0100
Subject: HOPKINS: Some more renaming and refactoring

---
 engines/hopkins/files.cpp | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 1971b82a2a..6c792017ef 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -74,7 +74,7 @@ void FileManager::initCensorship() {
 	// If file doesn't exist, fallback to uncensored
 	if (!fileExists(_vm->_globals.HOPSYSTEM, "BLOOD.DAT")) {
 		constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
-		char *data = (char *)loadFile(_vm->_globals.NFICHIER);
+		char *data = (char *)loadFile(_vm->_globals._curFilename);
 
 		if (*(data + 6) == 'u' && *(data + 7) == 'k')
 			_vm->_globals.CENSURE = true;
@@ -118,14 +118,14 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
 		}
 	}
 
-	_vm->_globals.NFICHIER = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
+	_vm->_globals._curFilename = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
 }
 
 /**
  * Construct Linux filename
  */
 Common::String FileManager::constructLinuxFilename(const Common::String &file) {
-	_vm->_globals.NFICHIER = file;
+	_vm->_globals._curFilename = file;
 	return file;
 }
 
@@ -153,71 +153,71 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 	switch (a2) {
 	case 1:
 		constructFilename(_vm->_globals.HOPLINK, "RES_INI.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		constructFilename(_vm->_globals.HOPLINK, "RES_INI.RES");
 		break;
 
 	case 2:
 		constructFilename(_vm->_globals.HOPLINK, "RES_REP.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		constructFilename(_vm->_globals.HOPLINK, "RES_REP.RES");
 		break;
 
 	case 3:
 		constructFilename(_vm->_globals.HOPLINK, "RES_LIN.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		constructFilename(_vm->_globals.HOPLINK, "RES_LIN.RES");
 		break;
 
 	case 4:
 		constructFilename(_vm->_globals.HOPANIM, "RES_ANI.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		constructFilename(_vm->_globals.HOPANIM, "RES_ANI.RES");
 		break;
 
 	case 5:
 		constructFilename(_vm->_globals.HOPANIM, "RES_PER.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		constructFilename(_vm->_globals.HOPANIM, "RES_PER.RES");
 		break;
 
 	case 6:
 		constructFilename(_vm->_globals.HOPIMAGE, "PIC.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		break;
 
 	case 7:
 		constructFilename(_vm->_globals.HOPANIM, "RES_SAN.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		break;
 
 	case 8:
 		constructFilename(_vm->_globals.HOPLINK, "RES_SLI.CAT");
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		break;
 
 	case 9:
@@ -238,10 +238,10 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 			}
 		}
 
-		if (!f.exists(_vm->_globals.NFICHIER))
+		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals.NFICHIER);
+		ptr = loadFile(_vm->_globals._curFilename);
 		break;
 		// Deliberate fall-through to
 	default:
@@ -276,7 +276,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 
 	// TODO: Double check whether this really should be an unsigned int comparison
 	if ((uint16)(a2 - 6) > 1 && (uint16)(a2 - 8) > 1) {
-		if (!f.open(_vm->_globals.NFICHIER))
+		if (!f.open(_vm->_globals._curFilename))
 			error("CHARGE_FICHIER");
 
 		f.seek(_vm->_globals._catalogPos);
-- 
cgit v1.2.3


From f59f7dafc3f6a5bc9210acf87a9355fadba6510a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 31 Dec 2012 00:18:08 +0100
Subject: HOPKINS: Refactoring in FontManager and LinesManager

---
 engines/hopkins/files.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 6c792017ef..30570939d2 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -69,17 +69,15 @@ int FileManager::readStream(Common::ReadStream &stream, void *buf, size_t nbytes
  * Initialize censorship based on blood.dat file
  */
 void FileManager::initCensorship() {
-	_vm->_globals.CENSURE = false;
+	_vm->_globals._censorshipFl = false;
 
 	// If file doesn't exist, fallback to uncensored
 	if (!fileExists(_vm->_globals.HOPSYSTEM, "BLOOD.DAT")) {
 		constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
 		char *data = (char *)loadFile(_vm->_globals._curFilename);
 
-		if (*(data + 6) == 'u' && *(data + 7) == 'k')
-			_vm->_globals.CENSURE = true;
-		if (*(data + 6) == 'U' && *(data + 7) == 'K')
-			_vm->_globals.CENSURE = true;
+		if ((data[6] == 'u' && data[7] == 'k') || (data[6] == 'U' && data[7] == 'K'))
+			_vm->_globals._censorshipFl = true;
 
 		free(data);
 	}
-- 
cgit v1.2.3


From be83708ef5b65db4ea3893b61d189f30c92685b6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 7 Jan 2013 13:58:54 +0200
Subject: HOPKINS: Fix typo

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 30570939d2..f0238205fd 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -92,7 +92,7 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
 	Common::String folderToUse = folder;
 
 	// A lot of the code in the original engine based on COPIE_SEQ was used to determine
-	// whether a file resided on the CD or hard disk. Since the ScummVM implementatoin
+	// whether a file resided on the CD or hard disk. Since the ScummVM implementation
 	// requires all the files in the same location, we only need to do a somewhat simpler
 	// check for animations that don't exist in the ANM folder, but rather in special
 	// sub-folders depending on the physical screen resolution being used.
-- 
cgit v1.2.3


From bd865d9741878b56a86c1389e66dfdee24ba1e39 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 7 Jan 2013 16:17:27 +0200
Subject: HOPKINS: Remove static game directory configuration options

Also, remove the unused VGA folder.
This is the first step to remove constructFilename() and associated functions.
---
 engines/hopkins/files.cpp | 48 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index f0238205fd..e061b9c2d4 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -72,8 +72,8 @@ void FileManager::initCensorship() {
 	_vm->_globals._censorshipFl = false;
 
 	// If file doesn't exist, fallback to uncensored
-	if (!fileExists(_vm->_globals.HOPSYSTEM, "BLOOD.DAT")) {
-		constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
+	if (!fileExists("SYSTEM", "BLOOD.DAT")) {
+		constructFilename("SYSTEM", "BLOOD.DAT");
 		char *data = (char *)loadFile(_vm->_globals._curFilename);
 
 		if ((data[6] == 'u' && data[7] == 'k') || (data[6] == 'U' && data[7] == 'K'))
@@ -97,19 +97,15 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
 	// check for animations that don't exist in the ANM folder, but rather in special
 	// sub-folders depending on the physical screen resolution being used.
 
-	if (folder == _vm->_globals.HOPANM) {
+	if (folder == "ANM") {
 		switch (_vm->_globals.SVGA) {
 		case 1:
 			if (fileExists(folderToUse, file))
-				folderToUse = _vm->_globals.HOPTSVGA;
+				folderToUse = "TSVGA";
 			break;
 		case 2:
 			if (fileExists(folderToUse, file))
-				folderToUse = _vm->_globals.HOPSVGA;
-			break;
-		case 3:
-			if (fileExists(folderToUse, file))
-				folderToUse = _vm->_globals.HOPVGA;
+				folderToUse = "SVGA";
 			break;
 		default:
 			break;
@@ -150,52 +146,52 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 
 	switch (a2) {
 	case 1:
-		constructFilename(_vm->_globals.HOPLINK, "RES_INI.CAT");
+		constructFilename("LINK", "RES_INI.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
 		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename(_vm->_globals.HOPLINK, "RES_INI.RES");
+		constructFilename("LINK", "RES_INI.RES");
 		break;
 
 	case 2:
-		constructFilename(_vm->_globals.HOPLINK, "RES_REP.CAT");
+		constructFilename("LINK", "RES_REP.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
 		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename(_vm->_globals.HOPLINK, "RES_REP.RES");
+		constructFilename("LINK", "RES_REP.RES");
 		break;
 
 	case 3:
-		constructFilename(_vm->_globals.HOPLINK, "RES_LIN.CAT");
+		constructFilename("LINK", "RES_LIN.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
 		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename(_vm->_globals.HOPLINK, "RES_LIN.RES");
+		constructFilename("LINK", "RES_LIN.RES");
 		break;
 
 	case 4:
-		constructFilename(_vm->_globals.HOPANIM, "RES_ANI.CAT");
+		constructFilename("ANIM", "RES_ANI.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
 		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename(_vm->_globals.HOPANIM, "RES_ANI.RES");
+		constructFilename("ANIM", "RES_ANI.RES");
 		break;
 
 	case 5:
-		constructFilename(_vm->_globals.HOPANIM, "RES_PER.CAT");
+		constructFilename("ANIM", "RES_PER.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
 		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename(_vm->_globals.HOPANIM, "RES_PER.RES");
+		constructFilename("ANIM", "RES_PER.RES");
 		break;
 
 	case 6:
-		constructFilename(_vm->_globals.HOPIMAGE, "PIC.CAT");
+		constructFilename("BUFFER", "PIC.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
@@ -203,7 +199,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		break;
 
 	case 7:
-		constructFilename(_vm->_globals.HOPANIM, "RES_SAN.CAT");
+		constructFilename("ANIM", "RES_SAN.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
@@ -211,7 +207,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		break;
 
 	case 8:
-		constructFilename(_vm->_globals.HOPLINK, "RES_SLI.CAT");
+		constructFilename("LINK", "RES_SLI.CAT");
 		if (!f.exists(_vm->_globals._curFilename))
 			return g_PTRNUL;
 
@@ -220,18 +216,18 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 
 	case 9:
 		if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
-			_vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "ENG_VOI.RES");
+			_vm->_fileManager.constructFilename("VOICE", "ENG_VOI.RES");
 		// Win95 and Linux versions uses another set of names
 		else {
 			switch (_vm->_globals._language) {
 			case LANG_EN:
-				constructFilename(_vm->_globals.HOPLINK, "RES_VAN.CAT");
+				constructFilename("LINK", "RES_VAN.CAT");
 				break;
 			case LANG_FR:
-				constructFilename(_vm->_globals.HOPLINK, "RES_VFR.CAT");
+				constructFilename("LINK", "RES_VFR.CAT");
 				break;
 			case LANG_SP:
-				constructFilename(_vm->_globals.HOPLINK, "RES_VES.CAT");
+				constructFilename("LINK", "RES_VES.CAT");
 				break;
 			}
 		}
-- 
cgit v1.2.3


From 87385740befe7e5325032a8a468fa595b4621ccf Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 7 Jan 2013 16:21:55 +0200
Subject: HOPKINS: The return value of constructLinuxFilename is unused

---
 engines/hopkins/files.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index e061b9c2d4..279ca4c0d3 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -118,9 +118,8 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
 /**
  * Construct Linux filename
  */
-Common::String FileManager::constructLinuxFilename(const Common::String &file) {
+void FileManager::constructLinuxFilename(const Common::String &file) {
 	_vm->_globals._curFilename = file;
-	return file;
 }
 
 /**
-- 
cgit v1.2.3


From 55337fa93b8a8abd9ccaec63d44415d50beb6a18 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 7 Jan 2013 17:40:41 +0200
Subject: HOPKINS: Get rid of the checks for the interlaced videos inside the
 TSVGA folder

---
 engines/hopkins/files.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 279ca4c0d3..4aeba02a74 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -97,20 +97,8 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
 	// check for animations that don't exist in the ANM folder, but rather in special
 	// sub-folders depending on the physical screen resolution being used.
 
-	if (folder == "ANM") {
-		switch (_vm->_globals.SVGA) {
-		case 1:
-			if (fileExists(folderToUse, file))
-				folderToUse = "TSVGA";
-			break;
-		case 2:
-			if (fileExists(folderToUse, file))
-				folderToUse = "SVGA";
-			break;
-		default:
-			break;
-		}
-	}
+	if (folder == "ANM" && fileExists("SVGA", file))
+		folderToUse = "SVGA";
 
 	_vm->_globals._curFilename = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
 }
-- 
cgit v1.2.3


From 60e11931ba4e4bec8e6e38eb8e946ca71624c274 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 7 Jan 2013 19:42:46 +0200
Subject: HOPKINS: Fix fileExists()

---
 engines/hopkins/files.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 4aeba02a74..0ff2668d07 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -72,7 +72,7 @@ void FileManager::initCensorship() {
 	_vm->_globals._censorshipFl = false;
 
 	// If file doesn't exist, fallback to uncensored
-	if (!fileExists("SYSTEM", "BLOOD.DAT")) {
+	if (fileExists("SYSTEM", "BLOOD.DAT")) {
 		constructFilename("SYSTEM", "BLOOD.DAT");
 		char *data = (char *)loadFile(_vm->_globals._curFilename);
 
@@ -117,8 +117,7 @@ bool FileManager::fileExists(const Common::String &folder, const Common::String
 	Common::String filename = folder.empty() ? file :
 		Common::String::format("%s/%s", folder.c_str(), file.c_str());
 
-	Common::File f;
-	return !f.exists(filename);
+	return Common::File::exists(filename);
 }
 
 /**
-- 
cgit v1.2.3


From 495ecaafbcf1620901d270a65394ca312f2b5a37 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 7 Jan 2013 23:56:39 +0100
Subject: HOPKINS: Remove global filename and constructFilename

---
 engines/hopkins/files.cpp | 113 ++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 74 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 0ff2668d07..dbb33576bc 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -72,9 +72,8 @@ void FileManager::initCensorship() {
 	_vm->_globals._censorshipFl = false;
 
 	// If file doesn't exist, fallback to uncensored
-	if (fileExists("SYSTEM", "BLOOD.DAT")) {
-		constructFilename("SYSTEM", "BLOOD.DAT");
-		char *data = (char *)loadFile(_vm->_globals._curFilename);
+	if (fileExists("BLOOD.DAT")) {
+		char *data = (char *)loadFile("BLOOD.DAT");
 
 		if ((data[6] == 'u' && data[7] == 'k') || (data[6] == 'U' && data[7] == 'K'))
 			_vm->_globals._censorshipFl = true;
@@ -84,40 +83,12 @@ void FileManager::initCensorship() {
 }
 
 /**
- * Construct a filename based on a suggested folder and filename.
- * @param folder		Folder to use. May be overriden for animations.
- * @param file			Filename
+ * Check if a file is present
  */
-void FileManager::constructFilename(const Common::String &folder, const Common::String &file) {
-	Common::String folderToUse = folder;
-
-	// A lot of the code in the original engine based on COPIE_SEQ was used to determine
-	// whether a file resided on the CD or hard disk. Since the ScummVM implementation
-	// requires all the files in the same location, we only need to do a somewhat simpler
-	// check for animations that don't exist in the ANM folder, but rather in special
-	// sub-folders depending on the physical screen resolution being used.
-
-	if (folder == "ANM" && fileExists("SVGA", file))
-		folderToUse = "SVGA";
-
-	_vm->_globals._curFilename = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
-}
-
-/**
- * Construct Linux filename
- */
-void FileManager::constructLinuxFilename(const Common::String &file) {
-	_vm->_globals._curFilename = file;
-}
-
-/**
- * Check if a file is present in a given (optional) folder
- */
-bool FileManager::fileExists(const Common::String &folder, const Common::String &file) {
-	Common::String filename = folder.empty() ? file :
-		Common::String::format("%s/%s", folder.c_str(), file.c_str());
+bool FileManager::fileExists(const Common::String &file) {
+	Common::File f;
 
-	return Common::File::exists(filename);
+	return f.exists(file);
 }
 
 /**
@@ -128,101 +99,96 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 	Common::File f;
 
 	Common::String filename = file;
+	Common::String secondaryFilename = "";
 	filename.toUppercase();
 
 	switch (a2) {
 	case 1:
-		constructFilename("LINK", "RES_INI.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_INI.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename("LINK", "RES_INI.RES");
+		ptr = loadFile("RES_INI.CAT");
+		secondaryFilename = "RES_INI.RES";
 		break;
 
 	case 2:
-		constructFilename("LINK", "RES_REP.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_REP.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename("LINK", "RES_REP.RES");
+		ptr = loadFile("RES_REP.CAT");
+		secondaryFilename = "RES_REP.RES";
 		break;
 
 	case 3:
-		constructFilename("LINK", "RES_LIN.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_LIN.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename("LINK", "RES_LIN.RES");
+		ptr = loadFile("RES_LIN.CAT");
+		secondaryFilename = "RES_LIN.RES";
 		break;
 
 	case 4:
-		constructFilename("ANIM", "RES_ANI.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_ANI.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename("ANIM", "RES_ANI.RES");
+		ptr = loadFile("RES_ANI.CAT");
+		secondaryFilename = "RES_ANI.RES";
 		break;
 
 	case 5:
-		constructFilename("ANIM", "RES_PER.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_PER.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
-		constructFilename("ANIM", "RES_PER.RES");
+		ptr = loadFile("RES_PER.CAT");
+		secondaryFilename = "RES_PER.RES";
 		break;
 
 	case 6:
-		constructFilename("BUFFER", "PIC.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("PIC.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
+		ptr = loadFile("PIC.CAT");
 		break;
 
 	case 7:
-		constructFilename("ANIM", "RES_SAN.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_SAN.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
+		ptr = loadFile("RES_SAN.CAT");
 		break;
 
 	case 8:
-		constructFilename("LINK", "RES_SLI.CAT");
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists("RES_SLI.CAT"))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
+		ptr = loadFile("RES_SLI.CAT");
 		break;
 
-	case 9:
+	case 9: {
+		Common::String tmpFilename;
 		if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
-			_vm->_fileManager.constructFilename("VOICE", "ENG_VOI.RES");
+			tmpFilename = "ENG_VOI.RES";
 		// Win95 and Linux versions uses another set of names
 		else {
 			switch (_vm->_globals._language) {
 			case LANG_EN:
-				constructFilename("LINK", "RES_VAN.CAT");
+				tmpFilename = "RES_VAN.CAT";
 				break;
 			case LANG_FR:
-				constructFilename("LINK", "RES_VFR.CAT");
+				tmpFilename = "RES_VFR.CAT";
 				break;
 			case LANG_SP:
-				constructFilename("LINK", "RES_VES.CAT");
+				tmpFilename = "RES_VES.CAT";
 				break;
 			}
 		}
 
-		if (!f.exists(_vm->_globals._curFilename))
+		if (!f.exists(tmpFilename))
 			return g_PTRNUL;
 
-		ptr = loadFile(_vm->_globals._curFilename);
+		ptr = loadFile(tmpFilename);
 		break;
+		}
 		// Deliberate fall-through to
 	default:
 		break;
@@ -254,9 +220,8 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 
 	_vm->_globals.freeMemory(ptr);
 
-	// TODO: Double check whether this really should be an unsigned int comparison
-	if ((uint16)(a2 - 6) > 1 && (uint16)(a2 - 8) > 1) {
-		if (!f.open(_vm->_globals._curFilename))
+	if (secondaryFilename != "") {
+		if (!f.open(secondaryFilename))
 			error("CHARGE_FICHIER");
 
 		f.seek(_vm->_globals._catalogPos);
-- 
cgit v1.2.3


From 4fd4a5ce0565c158af81d8aea6c67bea35501181 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 18 Jan 2013 19:03:38 +0100
Subject: HOPKINS: Fix cut&paste error in searchCat. Thanks eriktorbjorn for
 pointing at it

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index dbb33576bc..71d06ddd22 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -167,7 +167,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 	case 9: {
 		Common::String tmpFilename;
 		if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
-			tmpFilename = "ENG_VOI.RES";
+			tmpFilename = "ENG_VOI.CAT";
 		// Win95 and Linux versions uses another set of names
 		else {
 			switch (_vm->_globals._language) {
-- 
cgit v1.2.3


From 4c1047cb81ced0df18b5cedf72438576ad4e31e8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 15 Feb 2013 08:41:22 +0100
Subject: HOPKINS: Use freeMemory instead of free in some spaces

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 71d06ddd22..bc4c8d2e56 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -78,7 +78,7 @@ void FileManager::initCensorship() {
 		if ((data[6] == 'u' && data[7] == 'k') || (data[6] == 'U' && data[7] == 'K'))
 			_vm->_globals._censorshipFl = true;
 
-		free(data);
+		_vm->_globals.freeMemory((byte *)data);
 	}
 }
 
-- 
cgit v1.2.3


From 84e290eade13bfdff1e866d058af447893bee321 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 15 Feb 2013 22:20:24 +0100
Subject: HOPKINS: Reorder includes

---
 engines/hopkins/files.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index bc4c8d2e56..e0cd1a3995 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -21,8 +21,10 @@
  */
 
 #include "hopkins/files.h"
+
 #include "hopkins/hopkins.h"
 #include "hopkins/globals.h"
+
 #include "common/system.h"
 #include "common/debug.h"
 #include "common/file.h"
-- 
cgit v1.2.3


From 58eefc0833a540213298f75e87222b12831dd1f7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 27 Feb 2013 00:15:54 +0100
Subject: HOPKINS: Get rid of magic values in FilesManager

---
 engines/hopkins/files.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index e0cd1a3995..5a15c1d68d 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -96,7 +96,7 @@ bool FileManager::fileExists(const Common::String &file) {
 /**
  * Search file in Cat file
  */
-byte *FileManager::searchCat(const Common::String &file, int a2) {
+byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 	byte *ptr = NULL;
 	Common::File f;
 
@@ -104,8 +104,8 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 	Common::String secondaryFilename = "";
 	filename.toUppercase();
 
-	switch (a2) {
-	case 1:
+	switch (mode) {
+	case RES_INI:
 		if (!f.exists("RES_INI.CAT"))
 			return g_PTRNUL;
 
@@ -113,7 +113,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		secondaryFilename = "RES_INI.RES";
 		break;
 
-	case 2:
+	case RES_REP:
 		if (!f.exists("RES_REP.CAT"))
 			return g_PTRNUL;
 
@@ -121,7 +121,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		secondaryFilename = "RES_REP.RES";
 		break;
 
-	case 3:
+	case RES_LIN:
 		if (!f.exists("RES_LIN.CAT"))
 			return g_PTRNUL;
 
@@ -129,7 +129,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		secondaryFilename = "RES_LIN.RES";
 		break;
 
-	case 4:
+	case RES_ANI:
 		if (!f.exists("RES_ANI.CAT"))
 			return g_PTRNUL;
 
@@ -137,7 +137,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		secondaryFilename = "RES_ANI.RES";
 		break;
 
-	case 5:
+	case RES_PER:
 		if (!f.exists("RES_PER.CAT"))
 			return g_PTRNUL;
 
@@ -145,28 +145,28 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		secondaryFilename = "RES_PER.RES";
 		break;
 
-	case 6:
+	case RES_PIC:
 		if (!f.exists("PIC.CAT"))
 			return g_PTRNUL;
 
 		ptr = loadFile("PIC.CAT");
 		break;
 
-	case 7:
+	case RES_SAN:
 		if (!f.exists("RES_SAN.CAT"))
 			return g_PTRNUL;
 
 		ptr = loadFile("RES_SAN.CAT");
 		break;
 
-	case 8:
+	case RES_SLI:
 		if (!f.exists("RES_SLI.CAT"))
 			return g_PTRNUL;
 
 		ptr = loadFile("RES_SLI.CAT");
 		break;
 
-	case 9: {
+	case RES_VOI: {
 		Common::String tmpFilename;
 		if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
 			tmpFilename = "ENG_VOI.CAT";
-- 
cgit v1.2.3


From f2d4151dd7db6eb0bffc4874825b15e22f61a36f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 Mar 2013 21:57:28 +0100
Subject: HOPKINS: Remove setParent() from FileManager

---
 engines/hopkins/files.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 5a15c1d68d..1d63d16bd6 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -33,10 +33,7 @@
 
 namespace Hopkins {
 
-FileManager::FileManager() {
-}
-
-void FileManager::setParent(HopkinsEngine *vm) {
+FileManager::FileManager(HopkinsEngine *vm) {
 	_vm = vm;
 }
 
-- 
cgit v1.2.3


From 852e65bd02bc1278386d79ca68f81e3d15e9fa43 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 20 Mar 2013 07:27:42 +0100
Subject: HOPKINS: Remove setParent() from Globals

---
 engines/hopkins/files.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 1d63d16bd6..42521bdb6b 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -47,7 +47,7 @@ byte *FileManager::loadFile(const Common::String &file) {
 
 	// Allocate space for the file contents
 	size_t filesize = f.size();
-	byte *data = _vm->_globals.allocMemory(filesize);
+	byte *data = _vm->_globals->allocMemory(filesize);
 	if (!data)
 		error("Error allocating space for file being loaded - %s", file.c_str());
 
@@ -68,16 +68,16 @@ int FileManager::readStream(Common::ReadStream &stream, void *buf, size_t nbytes
  * Initialize censorship based on blood.dat file
  */
 void FileManager::initCensorship() {
-	_vm->_globals._censorshipFl = false;
+	_vm->_globals->_censorshipFl = false;
 
 	// If file doesn't exist, fallback to uncensored
 	if (fileExists("BLOOD.DAT")) {
 		char *data = (char *)loadFile("BLOOD.DAT");
 
 		if ((data[6] == 'u' && data[7] == 'k') || (data[6] == 'U' && data[7] == 'K'))
-			_vm->_globals._censorshipFl = true;
+			_vm->_globals->_censorshipFl = true;
 
-		_vm->_globals.freeMemory((byte *)data);
+		_vm->_globals->freeMemory((byte *)data);
 	}
 }
 
@@ -169,7 +169,7 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 			tmpFilename = "ENG_VOI.CAT";
 		// Win95 and Linux versions uses another set of names
 		else {
-			switch (_vm->_globals._language) {
+			switch (_vm->_globals->_language) {
 			case LANG_EN:
 				tmpFilename = "RES_VAN.CAT";
 				break;
@@ -204,32 +204,32 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 		if (name == filename) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
-			_vm->_globals._catalogPos = READ_LE_UINT32(pData + 15);
-			_vm->_globals._catalogSize = READ_LE_UINT32(pData + 19);
+			_vm->_globals->_catalogPos = READ_LE_UINT32(pData + 15);
+			_vm->_globals->_catalogSize = READ_LE_UINT32(pData + 19);
 			matchFlag = true;
 		}
 
 		if (name == "FINIS") {
-			_vm->_globals.freeMemory(ptr);
+			_vm->_globals->freeMemory(ptr);
 			return g_PTRNUL;
 		}
 
 		offsetVal += 23;
 	}
 
-	_vm->_globals.freeMemory(ptr);
+	_vm->_globals->freeMemory(ptr);
 
 	if (secondaryFilename != "") {
 		if (!f.open(secondaryFilename))
 			error("CHARGE_FICHIER");
 
-		f.seek(_vm->_globals._catalogPos);
+		f.seek(_vm->_globals->_catalogPos);
 
-		byte *catData = _vm->_globals.allocMemory(_vm->_globals._catalogSize);
+		byte *catData = _vm->_globals->allocMemory(_vm->_globals->_catalogSize);
 		if (catData == g_PTRNUL)
 			error("CHARGE_FICHIER");
 
-		readStream(f, catData, _vm->_globals._catalogSize);
+		readStream(f, catData, _vm->_globals->_catalogSize);
 		f.close();
 		result = catData;
 	} else {
-- 
cgit v1.2.3


From 75b5753b618c379f97132c43f73cee8c0be85e81 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 24 Mar 2013 15:36:32 +0100
Subject: HOPKINS: Remove an unused Catalog mode

---
 engines/hopkins/files.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 42521bdb6b..78ff7b2535 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -126,14 +126,6 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 		secondaryFilename = "RES_LIN.RES";
 		break;
 
-	case RES_ANI:
-		if (!f.exists("RES_ANI.CAT"))
-			return g_PTRNUL;
-
-		ptr = loadFile("RES_ANI.CAT");
-		secondaryFilename = "RES_ANI.RES";
-		break;
-
 	case RES_PER:
 		if (!f.exists("RES_PER.CAT"))
 			return g_PTRNUL;
-- 
cgit v1.2.3


From ac338c3517d85156e83884164d378c3bf76851e5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 24 Mar 2013 22:56:06 +0100
Subject: HOPKINS: Some more refactoring in Globals

---
 engines/hopkins/files.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 78ff7b2535..98cc34422e 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -35,6 +35,9 @@ namespace Hopkins {
 
 FileManager::FileManager(HopkinsEngine *vm) {
 	_vm = vm;
+
+	_catalogPos = 0;
+	_catalogSize = 0;
 }
 
 /**
@@ -196,8 +199,8 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 		if (name == filename) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
-			_vm->_globals->_catalogPos = READ_LE_UINT32(pData + 15);
-			_vm->_globals->_catalogSize = READ_LE_UINT32(pData + 19);
+			_catalogPos = READ_LE_UINT32(pData + 15);
+			_catalogSize = READ_LE_UINT32(pData + 19);
 			matchFlag = true;
 		}
 
@@ -215,13 +218,13 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 		if (!f.open(secondaryFilename))
 			error("CHARGE_FICHIER");
 
-		f.seek(_vm->_globals->_catalogPos);
+		f.seek(_catalogPos);
 
-		byte *catData = _vm->_globals->allocMemory(_vm->_globals->_catalogSize);
+		byte *catData = _vm->_globals->allocMemory(_catalogSize);
 		if (catData == g_PTRNUL)
 			error("CHARGE_FICHIER");
 
-		readStream(f, catData, _vm->_globals->_catalogSize);
+		readStream(f, catData, _catalogSize);
 		f.close();
 		result = catData;
 	} else {
-- 
cgit v1.2.3


From c7d7c747539ba93c946ea41416ed2586d2084d2b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 2 Apr 2013 07:57:38 +0200
Subject: HOPKINS: Remove useless check in loadLinkFile, remove comment. Thanks
 SylvainTV for pointing it

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 98cc34422e..13d30029ca 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -183,7 +183,7 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 		ptr = loadFile(tmpFilename);
 		break;
 		}
-		// Deliberate fall-through to
+
 	default:
 		break;
 	}
-- 
cgit v1.2.3


From 4b21ec23d0e445d8364bcab5732318734f4c27cc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 3 Apr 2013 23:57:38 +0200
Subject: HOPKINS: Refactor searchCat to remove the use of g_PTRNUL, add a
 parameter to clarify the result of the function

---
 engines/hopkins/files.cpp | 54 +++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 18 deletions(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 13d30029ca..3f7c4e48dd 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -96,8 +96,9 @@ bool FileManager::fileExists(const Common::String &file) {
 /**
  * Search file in Cat file
  */
-byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
+byte *FileManager::searchCat(const Common::String &file, CatMode mode, bool &fileFoundFl) {
 	byte *ptr = NULL;
+	fileFoundFl = true;
 	Common::File f;
 
 	Common::String filename = file;
@@ -106,54 +107,68 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 
 	switch (mode) {
 	case RES_INI:
-		if (!f.exists("RES_INI.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("RES_INI.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("RES_INI.CAT");
 		secondaryFilename = "RES_INI.RES";
 		break;
 
 	case RES_REP:
-		if (!f.exists("RES_REP.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("RES_REP.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("RES_REP.CAT");
 		secondaryFilename = "RES_REP.RES";
 		break;
 
 	case RES_LIN:
-		if (!f.exists("RES_LIN.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("RES_LIN.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("RES_LIN.CAT");
 		secondaryFilename = "RES_LIN.RES";
 		break;
 
 	case RES_PER:
-		if (!f.exists("RES_PER.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("RES_PER.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("RES_PER.CAT");
 		secondaryFilename = "RES_PER.RES";
 		break;
 
 	case RES_PIC:
-		if (!f.exists("PIC.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("PIC.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("PIC.CAT");
 		break;
 
 	case RES_SAN:
-		if (!f.exists("RES_SAN.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("RES_SAN.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("RES_SAN.CAT");
 		break;
 
 	case RES_SLI:
-		if (!f.exists("RES_SLI.CAT"))
-			return g_PTRNUL;
+		if (!f.exists("RES_SLI.CAT")) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile("RES_SLI.CAT");
 		break;
@@ -177,8 +192,10 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 			}
 		}
 
-		if (!f.exists(tmpFilename))
-			return g_PTRNUL;
+		if (!f.exists(tmpFilename)) {
+			fileFoundFl = false;
+			return NULL;
+		}
 
 		ptr = loadFile(tmpFilename);
 		break;
@@ -206,7 +223,8 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) {
 
 		if (name == "FINIS") {
 			_vm->_globals->freeMemory(ptr);
-			return g_PTRNUL;
+			fileFoundFl = false;
+			return NULL;
 		}
 
 		offsetVal += 23;
-- 
cgit v1.2.3


From e79a51c20894a74ac6ed8914daccfeedbfb28849 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Apr 2013 07:54:45 +0200
Subject: HOPKINS: Remove g_PTRNUL

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/hopkins/files.cpp')

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 3f7c4e48dd..2390ebbdf8 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -239,7 +239,7 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode, bool &fil
 		f.seek(_catalogPos);
 
 		byte *catData = _vm->_globals->allocMemory(_catalogSize);
-		if (catData == g_PTRNUL)
+		if (catData == NULL)
 			error("CHARGE_FICHIER");
 
 		readStream(f, catData, _catalogSize);
-- 
cgit v1.2.3