about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorCharadon <dev@iotib.net>2022-09-11 12:57:05 -0400
committerCharadon <dev@iotib.net>2022-09-11 12:57:05 -0400
commit8307afbc91240a0610c4efd60402b9e6bc600ef3 (patch)
treed39eaedd7a5a6d3e737266ef7a6efe5bbf7d4511 /src
parent6e4baef8f260e18dc4ca2e39eb4a84c1e16add7e (diff)
downloadPong-C-8307afbc91240a0610c4efd60402b9e6bc600ef3.tar.gz
Made title screen follow new controls
Diffstat (limited to 'src')
-rw-r--r--src/pong.h1
-rw-r--r--src/title.c15
2 files changed, 11 insertions, 5 deletions
diff --git a/src/pong.h b/src/pong.h
index fb7cc93..1103475 100644
--- a/src/pong.h
+++ b/src/pong.h
@@ -74,5 +74,6 @@ void marathon_main();
 void set_screen_mode();
 bool pause_screen(Camera2D *MainCamera);
 int player_controls();
+int player_controls_pressed();
 
 #endif
diff --git a/src/title.c b/src/title.c
index 5a5fecc..1209193 100644
--- a/src/title.c
+++ b/src/title.c
@@ -430,10 +430,15 @@ int title_screen() {
         }
 
 		/* Gamepad & Keyboard */
-		if(IsGamepadButtonPressed(0, GAMEPAD_BUTTON_LEFT_FACE_DOWN) || IsKeyPressed(KEY_S)) {
-			Choice++;
-		} else if(IsGamepadButtonPressed(0, GAMEPAD_BUTTON_LEFT_FACE_UP) || IsKeyPressed(KEY_W)) {
-			Choice--;
+		switch (player_controls_pressed()) {
+			case CONTROLLER_UP:
+				--Choice;
+				break;
+			case CONTROLLER_DOWN:
+				++Choice;
+				break;
+			default:
+				break;
 		}
 		if(Choice > 4) {
 			Choice = 4;
@@ -480,7 +485,7 @@ int title_screen() {
 			default:
 				break;
         } /* Activate menu item */
-		if(((CheckCollisionRecs(Mouse, *Selected) && IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) || IsKeyPressed(KEY_SPACE) || IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_DOWN))) {
+		if( player_controls_pressed() == CONTROLLER_ACTIVATE ){
 			switch(Choice) {
 				case 2:
 					settings(&MainCamera, TitleMusic);