vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

make options menu arrows static

This commit is contained in:
fgsfds 2020-11-02 19:43:40 +03:00
parent 70b281405f
commit 84a3e6e953
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/options_menu.c
View File

@ -315,7 +315,6 @@ static struct SubMenu menuMain = DEF_SUBMENU( menuStr[0], optsMain );
static s32 optmenu_option_timer = 0; static s32 optmenu_option_timer = 0;
static u8 optmenu_hold_count = 0; static u8 optmenu_hold_count = 0;
static s32 optmenu_sin_timer = 0;
static struct SubMenu *currentMenu = &menuMain; static struct SubMenu *currentMenu = &menuMain;
@ -454,7 +453,6 @@ static inline s16 get_hudstr_centered_x(const s16 sx, const u8 *str) {
void optmenu_draw(void) { void optmenu_draw(void) {
s16 scroll; s16 scroll;
s16 scrollpos; s16 scrollpos;
f32 sinpos;
const s16 labelX = get_hudstr_centered_x(160, currentMenu->label); const s16 labelX = get_hudstr_centered_x(160, currentMenu->label);
gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin);
@ -478,11 +476,10 @@ void optmenu_draw(void) {
optmenu_draw_opt(&currentMenu->opts[i], 160, scroll, (currentMenu->select == i)); optmenu_draw_opt(&currentMenu->opts[i], 160, scroll, (currentMenu->select == i));
} }
sinpos = sins(optmenu_sin_timer*5000)*4;
gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255);
print_generic_string(80 - sinpos, 132 - (32 * (currentMenu->select - currentMenu->scroll)), optSmallStr[2]); print_generic_string(72, 132 - (32 * (currentMenu->select - currentMenu->scroll)), optSmallStr[2]);
print_generic_string(224 + sinpos, 132 - (32 * (currentMenu->select - currentMenu->scroll)), optSmallStr[3]); print_generic_string(232, 132 - (32 * (currentMenu->select - currentMenu->scroll)), optSmallStr[3]);
gSPDisplayList(gDisplayListHead++, dl_ia_text_end); gSPDisplayList(gDisplayListHead++, dl_ia_text_end);
} }
@ -543,8 +540,6 @@ void optmenu_check_buttons(void) {
if (gPlayer1Controller->buttonPressed & R_TRIG) if (gPlayer1Controller->buttonPressed & R_TRIG)
optmenu_toggle(); optmenu_toggle();
optmenu_sin_timer++;
/* Enables cheats if the user press the L trigger 3 times while in the options menu. Also plays a sound. */ /* Enables cheats if the user press the L trigger 3 times while in the options menu. Also plays a sound. */
if ((gPlayer1Controller->buttonPressed & L_TRIG) && !Cheats.EnableCheats) { if ((gPlayer1Controller->buttonPressed & L_TRIG) && !Cheats.EnableCheats) {