aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/inventory.h
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-28 20:10:02 -0400
committerPaul Gilbert2015-06-28 20:10:02 -0400
commita041aec839911793bc34a74f6e88fd37fe8adf3c (patch)
tree7b0cf988c7fb495ac66eaa57d0e9c657c9618922 /engines/sherlock/inventory.h
parent144aa6483b23e422d458af3a12bed1af6e5e0b33 (diff)
downloadscummvm-rg350-a041aec839911793bc34a74f6e88fd37fe8adf3c.tar.gz
scummvm-rg350-a041aec839911793bc34a74f6e88fd37fe8adf3c.tar.bz2
scummvm-rg350-a041aec839911793bc34a74f6e88fd37fe8adf3c.zip
SHERLOCK: RT: Inventory window now partially showing
Diffstat (limited to 'engines/sherlock/inventory.h')
-rw-r--r--engines/sherlock/inventory.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 9d5e2c42a7..fac0b2f888 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -32,8 +32,6 @@
namespace Sherlock {
-#define MAX_VISIBLE_INVENTORY 6
-
enum InvMode {
INVMODE_EXIT = 0,
INVMODE_LOOK = 1,
@@ -88,7 +86,7 @@ protected:
*/
void copyToInventory(Object &obj);
public:
- ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
+ Common::Array<ImageFile *> _invShapes;
bool _invGraphicsLoaded;
InvMode _invMode;
int _invIndex;
@@ -109,12 +107,6 @@ public:
void freeInv();
/**
- * Load the list of names the inventory items correspond to, if not already loaded,
- * and then calls loadGraphics to load the associated graphics
- */
- void loadInv();
-
- /**
* Load the list of names of graphics for the inventory
*/
void loadGraphics();
@@ -145,6 +137,12 @@ public:
* Synchronize the data for a savegame
*/
void synchronize(Serializer &s);
+
+ /**
+ * Load the list of names the inventory items correspond to, if not already loaded,
+ * and then calls loadGraphics to load the associated graphics
+ */
+ virtual void loadInv() = 0;
};
} // End of namespace Sherlock