Skip to content

Commit

Permalink
option: fix function naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@rr-
rr- committed Aug 29, 2024
1 parent 519de5e commit e7a02ad
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 162 deletions.
6 changes: 3 additions & 3 deletions src/game/option/option_compass.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down
85 changes: 43 additions & 42 deletions src/game/option/option_control.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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]);
Expand Down Expand Up @@ -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
Expand All @@ -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) {
Expand All @@ -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;
Expand All @@ -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();
Expand All @@ -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;
Expand All @@ -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();
Expand All @@ -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;
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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);
}
}

Expand All @@ -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 };
Expand All @@ -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) {
Expand Down Expand Up @@ -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++;
Expand All @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/game/option/option_control_pick.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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]);
Expand All @@ -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) {
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -97,7 +97,7 @@ CONTROL_MODE Option_ControlPick(void)
}

if (g_InputDB.menu_back) {
Option_ControlPickShutdownText();
Option_ControlPick_ShutdownText();
}

return CM_PICK;
Expand Down
Loading

0 comments on commit e7a02ad

Please sign in to comment.