(UNCLEAN) partial merge of #37

2 files changed, 5 insertions, 7 deletions

diff --git a/src/GameLoop/shop.h b/src/GameLoop/shop.h
index 35bb780..39db9fd 100644
--- a/src/GameLoop/shop.h
+++ b/src/GameLoop/shop.h
@@ -1,7 +1,8 @@
+#pragma once
+
 #include "input.h"
 #include "engine/draw_screen.h"
 
-
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -11,5 +12,4 @@ typedef enum {
 	hh_e_STATE_END
 } hh_e_ShopStates;
 
-
 bool hh_show_Shop();
diff --git a/src/GameLoop/startingScreen.h b/src/GameLoop/startingScreen.h
index f51cc66..5b4f15a 100644
--- a/src/GameLoop/startingScreen.h
+++ b/src/GameLoop/startingScreen.h
@@ -1,13 +1,11 @@
 #pragma once
 
+#include "GameLoop/shop.h"
 #include <stdint.h>
 #include <stdbool.h>
 
-typedef enum {
-	hh_e_STATE_SHOW,
-	hh_e_STATE_Input,
-	hh_e_STATE_END
-} hh_e_screenStates;
+// TODO: fix naming of enum consts
+typedef hh_e_ShopStates hh_e_screenStates;
 
 
 bool hh_show_startingScreen();