From a6150f9308f24f55793b8be07f8756d39763b59b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Nov 2015 12:12:32 -0500
Subject: ACCESS: Creation of access.dat for holding Access games engine data

---
 engines/access/amazon/amazon_resources.h | 62 ++++++++++++++------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

(limited to 'engines/access/amazon/amazon_resources.h')

diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 10dea02abc..ca0bfeb5b7 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -24,6 +24,8 @@
 #define ACCESS_AMAZON_RESOURCES_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
+#include "access/resources.h"
 
 namespace Access {
 
@@ -42,9 +44,6 @@ struct RiverStruct {
 	int _offsetY;
 };
 
-extern const char *const FILENAMES[];
-extern const char *const FILENAMES_DEMO[];
-
 extern const int SIDEOFFR[];
 extern const int SIDEOFFL[];
 extern const int SIDEOFFU[];
@@ -58,8 +57,6 @@ extern const int DIAGOFFULY[];
 extern const int DIAGOFFDLX[];
 extern const int DIAGOFFDLY[];
 
-extern const byte *const CURSORS[10];
-
 extern const int _travelPos[][2];
 
 extern const int OVEROFFR[];
@@ -75,37 +72,6 @@ extern const int OVEROFFULY[];
 extern const int OVEROFFDLX[];
 extern const int OVEROFFDLY[];
 
-extern const byte *const ROOM_TABLE[];
-extern const char *const ROOM_DESCR[];
-extern const byte *const ROOM_TABLE_DEMO[];
-extern const int ROOM_NUMB;
-
-extern const byte *const CHARTBL[];
-extern const byte *const CHARTBL_DEMO[];
-
-extern const char *const INVENTORY_NAMES[];
-
-extern const int FONT2_INDEX[];
-
-extern const byte FONT2_DATA[];
-
-extern const int FONT6x6_INDEX[];
-
-extern const byte FONT6x6_DATA[];
-
-extern const char *const NO_HELP_MESSAGE;
-extern const char *const NO_HINTS_MESSAGE;
-extern const char *const RIVER_HIT1;
-extern const char *const RIVER_HIT2;
-extern const char *const BAR_MESSAGE;
-extern const char *const HELPLVLTXT[3];
-extern const char *const IQLABELS[9];
-extern const byte DEATH_SCREENS[58];
-extern const byte DEATH_SCREENS_DEMO[34];
-
-extern const char *const DEATH_TEXT[58];
-extern const char *const DEATH_TEXT_DEMO[34];
-
 extern const int DEATH_CELLS[13][3];
 
 extern const int CHAPTER_CELLS[17][3];
@@ -155,6 +121,30 @@ extern const int CAST_END_OBJ1[4][4];
 
 extern const int RMOUSE[10][2];
 
+class AmazonResources: public Resources {
+protected:
+	/**
+	 * Load data from the access.dat file
+	 */
+	virtual void load(Common::SeekableReadStream &s);
+public:
+	Common::Array<int> FONT2_INDEX;
+	Common::Array<byte> FONT2_DATA;
+	Common::Array<int> FONT6x6_INDEX;
+	Common::Array<byte> FONT6x6_DATA;
+	Common::String NO_HELP_MESSAGE;
+	Common::String NO_HINTS_MESSAGE;
+	Common::String RIVER_HIT1;
+	Common::String RIVER_HIT2;
+	Common::String BAR_MESSAGE;
+	Common::String HELPLVLTXT[3];
+	Common::String IQLABELS[9];
+public:
+	AmazonResources(AccessEngine *vm);
+};
+
+#define AMRES (*((Amazon::AmazonResources *)_vm->_res))
+
 } // End of namespace Amazon
 } // End of namespace Access
 
-- 
cgit v1.2.3