diff options
Diffstat (limited to 'include/world.hpp')
| -rw-r--r-- | include/world.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/world.hpp b/include/world.hpp index c6eaf06..b99e9ab 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -159,7 +159,7 @@ public: virtual ~World(void); // generates a world of the specified width - void generate(unsigned int width); + void generate(int width); // draws everything to the screen virtual void draw(Player *p); @@ -220,7 +220,7 @@ public: bool goWorldLeft(NPC *e); // attempts to enter a structure that the player would be standing in front of - World *goInsideStructure(Player *p); + std::pair<World *, float> goInsideStructure(Player *p); // adds a hole at the specified start and end x-coordinates void addHole(unsigned int start,unsigned int end); @@ -233,8 +233,9 @@ public: void addMerchant(float x, float y, bool housed); - void addMob(int type, float x, float y); - void addMob(int type, float x, float y, void (*hey)(Mob *)); + //void addMob(int type, float x, float y); + //void addMob(int type, float x, float y, void (*hey)(Mob *)); + void addMob(Mob *m, vec2 coord); void addNPC(float x, float y); |