From 8553c788ab1d70103cf7f6ae485f56470f8d9769 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Fri, 15 Sep 2023 21:08:04 +0200 Subject: [PATCH] port: disable reverse pitch and lookahead by default --- src/game/gamefile.c | 12 ++++++++++++ src/game/mplayer/mplayer.c | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 378a1f33d..d8d36474e 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -168,7 +168,11 @@ void gamefileLoadDefaults(struct gamefile *file) optionsSetControlMode(player2, CONTROLMODE_11); pakClearAllBitflags(file->flags); +#ifdef PLATFORM_N64 pakSetBitflag(GAMEFILEFLAG_P1_FORWARDPITCH, file->flags, false); +#else + pakSetBitflag(GAMEFILEFLAG_P1_FORWARDPITCH, file->flags, true); +#endif pakSetBitflag(GAMEFILEFLAG_P1_AUTOAIM, file->flags, true); pakSetBitflag(GAMEFILEFLAG_P1_AIMCONTROL, file->flags, false); pakSetBitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, file->flags, true); @@ -186,11 +190,19 @@ void gamefileLoadDefaults(struct gamefile *file) pakSetBitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, file->flags, false); pakSetBitflag(GAMEFILEFLAG_P1_PAINTBALL, file->flags, false); +#ifdef PLATFORM_N64 pakSetBitflag(GAMEFILEFLAG_P2_FORWARDPITCH, file->flags, false); +#else + pakSetBitflag(GAMEFILEFLAG_P2_FORWARDPITCH, file->flags, true); +#endif pakSetBitflag(GAMEFILEFLAG_P2_AUTOAIM, file->flags, true); pakSetBitflag(GAMEFILEFLAG_P2_AIMCONTROL, file->flags, false); pakSetBitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, file->flags, true); +#ifdef PLATFORM_N64 pakSetBitflag(GAMEFILEFLAG_P2_LOOKAHEAD, file->flags, true); +#else + pakSetBitflag(GAMEFILEFLAG_P2_LOOKAHEAD, file->flags, false); +#endif pakSetBitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, file->flags, true); pakSetBitflag(GAMEFILEFLAG_P2_HEADROLL, file->flags, true); pakSetBitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, file->flags, true); diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 9411147b8..d8efbd2b8 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -384,7 +384,12 @@ void mpPlayerSetDefaults(s32 playernum, bool autonames) g_PlayerConfigsArray[playernum].controlmode = CONTROLMODE_12; - g_PlayerConfigsArray[playernum].options = OPTION_LOOKAHEAD + g_PlayerConfigsArray[playernum].options = +#ifdef PLATFORM_N64 + OPTION_LOOKAHEAD +#else + OPTION_FORWARDPITCH +#endif | OPTION_SIGHTONSCREEN | OPTION_AUTOAIM | OPTION_AMMOONSCREEN