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

Merge f66c00c555 into 951389ca84

This commit is contained in:
Martin Pham 2024-03-09 13:33:37 +00:00 committed by GitHub
parent 951389ca84 f66c00c555
commit 5854297a36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text_options_strings.h.in
View File

@ -85,6 +85,7 @@
#define TEXT_OPT_CHEAT7 _("EXIT COURSE AT ANY TIME")
#define TEXT_OPT_CHEAT8 _("HUGE MARIO")
#define TEXT_OPT_CHEAT9 _("TINY MARIO")
#define TEXT_OPT_FOREVER_SHELL _("FOREVER SHELL")
#else // VERSION
@ -149,6 +150,7 @@
#define TEXT_OPT_CHEAT7 _("Exit course at any time")
#define TEXT_OPT_CHEAT8 _("Huge Mario")
#define TEXT_OPT_CHEAT9 _("Tiny Mario")
#define TEXT_OPT_FOREVER_SHELL _("Forever Shell")
#endif // VERSION

4
src/game/mario_actions_moving.c
View File

@ -1235,11 +1235,11 @@ s32 act_riding_shell_ground(struct MarioState *m) {
break;
case GROUND_STEP_HIT_WALL:
mario_stop_riding_object(m);
if (!Cheats.EnableCheats || !Cheats.ForeverShell) { mario_stop_riding_object(m); }
play_sound(m->flags & MARIO_METAL_CAP ? SOUND_ACTION_METAL_BONK : SOUND_ACTION_BONK,
m->marioObj->header.gfx.cameraToObject);
m->particleFlags |= PARTICLE_VERTICAL_STAR;
set_mario_action(m, ACT_BACKWARD_GROUND_KB, 0);
if (!Cheats.EnableCheats || !Cheats.ForeverShell) { set_mario_action(m, ACT_BACKWARD_GROUND_KB, 0); }
break;
}

1
src/game/options_menu.c
View File

@ -282,6 +282,7 @@ static struct Option optsCheats[] = {
DEF_OPT_TOGGLE( optsCheatsStr[6], &Cheats.ExitAnywhere ),
DEF_OPT_TOGGLE( optsCheatsStr[7], &Cheats.HugeMario ),
DEF_OPT_TOGGLE( optsCheatsStr[8], &Cheats.TinyMario ),
DEF_OPT_TOGGLE( optsCheatsStr[9], &Cheats.ForeverShell ),
};

1
src/pc/cheats.h
View File

@ -13,6 +13,7 @@ struct CheatList {
bool ExitAnywhere;
bool HugeMario;
bool TinyMario;
bool ForeverShell;
};
extern struct CheatList Cheats;