aboutsummaryrefslogtreecommitdiffstats
path: root/include/entities.h
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-12-17 09:25:22 -0500
committerClyne Sullivan <tullivan99@gmail.com>2015-12-17 09:25:22 -0500
commitd9d66652af66fc824588176e5ce1136ea9965925 (patch)
tree0dd6d54ff2d63cd35e4c34e2e2f267573fb0d655 /include/entities.h
parent15889a45b8ee37d43e248cec351e9f6882c21ff3 (diff)
indoors, fixed npcs
Diffstat (limited to 'include/entities.h')
-rw-r--r--include/entities.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/entities.h b/include/entities.h
index 1abe886..6d192fe 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -44,6 +44,8 @@ enum BUILD_SUB{
FOUNTAIN
};
+class World;
+
class Particles{
public:
vec2 loc;
@@ -162,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{