aboutsummaryrefslogtreecommitdiffstats
path: root/include/world.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/world.h')
-rw-r--r--include/world.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/world.h b/include/world.h
index c066865..733daae 100644
--- a/include/world.h
+++ b/include/world.h
@@ -137,6 +137,8 @@ public:
~Village(void){}
};
+extern Player *player;
+
/**
* The world class. This class does everything a world should do.
*/
@@ -249,6 +251,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
@@ -262,6 +268,7 @@ public:
*/
std::vector<NPC *> npc;
+ std::vector<Merchant *> merchant;
/**
* A vector of all Structures in this world.
@@ -344,6 +351,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.