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/events.cpp | 2 +-
 engines/hopkins/files.cpp  | 8 --------
 engines/hopkins/files.h    | 7 +++----
 3 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 66692da429..8e25539b94 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -64,7 +64,7 @@ EventsManager::~EventsManager() {
 }
 
 void EventsManager::clearAll() {
-	_objectBuf = _vm->_globals->freeMemory(_objectBuf);
+	_vm->_globals->freeMemory(_objectBuf);
 	_objectBuf = _vm->_globals->allocMemory(2500);
 }
 
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;
diff --git a/engines/hopkins/files.h b/engines/hopkins/files.h
index f66910699a..145c267935 100644
--- a/engines/hopkins/files.h
+++ b/engines/hopkins/files.h
@@ -32,10 +32,9 @@ namespace Hopkins {
 
 class HopkinsEngine;
 
-// CHECKME: RES_ANI looks unused
-enum CatMode { RES_INI = 1, RES_REP = 2, RES_LIN = 3, RES_ANI = 4,
-               RES_PER = 5, RES_PIC = 6, RES_SAN = 7, RES_SLI = 8,
-			   RES_VOI = 9 };
+// RES_ANI = 4 has been removed because it's not used
+enum CatMode { RES_INI = 1, RES_REP = 2, RES_LIN = 3, RES_PER = 5, 
+               RES_PIC = 6, RES_SAN = 7, RES_SLI = 8, RES_VOI = 9 };
 
 class FileManager {
 public:
-- 
cgit v1.2.3