thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Proceed password "fake crash"

Browse source 
Didn't always properly reset text, now it does
This commit is contained in:
toaster 2025-07-24 13:12:23 +01:00
parent 1a57416b16
commit 585683b978
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_menu.h
View file

@ -234,7 +234,7 @@ void M_GonerTutorial(INT32 choice);
void M_GonerPlayground(INT32 choice);
void M_GonerResetLooking(int type);
void M_GonerCheckLooking(void);
void M_GonerResetText(void);
void M_GonerResetText(boolean completely);
void M_GonerGDQ(boolean opinion);
boolean M_GonerMusicPlayable(void);

2
src/m_pw.cpp
View file

@ -626,7 +626,7 @@ void f_proceed()
#else
F_StartIntro();
M_ClearMenus(true);
M_GonerResetText();
M_GonerResetText(true);
#endif
}

20
src/menus/main-goner.cpp
View file

@ -887,16 +887,15 @@ void M_GonerTick(void)
first = true; // a lie, but only slightly...
// Handle rewinding if you clear your gamedata.
M_GonerResetText();
goner_background = GonerBGData();
goner_levelworking = GDGONER_INIT;
M_GonerResetText(true);
}
M_GonerResetLooking(GDGONER_INIT);
if (first)
{
goner_background = GonerBGData();
first = goner_gdq = false;
MAIN_Goner[0] =
@ -1467,7 +1466,7 @@ static void M_GonerSurveyResponse(INT32 ch)
F_StartIntro();
M_ClearMenus(true);
M_GonerResetText();
M_GonerResetText(false);
return;
}
@ -1535,10 +1534,10 @@ void M_GonerPlayground(INT32 choice)
restoreMenu = NULL; // Playground Hack
// need to do all this here because it will skip returning to goner and there are circumstances (game close) where DoCompleted won't be called
M_GonerResetText();
gamedata->gonerlevel = GDGONER_DONE;
gamedata->playgroundroute = true;
gamedata->deferredsave = true;
M_GonerResetText(true);
}
static void M_GonerConclude(INT32 choice)
@ -1552,7 +1551,7 @@ static void M_GonerConclude(INT32 choice)
F_StartIntro();
M_ClearMenus(true);
M_GonerResetText();
M_GonerResetText(true);
}
void M_GonerGDQ(boolean opinion)
@ -1639,7 +1638,7 @@ static boolean M_GonerInputs(INT32 ch)
return false;
}
void M_GonerResetText(void)
void M_GonerResetText(boolean completely)
{
goner_typewriter.ClearText();
LinesToDigest.clear();
@ -1647,4 +1646,9 @@ void M_GonerResetText(void)
goner_scroll = 0;
goner_scrollend = -1;
if (!completely)
return;
goner_levelworking = GDGONER_INIT;
}