diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 3 | ||||
| -rw-r--r-- | include/world.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/entities.h b/include/entities.h index 422d5d8..53efc63 100644 --- a/include/entities.h +++ b/include/entities.h @@ -36,8 +36,6 @@ class Entity{ public: Inventory *inv; - void *inWorld; - float width; //width and height of the player float height; float speed; //speed of the play @@ -95,6 +93,7 @@ public: class Structures : public Entity{ public: + void *inWorld; void *inside; Structures(); unsigned int spawn(_TYPE, float, float); diff --git a/include/world.h b/include/world.h index 754f3c7..9d7a33b 100644 --- a/include/world.h +++ b/include/world.h @@ -76,7 +76,7 @@ public: std::vector<Mob *> mob; std::vector<Entity *> entity; - void addStructure(_TYPE t,float x,float y); + void addStructure(_TYPE t,float x,float y,void *inside); void addMob(int t,float x,float y); void addNPC(float x,float y); @@ -173,6 +173,7 @@ float worldGetYBase(World *w); class IndoorWorld : public World { public: + World *outside; IndoorWorld(void); ~IndoorWorld(void); |