aboutsummaryrefslogtreecommitdiffstats
path: root/include/world.h
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-11-20 08:49:54 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-11-20 08:49:54 -0500
commitcc4cd76409894615887e0b39d7db5b722138a613 (patch)
treedb2802e34ba553bf121a7e59cb803d1c0c196e6d /include/world.h
parent0a30bd1b2e2f02b6f34225d8976f645c99b53b7e (diff)
parent5598e4d1f52224f2d075dc318868e284b2f20a78 (diff)
Started inv ui, new item system
Diffstat (limited to 'include/world.h')
-rw-r--r--include/world.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/world.h b/include/world.h
index 3d5fdad..a32c7f2 100644
--- a/include/world.h
+++ b/include/world.h
@@ -83,6 +83,7 @@ public:
void addStructure(_TYPE t,float x,float y,World *outside,World *inside);
void addMob(int t,float x,float y);
+ void addMob(int t,float x,float y,void (*hey)());
void addNPC(float x,float y);
void addObject(int, float, float);
void addObject(int, bool, char*, float, float);
@@ -193,10 +194,12 @@ public:
class Arena : public World {
private:
- World *exit;
+ vec2 pxy;
+ vec2 door;
+ World *exit;
public:
- void drawDoor(void);
- World *exitArena(void);
+ Arena(World *leave,Player *p);
+ World *exitArena(Player *p);
};
extern int worldShade;