diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 7 | ||||
| -rw-r--r-- | include/entities.h | 3 |
2 files changed, 7 insertions, 3 deletions
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 b39923b..ef421f5 100644 --- a/include/entities.h +++ b/include/entities.h @@ -130,6 +130,7 @@ void initEntity(); class Entity{ public: + Entity *followee; Inventory *inv; /* @@ -184,6 +185,8 @@ public: virtual void wander(int){} virtual void interact(){} + + void follow(Entity *e); virtual ~Entity(){} }; |