The resource and memory managers are now created dynamically.

Renamed the resource manager's open/close methods openResource() and
closeResource() to avoid confusion. (It was I who originally shortened
their names to open() and close(), but I've changed my mind now.)

Moved more stuff into Sword2Engine.

svn-id: r11088

1 files changed, 5 insertions, 5 deletions

diff --git a/sword2/resman.h b/sword2/resman.h
index 27e86e294f..510f22ba5b 100644
--- a/sword2/resman.h
+++ b/sword2/resman.h
@@ -28,16 +28,16 @@ namespace Sword2 {
 
 class ResourceManager {
 public:
-	void init(void);		// read in the config file
-	void exit(void);
+	ResourceManager(void);		// read in the config file
+	~ResourceManager(void);
 
 	// Returns ad of resource. Loads if not in memory. Retains a count.
 	// Resource can be aged out of memory if count = 0
 	// The resource is locked while count != 0
 	// Resource floats when count = 0
 
-	uint8 *open(uint32 res);
-	void close(uint32 res);		// decrements the count
+	uint8 *openResource(uint32 res);
+	void closeResource(uint32 res);		// decrements the count
 
 	// returns '0' if resource out of range or null, otherwise '1' for ok
 
@@ -105,7 +105,7 @@ private:
 	char _cdDrives[24];
 };							
 
-extern ResourceManager res_man;	//declare the object global
+extern ResourceManager *res_man;	// declare the object global
 
 } // End of namespace Sword2