aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-12-02 08:48:39 -0500
committerClyne Sullivan <tullivan99@gmail.com>2015-12-02 08:48:39 -0500
commitb447a664066e98cc827626526179b3a3db22fa30 (patch)
tree9947254b1256e87ad167986b5bac9cf5be49c7d6 /include
parent1d995c34c871bdb48e35c083ef0d9027dc18d719 (diff)
world bg improvements
Diffstat (limited to 'include')
-rw-r--r--include/Texture.h1
-rw-r--r--include/entities.h2
-rw-r--r--include/world.h5
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);