diff options
| author | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-11-30 23:09:41 +0100 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-11-30 23:09:41 +0100 |
| commit | 81cc1fe615023e2d03b4373a3ac536f7dbcb0ea9 (patch) | |
| tree | 40c173bbc2276ee1cba4527b62e10c3e68c1a114 /src/scenes/settings_scene.c | |
| parent | a6a60d7d465c0eebaa93011914abd3ab16bf6c05 (diff) | |
close #26
Diffstat (limited to 'src/scenes/settings_scene.c')
| -rw-r--r-- | src/scenes/settings_scene.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/scenes/settings_scene.c b/src/scenes/settings_scene.c index 23655d3..d5573f5 100644 --- a/src/scenes/settings_scene.c +++ b/src/scenes/settings_scene.c @@ -2,7 +2,7 @@ enum settings_state {
SETTINGS_AUDIO,
SETTINGS_DISPLAY,
- SETTINGS_KEYBINDINGS,
+ //SETTINGS_KEYBINDINGS,
};
enum settings_state settings_state = SETTINGS_AUDIO;
@@ -90,7 +90,7 @@ static void settings_draw_options(platform_window* window) // Buttons
s32 button_pad = 10*scale;
- s32 button_w = (panel_w-(button_pad*4))/3;
+ s32 button_w = (panel_w-(button_pad*4))/2;
s32 button_h = 37*scale;
s32 button_y = panel_y + button_pad*1.3f;
s32 button_x = panel_x + button_pad;
@@ -105,10 +105,10 @@ static void settings_draw_options(platform_window* window) settings_state = SETTINGS_DISPLAY;
}
- if (button_render(scale, BUTTON_ENABLED, "Keybindings", button_x + (button_w + button_pad)*2, button_y, button_w, button_h))
- {
- settings_state = SETTINGS_KEYBINDINGS;
- }
+ //if (button_render(scale, BUTTON_ENABLED, "Keybindings", button_x + (button_w + button_pad)*2, button_y, button_w, button_h))
+ //{
+ // settings_state = SETTINGS_KEYBINDINGS;
+ //}
s32 detail_pad = 25*scale;
s32 detail_w = panel_w - (detail_pad*2)-(button_pad*2);
@@ -131,7 +131,12 @@ static void settings_draw_options(platform_window* window) s32 back_y = panel_y + panel_h - (back_h/2) - 1;
if (push_back_button(scale, back_x, back_y, back_w, back_h)) {
- game_set_active_scene(GAME_STATE_MENU);
+ if (is_editing_settings_from_ingame) {
+ game_set_active_scene(GAME_STATE_WORLD_MAP);
+ }
+ else {
+ game_set_active_scene(GAME_STATE_MENU);
+ }
}
}
}
@@ -143,7 +148,12 @@ void settings_scene_render(platform_window* window) { void settings_scene_update(platform_window* window) {
if (keyboard_is_key_pressed(KEY_ESCAPE)) {
- game_set_active_scene(GAME_STATE_MENU);
+ if (is_editing_settings_from_ingame) {
+ game_set_active_scene(GAME_STATE_WORLD_MAP);
+ }
+ else {
+ game_set_active_scene(GAME_STATE_MENU);
+ }
}
}
|