diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Texture.h | 2 | ||||
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/entities.h | 5 | ||||
| -rw-r--r-- | include/ui.h | 2 | ||||
| -rw-r--r-- | include/world.h | 8 |
5 files changed, 11 insertions, 8 deletions
diff --git a/include/Texture.h b/include/Texture.h index bcd95af..85225d8 100644 --- a/include/Texture.h +++ b/include/Texture.h @@ -52,7 +52,7 @@ public: * Contains an array of the GLuints returned from Texture::loadTexture(). */ - GLuint *image; + GLuint *image = NULL; /** * Populates the image array from a list of strings, with each string as a diff --git a/include/common.h b/include/common.h index 8050852..31126d7 100644 --- a/include/common.h +++ b/include/common.h @@ -70,7 +70,7 @@ typedef struct{ * The desired width of the game window. */ -#define SCREEN_WIDTH 1280 +#define SCREEN_WIDTH 1024 /** * The desired height of the game window. diff --git a/include/entities.h b/include/entities.h index dbaf9f5..141d29a 100644 --- a/include/entities.h +++ b/include/entities.h @@ -16,7 +16,7 @@ enum _TYPE { //these are the main types of entities OBJECTT = -2, - STRUCTURET = -1, + STRUCTURET, PLAYERT, NPCT, MOBT @@ -72,9 +72,8 @@ public: } bool kill(float delta){ duration -= delta; - if(duration <= 0){ + if(duration <= 0) return true; - } else return false; } }; diff --git a/include/ui.h b/include/ui.h index 97e4bbf..2fe3b0a 100644 --- a/include/ui.h +++ b/include/ui.h @@ -60,7 +60,7 @@ namespace ui { * limited until a right click is given, closing the box. */ - void dialogBox(const char *name,const char *opt,const char *text,...); + void dialogBox(const char *name,const char *opt,bool passive,const char *text,...); void waitForDialog(void); /* diff --git a/include/world.h b/include/world.h index dbaaf2c..4e02a08 100644 --- a/include/world.h +++ b/include/world.h @@ -17,6 +17,11 @@ #define GEN_INC 10 + +#define GEN_MIN 80 +#define GEN_MAX 110 + + /** * Defines how many game ticks it takes for a day to elapse. */ @@ -197,8 +202,7 @@ public: */ void setBGM(const char *path); - void bgmPlay(void); - void bgmStop(void); + void bgmPlay(World *prev); /* * Looks for the furthest back layer in this world and adds a new layer of width `width` behind it. |