From 8307afbc91240a0610c4efd60402b9e6bc600ef3 Mon Sep 17 00:00:00 2001 From: Charadon Date: Sun, 11 Sep 2022 12:57:05 -0400 Subject: Made title screen follow new controls --- src/pong.h | 1 + src/title.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'src') 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); -- cgit 1.4.1-2-gfad0