Merge branch 'lonkaars:dev' into dev

4 files changed, 0 insertions, 92 deletions

diff --git a/src/GameLoop/shop.c b/src/GameLoop/shop.c
deleted file mode 100644
index eb6bed5..0000000
--- a/src/GameLoop/shop.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "shop.h"
-
-
-bool hh_show_Shop(){
-	static hh_e_ShopStates hh_e_Shop = hh_e_STATE_SHOW;
-	
-	switch (hh_e_Shop)
-	{
-	case hh_e_STATE_SHOW:
-		//hh_clear_screen();
-
-		//hh_setup_shop();
-		hh_e_Shop = hh_e_STATE_Input;
-		return false;
-		break;
-	case hh_e_STATE_Input:
-		if(g_hh_controller_p1.button_primary){
-			hh_e_Shop = hh_e_STATE_END;
-		}
-		break;
-	case hh_e_STATE_END:
-		hh_e_Shop = hh_e_STATE_SHOW;
-		return true;
-		break;
-	default:
-		hh_e_Shop = hh_e_STATE_SHOW;
-		break;
-	}
-	return false;
-}
diff --git a/src/GameLoop/shop.h b/src/GameLoop/shop.h
deleted file mode 100644
index 4014f58..0000000
--- a/src/GameLoop/shop.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "input.h"
-#include "engine/draw_screen.h"
-
-
-
-#include <stdint.h>
-#include <stdbool.h>
-
-typedef enum {
-	hh_e_STATE_SHOW,
-	hh_e_STATE_Input,
-	hh_e_STATE_END
-} hh_e_ShopStates;
-
-
-bool hh_show_Shop();
diff --git a/src/GameLoop/startingScreen.c b/src/GameLoop/startingScreen.c
deleted file mode 100644
index 4fc5af9..0000000
--- a/src/GameLoop/startingScreen.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "startingScreen.h"
-#include "input.h"
-#include "engine/title_screen.h"
-#include "engine/draw_screen.h"
-// #include "engine/player_controller.h"
-
-bool hh_show_startingScreen(){
-	static hh_e_screenStates hh_e_startingScreen = hh_e_STATE_SHOW;
-	
-	switch (hh_e_startingScreen)
-	{
-	case hh_e_STATE_SHOW:
-		hh_clear_screen();
-		hh_init_title_screen();
-		hh_e_startingScreen = hh_e_STATE_Input;
-		return false;
-		break;
-	case hh_e_STATE_Input:
-		if(g_hh_controller_p1.button_primary){
-			hh_e_startingScreen = hh_e_STATE_END;
-		}
-		break;
-	case hh_e_STATE_END:
-		hh_e_startingScreen = hh_e_STATE_SHOW;
-		return true;
-		break;
-	default:
-		hh_e_startingScreen = hh_e_STATE_SHOW;
-		break;
-	}
-	return false;
-}
diff --git a/src/GameLoop/startingScreen.h b/src/GameLoop/startingScreen.h
deleted file mode 100644
index f51cc66..0000000
--- a/src/GameLoop/startingScreen.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-typedef enum {
-	hh_e_STATE_SHOW,
-	hh_e_STATE_Input,
-	hh_e_STATE_END
-} hh_e_screenStates;
-
-
-bool hh_show_startingScreen();
-