Merge remote-tracking branch 'origin/master'

d

Conflicts:
	include/World.h
	include/common.h
	include/entities.h
	src/UIClass.cpp
	src/World.cpp
	src/entities.cpp
	src/main.cpp

1 files changed, 24 insertions, 0 deletions

diff --git a/include/World.h b/include/World.h
index 6da0972..dd133b9 100644
--- a/include/World.h
+++ b/include/World.h
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #ifndef WORLD_H
 #define WORLD_H
 
@@ -16,3 +17,26 @@ public:
 };
 
 #endif // WORLD_H
+=======
+#ifndef WORLD_H
+#define WORLD_H
+
+#include <common.h>
+
+#define HLINE (2.0f/(SCREEN_WIDTH/4))
+
+class World {
+private:
+	struct line_t {
+		// x = 2.0 (window width) / HLINES
+		double start; // Where to change to dirt, going down (y)
+	} *line;
+	unsigned int lineCount;
+public:
+	World(float width);
+	void draw(void);
+	void detect(vec2 *v,const float width);
+};
+
+#endif // WORLD_H
+>>>>>>> origin/master