From c6739a753e31e8d239b662fbfc7d9ac7e7c0621e Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 22 Oct 2015 09:23:08 -0400
Subject: Commented more of entities, added new texture namespace and class

---
 include/common.h   | 7 ++++++-
 include/entities.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index d5f1456..e46cf86 100644
--- a/include/common.h
+++ b/include/common.h
@@ -21,6 +21,11 @@
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_mixer.h>
 
+/*
+ *	Include file headers
+*/
+#include <Texture.h>
+
 /*
  *	Create a basic 2-point structure for coordinate saving
 */
@@ -88,7 +93,7 @@ extern unsigned int deltaTime;
  * 
 */
 
-GLuint loadTexture(const char *fileName);
+//GLuint loadTexture(const char *fileName);
 
 /*
  *	Prints a formatted debug message to the console, along with the callee's file and line
diff --git a/include/entities.h b/include/entities.h
index fab2ca5..f9fe842 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -57,6 +57,7 @@ public:
 	char* name;
 	GENDER gender;
 	GLuint texture[3];	  //TODO: ADD TEXTURES
+	Texturec* tex;
 
 
 	void spawn(float, float);
-- 
cgit v1.2.3