falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove pointless idle-checking code from lvTick

This commit is contained in:
Ryan Dwyer 2022-11-10 20:53:38 +10:00
parent d5a19238e1
commit 4fc36d7d3f
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/game/lv.c
View File

@ -2291,7 +2291,7 @@ void lvTick(void)
bgunTickBoost();
PROFILE(PROFILEMARKER_LVT_HUDMSGS, hudmsgsTick());
if ((joyGetButtonsPressedThisFrame(0, 0xffff) != 0
if (g_IsTitleDemo && (joyGetButtonsPressedThisFrame(0, 0xffff) != 0
|| joyGetStickX(0) > 10
|| joyGetStickX(0) < -10
|| joyGetStickY(0) > 10
@ -2310,7 +2310,7 @@ void lvTick(void)
|| joyGetStickX(3) > 10
|| joyGetStickX(3) < -10
|| joyGetStickY(3) > 10
|| joyGetStickY(3) < -10) && g_IsTitleDemo) {
|| joyGetStickY(3) < -10)) {
if (g_Vars.stagenum != STAGE_TITLE) {
titleSetNextMode(TITLEMODE_SKIP);
mainChangeToStage(STAGE_TITLE);
@ -2319,35 +2319,6 @@ void lvTick(void)
g_IsTitleDemo = false;
}
if (g_Vars.stagenum < STAGE_TITLE && !g_IsTitleDemo && !g_Vars.in_cutscene) {
if (joyGetButtons(0, 0xffff) == 0
&& joyGetStickX(0) < 10
&& joyGetStickX(0) > -10
&& joyGetStickY(0) < 10
&& joyGetStickY(0) > -10
&& joyGetButtons(1, 0xffff) == 0
&& joyGetStickX(1) < 10
&& joyGetStickX(1) > -10
&& joyGetStickY(1) < 10
&& joyGetStickY(1) > -10
&& joyGetButtons(2, 0xffff) == 0
&& joyGetStickX(2) < 10
&& joyGetStickX(2) > -10
&& joyGetStickY(2) < 10
&& joyGetStickY(2) > -10
&& joyGetButtons(3, 0xffff) == 0
&& joyGetStickX(3) < 10
&& joyGetStickX(3) > -10
&& joyGetStickY(3) < 10
&& joyGetStickY(3) > -10) {
g_TitleIdleTime60 += g_Vars.diffframe60;
} else {
g_TitleIdleTime60 = 0;
}
} else {
g_TitleIdleTime60 = 0;
}
g_NumReasonsToEndMpMatch = 0;
// Handle MP match ending

1
src/game/title.c
View File

@ -47,7 +47,6 @@ s16 g_TitleViewHeight = 480;
bool g_IsTitleDemo = false;
bool g_TitleButtonPressed = false;
bool g_TitleFastForward = false;
u32 g_TitleIdleTime60 = 0;
s32 g_TitleMode = -1;
s32 g_TitleNextMode = -1;
u32 g_TitleDelayedTimer = 2;

1
src/include/data.h
View File

@ -158,7 +158,6 @@ extern bool g_NbombsActive;
extern s32 g_WeatherActive;
extern u32 var80062410;
extern bool g_IsTitleDemo;
extern u32 g_TitleIdleTime60;
extern s32 g_TitleMode;
extern s32 g_TitleNextMode;
extern u32 g_TitleDelayedTimer;