aboutsummaryrefslogtreecommitdiffstats
path: root/include/entities.h
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-01-07 08:25:49 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-01-07 08:25:49 -0500
commitc7e3d72f0ef08cb9463cd8960bc29dad40e3bdcb (patch)
treed6bfde57916863ca9fd6fa2fbfae42338ae8e630 /include/entities.h
parent0f379ae55e07d4e1e7904a3eb33b1c29c2177ec1 (diff)
parent1b2510a427cea42e6381d60f434b5fdec2b181b0 (diff)
Hey, that's pretty good lighting!
Diffstat (limited to 'include/entities.h')
-rw-r--r--include/entities.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/entities.h b/include/entities.h
index 7a97200..a4bc282 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -44,6 +44,8 @@ enum BUILD_SUB{
FOUNTAIN
};
+class World;
+
class Particles{
public:
vec2 loc;
@@ -124,6 +126,7 @@ public:
GENDER gender;
Texturec *tex;
+ Texturec *ntex;
unsigned int randDialog;
@@ -161,14 +164,14 @@ public:
class Structures : public Entity{
public:
- void *inWorld;
- void *inside;
+ World *inWorld;
+ World *inside;
BUILD_SUB bsubtype;
Structures();
~Structures();
- unsigned int spawn(_TYPE, BUILD_SUB, float, float);
+ unsigned int spawn(_TYPE, BUILD_SUB, float, float, World *);
};
class Mob : public Entity{