From a9d2ec40c1a6506fc6ad99bbd5e16baf2ab0cf6c Mon Sep 17 00:00:00 2001 From: Neil McGill Date: Fri, 24 Jan 2025 18:41:49 +0000 Subject: [PATCH] format --- src/game.cpp | 4 ++-- src/my_game.hpp | 4 ++-- src/wid_cfg_key.cpp | 52 +++++++++++++++++++++---------------------- src/wid_cfg_sound.cpp | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index b880e7c..d55e875 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -508,7 +508,7 @@ void game_load_config(class Game *g) { g->load_config(); } class HiScores *game_hiscores_get(class Game *g) { return &g->config.hiscores; } void game_visible_map_pix_get(class Game *g, int *visible_map_tl_x, int *visible_map_tl_y, int *visible_map_br_x, - int *visible_map_br_y) + int *visible_map_br_y) { *visible_map_tl_x = g->visible_map_tl_x; *visible_map_tl_y = g->visible_map_tl_y; @@ -517,7 +517,7 @@ void game_visible_map_pix_get(class Game *g, int *visible_map_tl_x, int *visible } void game_visible_map_pix_set(class Game *g, int visible_map_tl_x, int visible_map_tl_y, int visible_map_br_x, - int visible_map_br_y) + int visible_map_br_y) { g->visible_map_tl_x = visible_map_tl_x; g->visible_map_tl_y = visible_map_tl_y; diff --git a/src/my_game.hpp b/src/my_game.hpp index ae252cb..6c5ad85 100644 --- a/src/my_game.hpp +++ b/src/my_game.hpp @@ -25,9 +25,9 @@ extern class Game *game; class HiScores *game_hiscores_get(class Game *); void game_visible_map_pix_get(class Game *, int *visible_map_tl_x, int *visible_map_tl_y, int *visible_map_br_x, - int *visible_map_br_y); + int *visible_map_br_y); void game_visible_map_pix_set(class Game *, int visible_map_tl_x, int visible_map_tl_y, int visible_map_br_x, - int visible_map_br_y); + int visible_map_br_y); void game_visible_map_mouse_get(class Game *game, int *visible_map_mouse_x, int *visible_map_mouse_y); void game_visible_map_mouse_set(class Game *game, int visible_map_mouse_x, int visible_map_mouse_y); diff --git a/src/wid_cfg_key.cpp b/src/wid_cfg_key.cpp index 5dd3a28..517ecf0 100644 --- a/src/wid_cfg_key.cpp +++ b/src/wid_cfg_key.cpp @@ -267,8 +267,8 @@ static void grab_key(const std::string which) { TRACE_AND_INDENT(); wid_notice("Press a key for " + which); - g_grab_next_key = true; - local_g_config_changed = true; + g_grab_next_key = true; + local_g_config_changed = true; } static bool wid_cfg_keyboard_profile_arrow_keys(Widp w, int x, int y, uint32_t button) @@ -337,8 +337,8 @@ static bool wid_cfg_key_move_left(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("move left"); - sdl.on_sdl_key_grab = wid_cfg_key_move_left_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_move_left_set; + local_g_config_changed = true; return true; } @@ -346,8 +346,8 @@ static bool wid_cfg_key_move_right(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("move right"); - sdl.on_sdl_key_grab = wid_cfg_key_move_right_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_move_right_set; + local_g_config_changed = true; return true; } @@ -355,8 +355,8 @@ static bool wid_cfg_key_move_up(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("move up"); - sdl.on_sdl_key_grab = wid_cfg_key_move_up_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_move_up_set; + local_g_config_changed = true; return true; } @@ -364,8 +364,8 @@ static bool wid_cfg_key_move_down(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("move down"); - sdl.on_sdl_key_grab = wid_cfg_key_move_down_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_move_down_set; + local_g_config_changed = true; return true; } @@ -373,8 +373,8 @@ static bool wid_cfg_key_attack(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("attack"); - sdl.on_sdl_key_grab = wid_cfg_key_attack_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_attack_set; + local_g_config_changed = true; return true; } @@ -382,8 +382,8 @@ static bool wid_cfg_key_unused1(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("item unused1"); - sdl.on_sdl_key_grab = wid_cfg_key_unused1_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_unused1_set; + local_g_config_changed = true; return true; } @@ -391,8 +391,8 @@ static bool wid_cfg_key_save(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("save game"); - sdl.on_sdl_key_grab = wid_cfg_key_save_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_save_set; + local_g_config_changed = true; return true; } @@ -400,8 +400,8 @@ static bool wid_cfg_key_load(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("load game"); - sdl.on_sdl_key_grab = wid_cfg_key_load_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_load_set; + local_g_config_changed = true; return true; } @@ -409,8 +409,8 @@ static bool wid_cfg_key_help(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("help"); - sdl.on_sdl_key_grab = wid_cfg_key_help_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_help_set; + local_g_config_changed = true; return true; } @@ -418,8 +418,8 @@ static bool wid_cfg_key_console(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("toggle console"); - sdl.on_sdl_key_grab = wid_cfg_key_console_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_console_set; + local_g_config_changed = true; return true; } @@ -427,8 +427,8 @@ static bool wid_cfg_key_quit(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("quit"); - sdl.on_sdl_key_grab = wid_cfg_key_quit_set; - local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_quit_set; + local_g_config_changed = true; return true; } @@ -436,8 +436,8 @@ static bool wid_cfg_key_screenshot(Widp w, int x, int y, uint32_t button) { TRACE_AND_INDENT(); grab_key("screenshot grab"); - local_g_config_changed = true; - sdl.on_sdl_key_grab = wid_cfg_key_screenshot_set; + local_g_config_changed = true; + sdl.on_sdl_key_grab = wid_cfg_key_screenshot_set; return true; } diff --git a/src/wid_cfg_sound.cpp b/src/wid_cfg_sound.cpp index 54510bc..d9e3fc5 100644 --- a/src/wid_cfg_sound.cpp +++ b/src/wid_cfg_sound.cpp @@ -19,8 +19,8 @@ static void wid_cfg_sound_destroy(class Game *g) { TRACE_AND_INDENT(); delete wid_cfg_sound_window; - wid_cfg_sound_window = nullptr; - local_g_config_changed = false; + wid_cfg_sound_window = nullptr; + local_g_config_changed = false; } static bool wid_cfg_sound_cancel(Widp w, int x, int y, uint32_t button)