From 5fadac5d0f37f574ca160107d832d11b421ad559 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Fri, 4 Mar 2016 08:45:53 -0500
Subject: entity following

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

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index 9650f49..58d561f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -8,16 +8,17 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+// holy moly
 #include <iostream>
 #include <cstdlib>
 #include <string>
 #include <vector>
-#include <math.h>
 #include <string>
 #include <fstream>	
 #include <thread>
 #include <mutex>
 #include <future>
+#include <math.h>
 #include <threadpool.h>
 
 #define GLEW_STATIC
@@ -47,7 +48,7 @@ N abso(N v){
 		return v;
 }
 
-extern GLuint colorIndex;
+extern GLuint colorIndex;	// Texture.cpp?
 
 /**
  * This structure contains a set of coordinates for ease of coding.
@@ -104,7 +105,7 @@ typedef col Color;
  * Define the game's name (displayed in the window title).
  */
 
-#define GAME_NAME		"Independent Study v.0.5 alpha - NOW WITH SOUND!"
+#define GAME_NAME		"Independent Study v.0.6 alpha - NOW WITH more c++"
 
 /**
  * The desired width of the game window.
diff --git a/include/entities.h b/include/entities.h
index 334bfeb..c10bcd4 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -132,6 +132,7 @@ void initEntity();
 
 class Entity{
 public:
+	Entity *followee;
 	Inventory *inv;
 
 	/*
@@ -186,6 +187,8 @@ public:
 	
 	virtual void wander(int){}
 	virtual void interact(){}
+
+	void follow(Entity *e);
 	
 	virtual ~Entity(){}
 };
-- 
cgit v1.2.3