diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-26 08:28:48 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-26 08:28:48 -0500 |
| commit | 4df411931dd63f22258be76911e0648c3cdc3936 (patch) | |
| tree | 878df1b96322d7f9c25151f0882606df2571e57c /include/world.h | |
| parent | 0396f428411eb015f796643f9e7e38ca97f8fd42 (diff) | |
Merchants kinda work...
Diffstat (limited to 'include/world.h')
| -rw-r--r-- | include/world.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/world.h b/include/world.h index f9e952e..7338097 100644 --- a/include/world.h +++ b/include/world.h @@ -101,6 +101,8 @@ struct Village{ } }; +extern Player *player; + /** * The world class. This class does everything a world should do. */ @@ -215,6 +217,10 @@ public: char *setToRight(const char *file); + void callUpdate(){ + this->update(player,deltaTime); + } + /** * A vector of pointers to every NPC, Structure, Mob, and Object in this @@ -228,6 +234,7 @@ public: */ std::vector<NPC *> npc; + std::vector<Merchant *> merchant; /** * A vector of all Structures in this world. @@ -310,6 +317,7 @@ public: */ void addNPC(float x,float y); + void addMerchant(float x, float y); /** * Adds an object to the world with the specified item id and coordinates. |