From 613ab3be6ee76595c04b89992e62c41b52bc1a2f Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Fri, 13 Nov 2015 08:26:31 -0500
Subject: Added object class, and added quest listing

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

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index 93735fa..bfd9db6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -36,7 +36,7 @@ typedef unsigned int uint;
  *	This flag lets the compiler know that we are using shaders
 */
 
-#define SHADERSd
+#define SHADERSs
 
 /*
  *	Create a basic 2-point structure for coordinate saving
diff --git a/include/entities.h b/include/entities.h
index 53efc63..b590c8d 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -15,6 +15,7 @@
 #define NPC_INV_SIZE	3	// Size of an NPC's inventory
 
 enum _TYPE { //these are the main types of entities
+	OBJECTT = -2,
 	STRUCTURET = -1,
 	PLAYERT,
 	NPCT,
@@ -106,6 +107,13 @@ public:
 	void wander(int);
 };
 
+class Object : public Entity{
+public:
+	Object(int);
+	void interact();
+private:
+	int ID;
+};
 #endif // ENTITIES_H
 
 /**
diff --git a/include/world.h b/include/world.h
index cb40ef6..6b14f7e 100644
--- a/include/world.h
+++ b/include/world.h
@@ -76,10 +76,17 @@ public:
 	std::vector<Structures	*>	build;
 	std::vector<Mob			*>	mob;
 	std::vector<Entity		*>	entity;
+	std::vector<Object		*>	object;
 	
+	//template<class T>
+	//void getEntityLocation(std::vector<T*>&, unsigned int);
+
 	void addStructure(_TYPE t,float x,float y,World *outside,World *inside);
 	void addMob(int t,float x,float y);
 	void addNPC(float x,float y);
+	void addObject(int, float, float);
+
+	//void removeObjet(Object);
 	
 	void update(Player *p,unsigned int delta);
 	
-- 
cgit v1.2.3