diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 4 | ||||
| -rw-r--r-- | include/world.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/entities.h b/include/entities.h index 442219c..3b13ce3 100644 --- a/include/entities.h +++ b/include/entities.h @@ -151,6 +151,7 @@ public: bool near; // Causes name to display bool canMove; // Enables movement + bool canJape; // Enables world leaving bool right,left; // Direction faced by Entity bool alive; bool hit; @@ -201,12 +202,13 @@ public: void sspawn(float x,float y); }; -class NPC : public Entity{ +class NPC : public Entity { public: std::vector<int (*)(NPC *)>aiFunc; int dialogIndex; NPC(); + NPC(NPC *n); ~NPC(); void addAIFunc(int (*func)(NPC *),bool preload); diff --git a/include/world.h b/include/world.h index 51fbbfd..dd06469 100644 --- a/include/world.h +++ b/include/world.h @@ -144,7 +144,7 @@ protected: * of elements provided by the function. */ - std::vector<WorldData> worldData; + std::vector<WorldData> worldData; /** * Starting x coordinate. @@ -433,6 +433,7 @@ public: */ World *goWorldLeft(Player *p); + bool goWorldLeft( NPC *e ); /** * Attempts to let the player enter the right-linked world specified by |