diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 8 | ||||
| -rw-r--r-- | include/world.h | 4 |
2 files changed, 7 insertions, 5 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{ diff --git a/include/world.h b/include/world.h index 0a23965..4b3a891 100644 --- a/include/world.h +++ b/include/world.h @@ -166,8 +166,8 @@ public: std::vector<Object *> object; std::vector<Particles *> particles; - void addStructure(_TYPE t,BUILD_SUB sub,float x,float y,World *outside,World *inside); - void addVillage(int bCount, int npcMin, int npcMax,_TYPE t,float x,float y,World *outside,World *inside); + void addStructure(_TYPE t,BUILD_SUB sub,float x,float y,World *inside); + void addVillage(int bCount, int npcMin, int npcMax,_TYPE t,float x,float y,World *outside); void addMob(int t,float x,float y); void addMob(int t,float x,float y,void (*hey)(Mob *)); void addNPC(float x,float y); |