Shit

5 files changed, 15 insertions, 7 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 f8bd935..095b3e3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -64,7 +64,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 77ca347..dd3adab 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
@@ -79,6 +79,7 @@ public:
 	
 	Texturec *tex;
 
+	unsigned int randDialog;
 
 	void draw(void);
 	void spawn(float, float);
diff --git a/include/ui.h b/include/ui.h
index f2c0114..2fe3b0a 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -27,7 +27,7 @@ namespace ui {
 	extern unsigned int fontSize;
 	extern bool			 dialogBoxExists;
 	extern unsigned char dialogOptChosen;
-	extern bool edown;
+	extern bool dialogImportant;
 
 	/*
 	 *	Initializes the FreeType system.
@@ -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);
 	
 	/*
@@ -85,6 +85,9 @@ namespace ui {
 	*/
 	
 	void toggleBlack(void);
+	void toggleBlackFast(void);
+	void toggleWhite(void);
+	void waitForCover(void);
 	
 }
 
diff --git a/include/world.h b/include/world.h
index ccf93a8..1e78cd0 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.
  */
@@ -194,8 +199,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.