Look at my fancy inventory

4 files changed, 34 insertions, 17 deletions

diff --git a/include/Texture.h b/include/Texture.h
index 81a743e..a3f242b 100644
--- a/include/Texture.h
+++ b/include/Texture.h
@@ -11,7 +11,6 @@ namespace Texture{
 
 class Texturec{
 private:
-	GLuint *image;
 	int texState;
 public:
 	Texturec(uint amt, ...);
@@ -19,6 +18,8 @@ public:
 	void bindPrev();
 	void bind(int);
 	void walk();
+
+	GLuint *image;
 };
 
 #endif //TEXTURE_H
diff --git a/include/common.h b/include/common.h
index bfd9db6..525a4cd 100644
--- a/include/common.h
+++ b/include/common.h
@@ -9,6 +9,8 @@
 #include <cstdlib>
 #include <vector>
 #include <math.h>
+ #include <thread>
+
 
 /*
  *	Include GLEW and the SDL 2 headers
@@ -60,8 +62,8 @@ typedef struct {
 
 #define GAME_NAME		"Independent Study v.0.3 alpha"
 
-#define SCREEN_WIDTH	1200
-#define SCREEN_HEIGHT	720
+#define SCREEN_WIDTH	1792
+#define SCREEN_HEIGHT	1008
 
 //#define FULLSCREEN
 
@@ -134,4 +136,9 @@ void DEBUG_prints(const char* file, int line, const char *s,...);
 void safeSetColor(int r,int g,int b);
 void safeSetColorA(int r,int g,int b,int a);
 
+unsigned int safe_strlen(const char*);
+
+void DrawCircle(float cx, float cy, float r, int num_segments);
+
+
 #endif // COMMON_H
diff --git a/include/entities.h b/include/entities.h
index 403c3c5..be5c000 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -114,9 +114,12 @@ class Object : public Entity{
 public:
 	Object(int);
 	Object(int, bool, char*);
-	void interact();
+	void interact(void);
 	bool questObject = false;
 	char *pickupDialog;
+	std::thread runInteract() {
+          return std::thread([=] { interact(); });
+    }
 private:
 	int identifier;
 };
diff --git a/include/inventory.h b/include/inventory.h
index dc5c04e..3fdbf52 100644
--- a/include/inventory.h
+++ b/include/inventory.h
@@ -2,6 +2,7 @@
 #define INVENTORY_H
 
 #include <common.h>
+#include <string.h>
 
 #define DEBUG
 
@@ -19,8 +20,6 @@
  * A list of all item IDs.
 */
 
-static unsigned int sel;
-
 enum ITEM_ID {
 	DEBUG_ITEM = 69,
 	TEST_ITEM = 1,
@@ -49,15 +48,23 @@ public:
 	float height;
 	int maxStackSize;
 	char* textureLoc;
+	Texturec *tex;
 	int count;
 	Item(ITEM_ID i, char* n, ITEM_TYPE t, float w, float h, int m, char* tl):
-		id(i), name(n), type(t), width(w), height(h), maxStackSize(m), textureLoc(tl){
+		id(i), type(t), width(w), height(h), maxStackSize(m){
 		count = 0;
+
+		name 		= (char*)calloc(strlen(n ),sizeof(char));
+		textureLoc 	= (char*)calloc(strlen(tl),sizeof(char));
+
+		strcpy(name,n);
+		strcpy(textureLoc,tl);
+
+		tex= new Texturec(1,textureLoc);
 	}
-	void addCount(int c){
-		count += c;
+	GLuint rtex(){
+		return tex->image[0];
 	}
-
 };
 
 static Item item[5]= {
@@ -66,20 +73,20 @@ static Item item[5]= {
 
 struct item_t{
 	int count;
-	ITEM_ID itmid;
-	void addC(int c, ITEM_ID i){
-		count = c;
-		itmid = i;
-		item[itmid].addCount(count);
-	}
+	ITEM_ID id;
 } __attribute__((packed));
 
 
 class Inventory {
 private:
 	unsigned int size;		// Size of 'item' array
+	item_t *inv;
+	int os = 0;
 	//struct item_t *item;	// An array of the items contained in this inventory.
 public:
+	unsigned int sel;
+	bool invOpen = false;
+	bool invOpening = false;
 
 	Inventory(unsigned int s);	// Creates an inventory of size 's'
 	~Inventory(void);			// Free's 'item'
@@ -97,7 +104,6 @@ public:
 	
 };
 
-unsigned int initInventorySprites(void);	// Loads as many inventory textures as it can find, returns count
 void itemUse(void *p);
 
 #endif // INVENTORY_H