Moved GUI out of GUI.

include/dawn/dawn.h

@@ -11,10 +11,9 @@
 #include "display/animation/queue.h"
 #include "display/animation/timeline.h"
 
-#include "display/gui/bitmapfont.h"
-#include "display/gui/font.h"
-
+#include "display/bitmapfont.h"
 #include "display/camera.h"
+#include "display/font.h"
 #include "display/framebuffer.h"
 #include "display/matrix.h"
 #include "display/primitive.h"

include/dawn/display/bitmapfont.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "../../libs.h"
+#include "../libs.h"
 
 /** Which is the first character within the font tilemap */
 #define BITMAP_FONT_CHAR_START 33

include/dawn/display/font.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "../../libs.h"
-#include "../texture.h"
+#include "../libs.h"
+#include "texture.h"
 
 /** Which character (ASCII) to start the font from */
 #define FONT_FIRST_CHAR 32

include/dawn/game/poker/pokergameassets.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "../../display/gui/font.h"
+#include "../../display/font.h"
 #include "../../display/shader.h"
 #include "../../locale/language.h"
 

include/dawn/poker/turn.h

@@ -11,7 +11,9 @@
 #define POKER_TURN_TYPE_OUT 0x00
 #define POKER_TURN_TYPE_FOLD 0x01
 #define POKER_TURN_TYPE_BET 0x02
-#define POKER_TURN_TYPE_CHECK 0x03
+#define POKER_TURN_TYPE_CALL 0x03
+#define POKER_TURN_TYPE_ALL_IN 0x04
+#define POKER_TURN_TYPE_CHECK 0x05
 
 /** The turn that a player/the AI decided to do for its turn */
 typedef struct {

include/dawn/ui/frame.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "../libs.h"
 #include "../display/primitive.h"
-#include "../display/gui/font.h"
+#include "../display/font.h"
 
 /** Size of the border (in pixels) on each edge */
 #define FRAME_BORDER_SIZE 16

include/dawn/ui/label.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "../libs.h"
 #include "../display/primitive.h"
-#include "../display/gui/font.h"
+#include "../display/font.h"
 
 /** Representation of a Label UI Element */
 typedef struct {

include/dawn/vn/vntextbox.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "../libs.h"
 #include "../display/animation/timeline.h"
-#include "../display/gui/font.h"
+#include "../display/font.h"
 #include "../ui/frame.h"
 #include "../util/flags.h"