aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/common.h2
-rw-r--r--include/inventory.h7
2 files changed, 9 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 0ddb5e4..50ba316 100644
--- a/include/common.h
+++ b/include/common.h
@@ -116,6 +116,8 @@ extern vec2 offset;
extern float handAngle;
+extern unsigned int loops;
+
/*
* Prints a formatted debug message to the console, along with the callee's file and line
* number.
diff --git a/include/inventory.h b/include/inventory.h
index 611a6d7..8567b8b 100644
--- a/include/inventory.h
+++ b/include/inventory.h
@@ -3,6 +3,7 @@
#include <common.h>
#include <string.h>
+#include <boost/range/adaptor/reversed.hpp>
#define DEBUG
@@ -49,13 +50,19 @@ public:
int maxStackSize;
char* textureLoc;
Texturec *tex;
+ GLuint text;
int count;
+
Item(ITEM_ID i, const char *n, ITEM_TYPE t, float w, float h, int m, const char *tl);
GLuint rtex(){
return tex->image[0];
}
};
+static Item item[5]= {
+ #include "../config/items.h"
+};
+
struct item_t{
int count;
ITEM_ID id;