From e7a02adbd498da5bbe8a4b060cc8687f272ab58d Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Fri, 30 Aug 2024 00:51:56 +0200 Subject: [PATCH] option: fix function naming --- src/game/option/option_compass.c | 6 +- src/game/option/option_control.c | 85 +++++++++--------- src/game/option/option_control_pick.c | 16 ++-- src/game/option/option_graphics.c | 84 ++++++++--------- src/game/option/option_passport.c | 124 +++++++++++++------------- src/game/option/option_passport.h | 4 +- src/game/option/option_sound.c | 6 +- 7 files changed, 163 insertions(+), 162 deletions(-) diff --git a/src/game/option/option_compass.c b/src/game/option/option_compass.c index 671d2fd89..db3255ffe 100644 --- a/src/game/option/option_compass.c +++ b/src/game/option/option_compass.c @@ -26,9 +26,9 @@ typedef enum COMPASS_TEXT { static TEXTSTRING *m_Text[TEXT_NUMBER_OF] = { 0 }; -static void Option_CompassInitText(void); +static void Option_Compass_InitText(void); -static void Option_CompassInitText(void) +static void Option_Compass_InitText(void) { char buf[100]; const int top_y = -60; @@ -111,7 +111,7 @@ void Option_Compass(INVENTORY_ITEM *inv_item) char time_buf[100]; if (!m_Text[0]) { - Option_CompassInitText(); + Option_Compass_InitText(); } int32_t seconds = diff --git a/src/game/option/option_control.c b/src/game/option/option_control.c index d8dc30d0f..507e74b02 100644 --- a/src/game/option/option_control.c +++ b/src/game/option/option_control.c @@ -186,21 +186,21 @@ static const TEXT_COLUMN_PLACEMENT CtrlTextPlacementCheats[] = { { COL_END, -1, false }, }; -static void Option_ControlInitMenu(void); -static void Option_ControlInitText(CONTROL_MODE mode, INPUT_LAYOUT layout_num); -static void Option_ControlUpdateText( +static void Option_Control_InitMenu(void); +static void Option_Control_InitText(CONTROL_MODE mode, INPUT_LAYOUT layout_num); +static void Option_Control_UpdateText( CONTROL_MODE mode, INPUT_LAYOUT layout_num); -static void Option_ControlShutdownText(void); -static void Option_ControlFlashConflicts( +static void Option_Control_ShutdownText(void); +static void Option_Control_FlashConflicts( CONTROL_MODE mode, INPUT_LAYOUT layout_num); -static INPUT_LAYOUT Option_ControlChangeLayout(CONTROL_MODE mode); -static void Option_ControlCheckResetKeys( +static INPUT_LAYOUT Option_Control_ChangeLayout(CONTROL_MODE mode); +static void Option_Control_CheckResetKeys( CONTROL_MODE mode, INPUT_LAYOUT layout_num); -static void Option_ControlCheckUnbindKey( +static void Option_Control_CheckUnbindKey( CONTROL_MODE mode, INPUT_LAYOUT layout_num); -static void Option_ControlProgressBar(TEXTSTRING *txt, int32_t timer); +static void Option_Control_ProgressBar(TEXTSTRING *txt, int32_t timer); -static void Option_ControlInitMenu(void) +static void Option_Control_InitMenu(void) { int32_t visible_lines = 0; if (Screen_GetResHeightDownscaled(RSR_TEXT) <= 240) { @@ -231,9 +231,9 @@ static void Option_ControlInitMenu(void) MIN(m_ControlMenu.num_options, m_ControlMenu.vis_options); } -static void Option_ControlInitText(CONTROL_MODE mode, INPUT_LAYOUT layout_num) +static void Option_Control_InitText(CONTROL_MODE mode, INPUT_LAYOUT layout_num) { - Option_ControlInitMenu(); + Option_Control_InitMenu(); m_Text[TEXT_TITLE_BORDER] = Text_Create(0, TOP_Y - BORDER, " "); Text_CentreH(m_Text[TEXT_TITLE_BORDER], true); @@ -339,11 +339,12 @@ static void Option_ControlInitText(CONTROL_MODE mode, INPUT_LAYOUT layout_num) Text_Hide(m_Text[TEXT_UNBIND], true); } - Option_ControlUpdateText(mode, layout_num); - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); } -static void Option_ControlUpdateText(CONTROL_MODE mode, INPUT_LAYOUT layout_num) +static void Option_Control_UpdateText( + CONTROL_MODE mode, INPUT_LAYOUT layout_num) { if (layout_num == INPUT_LAYOUT_DEFAULT) { Text_Hide(m_Text[TEXT_RESET], true); @@ -463,7 +464,7 @@ static void Option_ControlUpdateText(CONTROL_MODE mode, INPUT_LAYOUT layout_num) } } -static void Option_ControlShutdownText(void) +static void Option_Control_ShutdownText(void) { for (int i = 0; i < TEXT_NUMBER_OF; i++) { Text_Remove(m_Text[i]); @@ -493,7 +494,7 @@ static void Option_ControlShutdownText(void) m_UnbindKeyDelay = 0; } -static void Option_ControlFlashConflicts( +static void Option_Control_FlashConflicts( CONTROL_MODE mode, INPUT_LAYOUT layout_num) { const TEXT_COLUMN_PLACEMENT *cols = g_Config.enable_cheats @@ -511,7 +512,7 @@ static void Option_ControlFlashConflicts( } } -static INPUT_LAYOUT Option_ControlChangeLayout(CONTROL_MODE mode) +static INPUT_LAYOUT Option_Control_ChangeLayout(CONTROL_MODE mode) { INPUT_LAYOUT layout_num = INPUT_LAYOUT_DEFAULT; if (mode == CM_KEYBOARD) { @@ -531,13 +532,13 @@ static INPUT_LAYOUT Option_ControlChangeLayout(CONTROL_MODE mode) } Input_CheckConflicts(mode, layout_num); - Option_ControlUpdateText(mode, layout_num); - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); Config_Write(); return layout_num; } -static void Option_ControlProgressBar(TEXTSTRING *txt, int32_t timer) +static void Option_Control_ProgressBar(TEXTSTRING *txt, int32_t timer) { int32_t width = Text_GetWidth(txt); int32_t height = TEXT_HEIGHT; @@ -563,7 +564,7 @@ static void Option_ControlProgressBar(TEXTSTRING *txt, int32_t timer) txt, width, height, x, y, percent, g_Config.ui.menu_style); } -static void Option_ControlCheckResetKeys( +static void Option_Control_CheckResetKeys( CONTROL_MODE mode, INPUT_LAYOUT layout_num) { const int32_t frame = Clock_GetLogicalFrame(); @@ -581,8 +582,8 @@ static void Option_ControlCheckResetKeys( Sound_Effect(SFX_MENU_GAMEBOY, NULL, SPM_NORMAL); Input_ResetLayout(mode, layout_num); Input_CheckConflicts(mode, layout_num); - Option_ControlUpdateText(mode, layout_num); - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); Config_Write(); m_ResetKeyMode = KM_CHANGEKEYUP; m_ResetTimer = 0; @@ -601,10 +602,10 @@ static void Option_ControlCheckResetKeys( int32_t progress = m_ResetTimer > 0 ? frame - m_ResetTimer : 0; CLAMP(progress, 0, LOGIC_FPS * BUTTON_HOLD_TIME); - Option_ControlProgressBar(m_Text[TEXT_RESET], progress); + Option_Control_ProgressBar(m_Text[TEXT_RESET], progress); } -static void Option_ControlCheckUnbindKey( +static void Option_Control_CheckUnbindKey( CONTROL_MODE mode, INPUT_LAYOUT layout_num) { const int32_t frame = Clock_GetLogicalFrame(); @@ -628,8 +629,8 @@ static void Option_ControlCheckUnbindKey( layout_num, m_ControlMenu.cur_role, UNBIND_ENUM); } Input_CheckConflicts(mode, layout_num); - Option_ControlUpdateText(mode, layout_num); - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); Config_Write(); m_UnbindKeyMode = KM_CHANGEKEYUP; m_UnbindTimer = 0; @@ -648,7 +649,7 @@ static void Option_ControlCheckUnbindKey( int32_t progress = m_UnbindTimer > 0 ? frame - m_UnbindTimer : 0; CLAMP(progress, 0, LOGIC_FPS * BUTTON_HOLD_TIME); - Option_ControlProgressBar(m_Text[TEXT_UNBIND], progress); + Option_Control_ProgressBar(m_Text[TEXT_UNBIND], progress); } CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) @@ -662,7 +663,7 @@ CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) if (!m_Text[TEXT_TITLE]) { m_KeyMode = KM_BROWSE; - Option_ControlInitText(mode, layout_num); + Option_Control_InitText(mode, layout_num); } const TEXT_COLUMN_PLACEMENT *cols = g_Config.enable_cheats @@ -673,12 +674,12 @@ CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) case KM_BROWSE: if (layout_num > INPUT_LAYOUT_DEFAULT) { if (m_UnbindKeyMode == KM_INACTIVE) { - Option_ControlCheckResetKeys(mode, layout_num); + Option_Control_CheckResetKeys(mode, layout_num); } if (m_ResetKeyMode == KM_INACTIVE && m_ControlMenu.cur_row->can_unbind) { - Option_ControlCheckUnbindKey(mode, layout_num); + Option_Control_CheckUnbindKey(mode, layout_num); } } @@ -688,7 +689,7 @@ CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) if (g_InputDB.menu_back || (g_InputDB.menu_confirm && m_ControlMenu.cur_role == KC_TITLE)) { - Option_ControlShutdownText(); + Option_Control_ShutdownText(); m_KeyMode = KM_INACTIVE; g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; @@ -697,7 +698,7 @@ CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) if ((g_InputDB.menu_left || g_InputDB.menu_right) && m_ControlMenu.cur_role == KC_TITLE) { - layout_num = Option_ControlChangeLayout(mode); + layout_num = Option_Control_ChangeLayout(mode); } if (g_InputDB.menu_confirm) { @@ -731,8 +732,8 @@ CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) m_ControlMenu.cur_row--; m_ControlMenu.cur_role = m_ControlMenu.cur_row->role; } - Option_ControlUpdateText(mode, layout_num); - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); } else if (g_InputDB.menu_down) { if (m_ControlMenu.cur_role == KC_TITLE) { m_ControlMenu.row_num++; @@ -755,30 +756,30 @@ CONTROL_MODE Option_Control(INVENTORY_ITEM *inv_item, CONTROL_MODE mode) m_ControlMenu.cur_row++; m_ControlMenu.cur_role = m_ControlMenu.cur_row->role; } - Option_ControlUpdateText(mode, layout_num); - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); } break; case KM_BROWSEKEYUP: if (!g_Input.any) { - Option_ControlUpdateText(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); m_KeyMode = KM_CHANGE; } break; case KM_CHANGE: if (Input_ReadAndAssignKey(mode, layout_num, m_ControlMenu.cur_role)) { - Option_ControlUpdateText(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); m_KeyMode = KM_CHANGEKEYUP; - Option_ControlFlashConflicts(mode, layout_num); + Option_Control_FlashConflicts(mode, layout_num); Config_Write(); } break; case KM_CHANGEKEYUP: if (!g_Input.any) { - Option_ControlUpdateText(mode, layout_num); + Option_Control_UpdateText(mode, layout_num); m_KeyMode = KM_BROWSE; } break; diff --git a/src/game/option/option_control_pick.c b/src/game/option/option_control_pick.c index 56328024a..a0c1d6d2c 100644 --- a/src/game/option/option_control_pick.c +++ b/src/game/option/option_control_pick.c @@ -19,10 +19,10 @@ typedef enum PICK_TEXT { static TEXTSTRING *m_Text[TEXT_NUMBER_OF] = { 0 }; -static void Option_ControlPickInitText(void); -static void Option_ControlPickShutdownText(void); +static void Option_ControlPick_InitText(void); +static void Option_ControlPick_ShutdownText(void); -static void Option_ControlPickInitText(void) +static void Option_ControlPick_InitText(void) { m_Text[TEXT_TITLE_BORDER] = Text_Create(0, -32, " "); Text_AddBackground(m_Text[TEXT_TITLE_BORDER], 180, 85, 0, 0, TS_BACKGROUND); @@ -44,7 +44,7 @@ static void Option_ControlPickInitText(void) } } -static void Option_ControlPickShutdownText(void) +static void Option_ControlPick_ShutdownText(void) { for (int i = 0; i < TEXT_NUMBER_OF; i++) { Text_Remove(m_Text[i]); @@ -55,7 +55,7 @@ static void Option_ControlPickShutdownText(void) CONTROL_MODE Option_ControlPick(void) { if (!m_Text[TEXT_KEYBOARD]) { - Option_ControlPickInitText(); + Option_ControlPick_InitText(); } if (g_InputDB.menu_up && g_OptionSelected > TEXT_OPTION_MIN) { @@ -79,7 +79,7 @@ CONTROL_MODE Option_ControlPick(void) switch (g_OptionSelected) { case TEXT_KEYBOARD: if (g_InputDB.menu_confirm) { - Option_ControlPickShutdownText(); + Option_ControlPick_ShutdownText(); g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; return CM_KEYBOARD; @@ -88,7 +88,7 @@ CONTROL_MODE Option_ControlPick(void) case TEXT_CONTROLLER: if (g_InputDB.menu_confirm) { - Option_ControlPickShutdownText(); + Option_ControlPick_ShutdownText(); g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; return CM_CONTROLLER; @@ -97,7 +97,7 @@ CONTROL_MODE Option_ControlPick(void) } if (g_InputDB.menu_back) { - Option_ControlPickShutdownText(); + Option_ControlPick_ShutdownText(); } return CM_PICK; diff --git a/src/game/option/option_graphics.c b/src/game/option/option_graphics.c index fe5ed8bad..001c86d70 100644 --- a/src/game/option/option_graphics.c +++ b/src/game/option/option_graphics.c @@ -94,22 +94,22 @@ static bool m_HideArrowLeft = false; static bool m_HideArrowRight = false; static TEXTSTRING *m_Text[TEXT_NUMBER_OF] = { 0 }; -static void Option_GraphicsUpdateMenuVisible(void); -static void Option_GraphicsReinitialize(GRAPHICS_OPTION_NAME starting_option); -static void Option_GraphicsMenuUp(void); -static void Option_GraphicsMenuDown(void); -static void Option_GraphicsInitText(void); -static void Option_GraphicsUpdateText(void); -static void Option_GraphicsShutdown(void); -static void Option_GraphicsUpdateArrows( +static void Option_Graphics_UpdateMenuVisible(void); +static void Option_Graphics_Reinitialize(GRAPHICS_OPTION_NAME starting_option); +static void Option_Graphics_MenuUp(void); +static void Option_Graphics_MenuDown(void); +static void Option_Graphics_InitText(void); +static void Option_Graphics_UpdateText(void); +static void Option_Graphics_Shutdown(void); +static void Option_Graphics_UpdateArrows( GRAPHICS_OPTION_NAME option_name, TEXTSTRING value_text, bool more_up, bool more_down); -static void Option_GraphicsChangeTextOption( +static void Option_Graphics_ChangeTextOption( const GRAPHICS_OPTION_ROW *row, TEXTSTRING *option_text, TEXTSTRING *value_text); -static int16_t Option_GraphicsPlaceColumns(bool create); +static int16_t Option_Graphics_PlaceColumns(bool create); -static void Option_GraphicsInitMenu(void) +static void Option_Graphics_InitMenu(void) { m_GraphicsMenu.first_option = &m_GfxOptionRows[OPTION_FPS]; m_GraphicsMenu.last_option = &m_GfxOptionRows[OPTION_PERSPECTIVE]; @@ -120,7 +120,7 @@ static void Option_GraphicsInitMenu(void) m_GraphicsMenu.last_visible = &m_GfxOptionRows[OPTION_FPS]; } -static void Option_GraphicsUpdateMenuVisible(void) +static void Option_Graphics_UpdateMenuVisible(void) { int32_t visible_lines = 0; if (Screen_GetResHeightDownscaled(RSR_TEXT) <= 240) { @@ -138,18 +138,18 @@ static void Option_GraphicsUpdateMenuVisible(void) &m_GfxOptionRows[OPTION_FPS] + m_GraphicsMenu.num_vis_options - 1; } -static void Option_GraphicsReinitialize(GRAPHICS_OPTION_NAME starting_option) +static void Option_Graphics_Reinitialize(GRAPHICS_OPTION_NAME starting_option) { - Option_GraphicsShutdown(); - Option_GraphicsInitText(); + Option_Graphics_Shutdown(); + Option_Graphics_InitText(); m_IsTextInit = true; for (const GRAPHICS_OPTION_ROW *row = m_GraphicsMenu.first_option; row->option_name != starting_option; row++) { - Option_GraphicsMenuDown(); + Option_Graphics_MenuDown(); } } -static void Option_GraphicsMenuUp(void) +static void Option_Graphics_MenuUp(void) { if (m_GraphicsMenu.cur_option != m_GraphicsMenu.first_option) { if (m_GraphicsMenu.cur_option == m_GraphicsMenu.first_visible) { @@ -159,11 +159,11 @@ static void Option_GraphicsMenuUp(void) m_GraphicsMenu.row_num--; } m_GraphicsMenu.cur_option--; - Option_GraphicsUpdateText(); + Option_Graphics_UpdateText(); } } -static void Option_GraphicsMenuDown(void) +static void Option_Graphics_MenuDown(void) { if (m_GraphicsMenu.cur_option != m_GraphicsMenu.last_option) { if (m_GraphicsMenu.cur_option == m_GraphicsMenu.last_visible) { @@ -173,14 +173,14 @@ static void Option_GraphicsMenuDown(void) m_GraphicsMenu.row_num++; } m_GraphicsMenu.cur_option++; - Option_GraphicsUpdateText(); + Option_Graphics_UpdateText(); } } -static void Option_GraphicsInitText(void) +static void Option_Graphics_InitText(void) { - Option_GraphicsInitMenu(); - Option_GraphicsUpdateMenuVisible(); + Option_Graphics_InitMenu(); + Option_Graphics_UpdateMenuVisible(); m_Text[TEXT_TITLE_BORDER] = Text_Create(0, TOP_Y - 2, " "); Text_CentreH(m_Text[TEXT_TITLE_BORDER], 1); @@ -192,7 +192,7 @@ static void Option_GraphicsInitText(void) Text_AddBackground(m_Text[TEXT_TITLE], ROW_WIDTH - 4, 0, 0, 0, TS_HEADING); Text_AddOutline(m_Text[TEXT_TITLE], true, TS_HEADING); - int16_t max_y = Option_GraphicsPlaceColumns(true); + int16_t max_y = Option_Graphics_PlaceColumns(true); int16_t width = ROW_WIDTH; int16_t height = max_y + BORDER * 2 - TOP_Y; @@ -234,21 +234,21 @@ static void Option_GraphicsInitText(void) // m_Text[TEXT_ROW_SELECT], ROW_WIDTH - 7, 0, 0, 0, TS_REQUESTED); // Text_AddOutline(m_Text[TEXT_ROW_SELECT], true, TS_REQUESTED); - Option_GraphicsUpdateText(); + Option_Graphics_UpdateText(); } -static void Option_GraphicsUpdateText(void) +static void Option_Graphics_UpdateText(void) { int i; const GRAPHICS_OPTION_ROW *row; for (i = 0, row = m_GraphicsMenu.first_visible; row <= m_GraphicsMenu.last_visible; i++, row++) { - Option_GraphicsChangeTextOption( + Option_Graphics_ChangeTextOption( row, m_GraphicsMenu.option_texts[i], m_GraphicsMenu.value_texts[i]); } } -static void Option_GraphicsShutdown(void) +static void Option_Graphics_Shutdown(void) { for (int i = 0; i < TEXT_NUMBER_OF; i++) { Text_Remove(m_Text[i]); @@ -263,10 +263,10 @@ static void Option_GraphicsShutdown(void) m_IsTextInit = false; m_HideArrowLeft = false; m_HideArrowRight = false; - Option_GraphicsInitMenu(); + Option_Graphics_InitMenu(); } -static void Option_GraphicsUpdateArrows( +static void Option_Graphics_UpdateArrows( GRAPHICS_OPTION_NAME option_name, TEXTSTRING value_text, bool more_up, bool more_down) { @@ -345,7 +345,7 @@ static void Option_GraphicsUpdateArrows( } } -static int16_t Option_GraphicsPlaceColumns(bool create) +static int16_t Option_Graphics_PlaceColumns(bool create) { const int16_t centre = Screen_GetResWidthDownscaled(RSR_TEXT) / 2; const GRAPHICS_OPTION_ROW *row = m_GraphicsMenu.first_visible; @@ -379,7 +379,7 @@ static int16_t Option_GraphicsPlaceColumns(bool create) return MAX(name_y, value_y); } -static void Option_GraphicsChangeTextOption( +static void Option_Graphics_ChangeTextOption( const GRAPHICS_OPTION_ROW *row, TEXTSTRING *option_text, TEXTSTRING *value_text) { @@ -463,16 +463,16 @@ static void Option_GraphicsChangeTextOption( void Option_Graphics(INVENTORY_ITEM *inv_item) { if (!m_IsTextInit) { - Option_GraphicsInitText(); + Option_Graphics_InitText(); m_IsTextInit = true; } if (g_InputDB.menu_up) { - Option_GraphicsMenuUp(); + Option_Graphics_MenuUp(); } if (g_InputDB.menu_down) { - Option_GraphicsMenuDown(); + Option_Graphics_MenuDown(); } Text_AddBackground( @@ -521,7 +521,7 @@ void Option_Graphics(INVENTORY_ITEM *inv_item) case OPTION_UI_TEXT_SCALE: g_Config.ui.text_scale += 0.1; CLAMP(g_Config.ui.text_scale, MIN_TEXT_SCALE, MAX_TEXT_SCALE); - Option_GraphicsReinitialize(OPTION_UI_TEXT_SCALE); + Option_Graphics_Reinitialize(OPTION_UI_TEXT_SCALE); reset = OPTION_UI_TEXT_SCALE; break; @@ -545,7 +545,7 @@ void Option_Graphics(INVENTORY_ITEM *inv_item) if (Screen_SetNextRes()) { g_Config.resolution_width = Screen_GetResWidth(); g_Config.resolution_height = Screen_GetResHeight(); - Option_GraphicsReinitialize(OPTION_RESOLUTION); + Option_Graphics_Reinitialize(OPTION_RESOLUTION); reset = OPTION_RESOLUTION; } break; @@ -601,7 +601,7 @@ void Option_Graphics(INVENTORY_ITEM *inv_item) case OPTION_UI_TEXT_SCALE: g_Config.ui.text_scale -= 0.1; CLAMP(g_Config.ui.text_scale, MIN_TEXT_SCALE, MAX_TEXT_SCALE); - Option_GraphicsReinitialize(OPTION_UI_TEXT_SCALE); + Option_Graphics_Reinitialize(OPTION_UI_TEXT_SCALE); reset = OPTION_UI_TEXT_SCALE; break; @@ -626,7 +626,7 @@ void Option_Graphics(INVENTORY_ITEM *inv_item) reset = OPTION_RESOLUTION; g_Config.resolution_width = Screen_GetResWidth(); g_Config.resolution_height = Screen_GetResHeight(); - Option_GraphicsReinitialize(OPTION_RESOLUTION); + Option_Graphics_Reinitialize(OPTION_RESOLUTION); } break; @@ -648,21 +648,21 @@ void Option_Graphics(INVENTORY_ITEM *inv_item) } if (reset > -1) { - Option_GraphicsChangeTextOption( + Option_Graphics_ChangeTextOption( m_GraphicsMenu.cur_option, m_GraphicsMenu.option_texts[m_GraphicsMenu.row_num], m_GraphicsMenu.value_texts[m_GraphicsMenu.row_num]); Config_Write(); } - Option_GraphicsUpdateArrows( + Option_Graphics_UpdateArrows( m_GraphicsMenu.cur_option->option_name, *m_GraphicsMenu.value_texts[m_GraphicsMenu.row_num], m_GraphicsMenu.first_visible != m_GraphicsMenu.first_option, m_GraphicsMenu.last_visible != m_GraphicsMenu.last_option); if (reset == OPTION_NUMBER_OF) { - Option_GraphicsShutdown(); + Option_Graphics_Shutdown(); Config_Write(); } } diff --git a/src/game/option/option_passport.c b/src/game/option/option_passport.c index fb3f86192..3b2144ed5 100644 --- a/src/game/option/option_passport.c +++ b/src/game/option/option_passport.c @@ -96,38 +96,38 @@ REQUEST_INFO g_SavegameRequester = { .items = NULL, }; -static void Option_PassportInitText(void); -static void Option_PassportShutdownText(void); -static void Option_PassportClose(INVENTORY_ITEM *inv_item); -static void Option_PassportDeterminePages(void); -static void Option_PassportInitSaveRequester(int16_t page_num); -static void Option_PassportInitSelectLevelRequester(void); -static void Option_PassportInitNewGameRequester(void); -static void Option_PassportShowSaves(PASSPORT_MODE pending_mode); -static void Option_PassportShowSelectLevel(void); -static void Option_PassportLoadGame(void); -static void Option_PassportSelectLevel(void); -static void Option_PassportSaveGame(void); -static void Option_PassportNewGame(void); -static void Option_PassportRestart(INVENTORY_ITEM *inv_item); -static void Option_PassportFlipRight(INVENTORY_ITEM *inv_item); -static void Option_PassportFlipLeft(INVENTORY_ITEM *inv_item); - -void Option_PassportInit(void) +static void Option_Passport_InitText(void); +static void Option_Passport_ShutdownText(void); +static void Option_Passport_Close(INVENTORY_ITEM *inv_item); +static void Option_Passport_DeterminePages(void); +static void Option_Passport_InitSaveRequester(int16_t page_num); +static void Option_Passport_InitSelectLevelRequester(void); +static void Option_Passport_InitNewGameRequester(void); +static void Option_Passport_ShowSaves(PASSPORT_MODE pending_mode); +static void Option_Passport_ShowSelectLevel(void); +static void Option_Passport_LoadGame(void); +static void Option_Passport_SelectLevel(void); +static void Option_Passport_SaveGame(void); +static void Option_Passport_NewGame(void); +static void Option_Passport_Restart(INVENTORY_ITEM *inv_item); +static void Option_Passport_FlipRight(INVENTORY_ITEM *inv_item); +static void Option_Passport_FlipLeft(INVENTORY_ITEM *inv_item); + +void Option_Passport_Init(void) { Requester_Init(&g_SavegameRequester, g_Config.maximum_save_slots); Requester_Init(&m_SelectLevelRequester, g_GameFlow.level_count + 1); Requester_Init(&m_NewGameRequester, MAX_GAME_MODES); } -void Option_PassportShutdown(void) +void Option_Passport_Shutdown(void) { Requester_Shutdown(&g_SavegameRequester); Requester_Shutdown(&m_SelectLevelRequester); Requester_Shutdown(&m_NewGameRequester); } -static void Option_PassportInitText(void) +static void Option_Passport_InitText(void) { m_Text[TEXT_LEFT_ARROW] = Text_Create(-85, -15, "\200"); Text_Hide(m_Text[TEXT_LEFT_ARROW], true); @@ -149,7 +149,7 @@ static void Option_PassportInitText(void) } } -static void Option_PassportShutdownText(void) +static void Option_Passport_ShutdownText(void) { for (int i = 0; i < TEXT_NUMBER_OF; i++) { Text_Remove(m_Text[i]); @@ -158,7 +158,7 @@ static void Option_PassportShutdownText(void) m_IsTextInit = false; } -static void Option_PassportClose(INVENTORY_ITEM *inv_item) +static void Option_Passport_Close(INVENTORY_ITEM *inv_item) { if (m_PassportStatus.page == PAGE_3) { inv_item->anim_direction = 1; @@ -167,10 +167,10 @@ static void Option_PassportClose(INVENTORY_ITEM *inv_item) inv_item->anim_direction = -1; inv_item->goal_frame = 0; } - Option_PassportShutdownText(); + Option_Passport_ShutdownText(); } -static void Option_PassportDeterminePages(void) +static void Option_Passport_DeterminePages(void) { switch (g_InvMode) { case INV_TITLE_MODE: @@ -206,7 +206,7 @@ static void Option_PassportDeterminePages(void) m_PassportStatus.page_role[PAGE_1] = PASSPORT_MODE_LOAD_GAME; m_PassportStatus.page_role[PAGE_2] = PASSPORT_MODE_UNAVAILABLE; m_PassportStatus.page_role[PAGE_3] = PASSPORT_MODE_UNAVAILABLE; - Option_PassportInitSaveRequester(PAGE_1); + Option_Passport_InitSaveRequester(PAGE_1); break; case INV_SAVE_MODE: @@ -226,7 +226,7 @@ static void Option_PassportDeterminePages(void) m_PassportStatus.page_available[PAGE_3] = true; m_PassportStatus.page_role[PAGE_3] = PASSPORT_MODE_EXIT_TITLE; } - Option_PassportInitSaveRequester(PAGE_2); + Option_Passport_InitSaveRequester(PAGE_2); break; case INV_SAVE_CRYSTAL_MODE: @@ -237,7 +237,7 @@ static void Option_PassportDeterminePages(void) m_PassportStatus.page_role[PAGE_1] = PASSPORT_MODE_UNAVAILABLE; m_PassportStatus.page_role[PAGE_2] = PASSPORT_MODE_SAVE_GAME; m_PassportStatus.page_role[PAGE_3] = PASSPORT_MODE_UNAVAILABLE; - Option_PassportInitSaveRequester(PAGE_2); + Option_Passport_InitSaveRequester(PAGE_2); break; case INV_DEATH_MODE: @@ -262,7 +262,7 @@ static void Option_PassportDeterminePages(void) } } -static void Option_PassportInitSaveRequester(int16_t page_num) +static void Option_Passport_InitSaveRequester(int16_t page_num) { REQUEST_INFO *req = &g_SavegameRequester; Requester_ClearTextstrings(req); @@ -292,7 +292,7 @@ static void Option_PassportInitSaveRequester(int16_t page_num) Savegame_ScanSavedGames(); } -static void Option_PassportInitSelectLevelRequester(void) +static void Option_Passport_InitSelectLevelRequester(void) { REQUEST_INFO *req = &m_SelectLevelRequester; req->is_blockable = true; @@ -321,7 +321,7 @@ static void Option_PassportInitSelectLevelRequester(void) Savegame_ScanAvailableLevels(req); } -static void Option_PassportInitNewGameRequester(void) +static void Option_Passport_InitNewGameRequester(void) { REQUEST_INFO *req = &m_NewGameRequester; Requester_ClearTextstrings(req); @@ -345,7 +345,7 @@ static void Option_PassportInitNewGameRequester(void) } } -static void Option_PassportShowSaves(PASSPORT_MODE pending_mode) +static void Option_Passport_ShowSaves(PASSPORT_MODE pending_mode) { int32_t select = Requester_Display(&g_SavegameRequester); if (select == 0) { @@ -366,7 +366,7 @@ static void Option_PassportShowSaves(PASSPORT_MODE pending_mode) } } -static void Option_PassportShowSelectLevel(void) +static void Option_Passport_ShowSelectLevel(void) { int32_t select = Requester_Display(&m_SelectLevelRequester); if (select) { @@ -390,14 +390,14 @@ static void Option_PassportShowSelectLevel(void) } } -static void Option_PassportLoadGame(void) +static void Option_Passport_LoadGame(void) { Text_ChangeText(m_Text[TEXT_PAGE_NAME], GS(PASSPORT_LOAD_GAME)); g_SavegameRequester.is_blockable = true; if (m_PassportStatus.mode == PASSPORT_MODE_BROWSE) { if (g_InputDB.menu_confirm) { - Option_PassportInitSaveRequester(m_PassportStatus.page); + Option_Passport_InitSaveRequester(m_PassportStatus.page); g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; m_PassportStatus.mode = PASSPORT_MODE_LOAD_GAME; @@ -409,13 +409,13 @@ static void Option_PassportLoadGame(void) g_GameInfo.current_save_slot = g_SavegameRequester.requested; Text_Hide(m_Text[TEXT_LEVEL_ARROW_RIGHT], true); Requester_ClearTextstrings(&g_SavegameRequester); - Option_PassportInitSelectLevelRequester(); + Option_Passport_InitSelectLevelRequester(); m_PassportStatus.mode = PASSPORT_MODE_SELECT_LEVEL; g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; - Option_PassportShowSelectLevel(); + Option_Passport_ShowSelectLevel(); } else { - Option_PassportShowSaves(PASSPORT_MODE_LOAD_GAME); + Option_Passport_ShowSaves(PASSPORT_MODE_LOAD_GAME); if (m_PassportStatus.mode == PASSPORT_MODE_LOAD_GAME) { Text_SetPos( m_Text[TEXT_LEVEL_ARROW_RIGHT], 130, @@ -430,7 +430,7 @@ static void Option_PassportLoadGame(void) } } } else { - Option_PassportShowSaves(PASSPORT_MODE_LOAD_GAME); + Option_Passport_ShowSaves(PASSPORT_MODE_LOAD_GAME); Text_Hide(m_Text[TEXT_LEVEL_ARROW_RIGHT], true); } @@ -439,22 +439,22 @@ static void Option_PassportLoadGame(void) Text_Hide(m_Text[TEXT_LEVEL_ARROW_RIGHT], true); } } else if (m_PassportStatus.mode == PASSPORT_MODE_SELECT_LEVEL) { - Option_PassportSelectLevel(); + Option_Passport_SelectLevel(); } } -static void Option_PassportSelectLevel(void) +static void Option_Passport_SelectLevel(void) { if (g_InputDB.menu_left) { Text_Hide(m_Text[TEXT_LEVEL_ARROW_LEFT], true); Requester_ClearTextstrings(&m_SelectLevelRequester); - Option_PassportInitSaveRequester(m_PassportStatus.page); + Option_Passport_InitSaveRequester(m_PassportStatus.page); m_PassportStatus.mode = PASSPORT_MODE_LOAD_GAME; g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; - Option_PassportShowSaves(PASSPORT_MODE_LOAD_GAME); + Option_Passport_ShowSaves(PASSPORT_MODE_LOAD_GAME); } else { - Option_PassportShowSelectLevel(); + Option_Passport_ShowSelectLevel(); if (m_PassportStatus.mode == PASSPORT_MODE_SELECT_LEVEL) { Text_SetPos( m_Text[TEXT_LEVEL_ARROW_LEFT], -130, @@ -470,24 +470,24 @@ static void Option_PassportSelectLevel(void) } } -static void Option_PassportSaveGame(void) +static void Option_Passport_SaveGame(void) { Text_ChangeText(m_Text[TEXT_PAGE_NAME], GS(PASSPORT_SAVE_GAME)); g_SavegameRequester.is_blockable = false; if (m_PassportStatus.mode == PASSPORT_MODE_BROWSE) { if (g_InputDB.menu_confirm) { - Option_PassportInitSaveRequester(m_PassportStatus.page); + Option_Passport_InitSaveRequester(m_PassportStatus.page); g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; m_PassportStatus.mode = PASSPORT_MODE_SAVE_GAME; } } else if (m_PassportStatus.mode == PASSPORT_MODE_SAVE_GAME) { - Option_PassportShowSaves(PASSPORT_MODE_SAVE_GAME); + Option_Passport_ShowSaves(PASSPORT_MODE_SAVE_GAME); } } -static void Option_PassportNewGame(void) +static void Option_Passport_NewGame(void) { Text_ChangeText(m_Text[TEXT_PAGE_NAME], GS(PASSPORT_NEW_GAME)); @@ -495,7 +495,7 @@ static void Option_PassportNewGame(void) if (g_InputDB.menu_confirm && (g_Config.enable_game_modes || g_Config.profile.new_game_plus_unlock)) { - Option_PassportInitNewGameRequester(); + Option_Passport_InitNewGameRequester(); g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; m_PassportStatus.mode = PASSPORT_MODE_NEW_GAME; @@ -544,7 +544,7 @@ static void Option_PassportNewGame(void) } } -static void Option_PassportRestart(INVENTORY_ITEM *inv_item) +static void Option_Passport_Restart(INVENTORY_ITEM *inv_item) { Text_ChangeText(m_Text[TEXT_PAGE_NAME], GS(PASSPORT_RESTART_LEVEL)); @@ -558,7 +558,7 @@ static void Option_PassportRestart(INVENTORY_ITEM *inv_item) } } -static void Option_PassportFlipRight(INVENTORY_ITEM *inv_item) +static void Option_Passport_FlipRight(INVENTORY_ITEM *inv_item) { g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; @@ -575,7 +575,7 @@ static void Option_PassportFlipRight(INVENTORY_ITEM *inv_item) } } -static void Option_PassportFlipLeft(INVENTORY_ITEM *inv_item) +static void Option_Passport_FlipLeft(INVENTORY_ITEM *inv_item) { g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; @@ -599,14 +599,14 @@ void Option_Passport(INVENTORY_ITEM *inv_item) g_InvItemText[IT_NAME] = NULL; Text_Remove(g_InvRingText); g_InvRingText = NULL; - Option_PassportInitText(); + Option_Passport_InitText(); m_IsTextInit = true; - Option_PassportDeterminePages(); + Option_Passport_DeterminePages(); } m_PassportStatus.page = (inv_item->goal_frame - inv_item->open_frame) / 5; if (!m_PassportStatus.page_available[m_PassportStatus.page]) { - Option_PassportFlipRight(inv_item); + Option_Passport_FlipRight(inv_item); return; } @@ -631,19 +631,19 @@ void Option_Passport(INVENTORY_ITEM *inv_item) switch (m_PassportStatus.page_role[m_PassportStatus.page]) { case PASSPORT_MODE_LOAD_GAME: - Option_PassportLoadGame(); + Option_Passport_LoadGame(); break; case PASSPORT_MODE_SAVE_GAME: - Option_PassportSaveGame(); + Option_Passport_SaveGame(); break; case PASSPORT_MODE_NEW_GAME: - Option_PassportNewGame(); + Option_Passport_NewGame(); break; case PASSPORT_MODE_RESTART: - Option_PassportRestart(inv_item); + Option_Passport_Restart(inv_item); break; case PASSPORT_MODE_EXIT_TITLE: @@ -670,11 +670,11 @@ void Option_Passport(INVENTORY_ITEM *inv_item) if (g_InputDB.menu_right || !m_PassportStatus.page_available[m_PassportStatus.page]) { - Option_PassportFlipRight(inv_item); + Option_Passport_FlipRight(inv_item); } if (g_InputDB.menu_left) { - Option_PassportFlipLeft(inv_item); + Option_Passport_FlipLeft(inv_item); } if (g_InputDB.menu_back) { @@ -682,11 +682,11 @@ void Option_Passport(INVENTORY_ITEM *inv_item) g_Input = (INPUT_STATE) { 0 }; g_InputDB = (INPUT_STATE) { 0 }; } else { - Option_PassportClose(inv_item); + Option_Passport_Close(inv_item); } } if (g_InputDB.menu_confirm) { - Option_PassportClose(inv_item); + Option_Passport_Close(inv_item); } } diff --git a/src/game/option/option_passport.h b/src/game/option/option_passport.h index 8377b8b20..80c3a1615 100644 --- a/src/game/option/option_passport.h +++ b/src/game/option/option_passport.h @@ -3,5 +3,5 @@ #include "global/types.h" void Option_Passport(INVENTORY_ITEM *inv_item); -void Option_PassportInit(void); -void Option_PassportShutdown(void); +void Option_Passport_Init(void); +void Option_Passport_Shutdown(void); diff --git a/src/game/option/option_sound.c b/src/game/option/option_sound.c index 953c4c567..d4a2700dc 100644 --- a/src/game/option/option_sound.c +++ b/src/game/option/option_sound.c @@ -25,9 +25,9 @@ typedef enum SOUND_TEXT { static TEXTSTRING *m_Text[TEXT_NUMBER_OF] = { 0 }; -static void Option_SoundInitText(void); +static void Option_Sound_InitText(void); -static void Option_SoundInitText(void) +static void Option_Sound_InitText(void) { char buf[20]; @@ -67,7 +67,7 @@ void Option_Sound(INVENTORY_ITEM *inv_item) char buf[20]; if (!m_Text[TEXT_MUSIC_VOLUME]) { - Option_SoundInitText(); + Option_Sound_InitText(); } if (g_InputDB.menu_up && g_OptionSelected > TEXT_OPTION_MIN) {