world draw fix; offset fix

5 files changed, 12 insertions, 28 deletions

diff --git a/include/events.hpp b/include/events.hpp
index 975855c..f38d4e6 100644
--- a/include/events.hpp
+++ b/include/events.hpp
@@ -1,4 +1,4 @@
-#ifndef EVENTS_HPP_
+z#ifndef EVENTS_HPP_
 #define EVENTS_HPP_
 
 /**
@@ -75,7 +75,7 @@ struct BGMToggleEvent {
 struct WindowResizeEvent {
 	WindowResizeEvent(int w = 640, int h = 480)
 		: x(w), y(h) {}
-	
+
 	int x;
 	int y;
 };
@@ -83,9 +83,9 @@ struct WindowResizeEvent {
 struct ScreenshotEvent {
 	ScreenshotEvent(int w = game::SCREEN_HEIGHT, int h = game::SCREEN_WIDTH)
 		: w(w), h(h) {}
-	
+
 	int w;
-	int h;	
+	int h;
 };
 
 #endif // EVENTS_HPP_
diff --git a/include/player.hpp b/include/player.hpp
index 187e77e..59d6368 100644
--- a/include/player.hpp
+++ b/include/player.hpp
@@ -4,6 +4,7 @@
 #include <entityx/entityx.h>
 
 #include <events.hpp>
+#include <engine.hpp>
 #include <components.hpp>
 #include <common.hpp>
 
@@ -34,6 +35,8 @@ public:
     vec2 getPosition(void) const;
 	inline void setX(const float& x)
 	{ player.component<Position>().get()->x = x; }
+    inline float getWidth(void) const
+    { return game::entities.component<Solid>(player.id())->width; }
 };
 
 #endif // PLAYER_HPP_
diff --git a/include/ui.hpp b/include/ui.hpp
index 5863cf0..85c5997 100644
--- a/include/ui.hpp
+++ b/include/ui.hpp
@@ -23,7 +23,7 @@
 #include <config.hpp>
 //#include <inventory.hpp>
 #include <ui_menu.hpp>
-//#include <ui_action.hpp>
+#include <events.hpp>
 
 // local library headers
 #include <SDL2/SDL_opengl.h>
@@ -160,7 +160,7 @@ namespace ui {
 	/*
  	 *  Takes a screenshot of the game
  	 */
-	
+
 	void takeScreenshot(GLubyte *pixels);
 }
 
diff --git a/include/ui_action.hpp.bak b/include/ui_action.hpp.bak
deleted file mode 100644
index a275ab3..0000000
--- a/include/ui_action.hpp.bak
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef ACTION_H_
-#define ACTION_H_
-
-#include <common.hpp>
-#include <ui.hpp>
-
-namespace ui {
-    namespace action {
-        extern bool make;
-
-        // enables the action ui
-        void enable(void);
-        // disables the action ui
-        void disable(void);
-
-        // draws the action ui
-        void draw(vec2 loc);
-    }
-}
-
-#endif // ACTION_H_
diff --git a/include/world.hpp b/include/world.hpp
index cb8c30d..b8a80a4 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -168,6 +168,8 @@ private:
 	std::string currentXMLFile;
 
 public:
+	std::thread thAmbient;
+
 	explicit WorldSystem(void);
 	~WorldSystem(void);
 
@@ -206,7 +208,7 @@ public:
 	// worlddata2 stuff
 	WorldData2 worldData;
 
-	void generate(unsigned int width = 0);
+	void generate(int width = 0);
 	void addHole(const unsigned int& start, const unsigned int& end);
 	void addHill(const ivec2& peak, const unsigned int& width);