diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-03 07:46:23 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-03 07:46:23 -0500 |
| commit | bf91141782766f3648b62c6d96528fddb9ae7447 (patch) | |
| tree | c6c9322ec7c4f111f05c7f639ab1d33bed9de40f /include | |
| parent | dc24164926a7988e018d32fff1977d2b40c89057 (diff) | |
| parent | 6b44ecd9da08087f4a44dd3daef211e763eb1c61 (diff) | |
Added holding vs press key action
Diffstat (limited to 'include')
| -rw-r--r-- | include/Texture.h | 1 | ||||
| -rw-r--r-- | include/entities.h | 2 | ||||
| -rw-r--r-- | include/world.h | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/Texture.h b/include/Texture.h index 1a32aae..5f5758b 100644 --- a/include/Texture.h +++ b/include/Texture.h @@ -16,6 +16,7 @@ public: GLuint *image; Texturec(uint amt, ...); + Texturec(uint amt,const char **paths); ~Texturec(); void bindNext(); diff --git a/include/entities.h b/include/entities.h index 4413d41..19dd492 100644 --- a/include/entities.h +++ b/include/entities.h @@ -125,7 +125,7 @@ public: class Mob : public Entity{ public: double init_y; - void (*hey)(); + void (*hey)(Mob *callee); Mob(int); Mob(int,unsigned int); diff --git a/include/world.h b/include/world.h index 6c0395d..57ea091 100644 --- a/include/world.h +++ b/include/world.h @@ -12,7 +12,8 @@ #define DAY_CYCLE 3000 typedef enum { - BG_FOREST + BG_FOREST, + BG_WOODHOUSE } WORLD_BG_TYPE; typedef enum { @@ -106,7 +107,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 addMob(int t,float x,float y,void (*hey)(Mob *)); void addNPC(float x,float y); void addObject(ITEM_ID, bool, const char *, float, float); |