thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-19 14:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'goner-final-final-final' into 'master'

Browse source 
Goner Final Final Final

See merge request KartKrew/Kart!2192
This commit is contained in:
Oni 2024-03-31 05:53:23 +00:00
commit 11a7ade5e3
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/f_finale.c
View file

@ -656,10 +656,32 @@ static void F_DisclaimerDrawScene(void)
290 << FRACBITS, 290 << FRACBITS,
FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT,
0, HU_FONT, 0, HU_FONT,
"\"Dr. Robotnik's Ring Racers\" is a free fangame & was not produced by or under license from any portion of ""\x88""SEGA Corporation""\x80"". All registered trademarks belong to their respective owners & were used without intent to harm or profit.\n\nThis software is based on heavily modified code originally created by id Software & is used under the terms of the GNU Public License.\n\n""\x88""SEGA""\x80"" retains rights to the original characters and environments, while all new assets remain property of Kart Krew Dev where applicable." "\"Dr. Robotnik's Ring Racers\" is a free fangame & was not produced by or under license from any portion of ""\x88""SEGA Corporation""\x80"". All registered trademarks belong to their respective owners & were used without intent to harm or profit."
); );
V_DrawCenteredString(160, 24, textalpha, newText); twoText = V_ScaledWordWrap(
290 << FRACBITS,
FRACUNIT, FRACUNIT, FRACUNIT,
0, HU_FONT,
"This software is based on heavily modified code originally created by id Software & is used under the terms of the GNU General Public License 2.0."
);
char *redText;
//char *blueText; // seussian
redText = V_ScaledWordWrap(
290 << FRACBITS,
FRACUNIT, FRACUNIT, FRACUNIT,
0, HU_FONT,
"\x88""SEGA""\x80"" retains rights to the original characters and environments, while all new assets remain property of Kart Krew Dev where applicable.\n"
);
V_DrawString(16, 26, textalpha, newText);
V_DrawCenteredString(160, 88, textalpha|V_PINKMAP, "This game should not be sold.");
V_DrawString(16, 102, textalpha, twoText);
V_DrawString(16, 142, textalpha, redText);
Z_Free(newText);
} }
else else
{ {
@ -667,12 +689,14 @@ static void F_DisclaimerDrawScene(void)
UINT16 margin = 5; UINT16 margin = 5;
UINT16 offset = BASEVIDWIDTH/2-(BASEVIDWIDTH-margin*2)/2; UINT16 offset = BASEVIDWIDTH/2-(BASEVIDWIDTH-margin*2)/2;
newText = V_ScaledWordWrap( newText = V_ScaledWordWrap(
(BASEVIDWIDTH - margin*2) << FRACBITS, (BASEVIDWIDTH - margin*2) << FRACBITS,
FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT,
0, MENU_FONT, 0, MENU_FONT,
"\"Dr. Robotnik's Ring Racers\" is a not-for-profit fangame. All registered trademarks belong to their respective owners. This game should not be sold." "\"Dr. Robotnik's Ring Racers\" is a not-for-profit fangame. All registered trademarks belong to their respective owners. This game should not be sold."
); );
twoText = V_ScaledWordWrap( twoText = V_ScaledWordWrap(
(BASEVIDWIDTH - margin*2) << FRACBITS, (BASEVIDWIDTH - margin*2) << FRACBITS,
FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT, FRACUNIT,
@ -683,11 +707,10 @@ static void F_DisclaimerDrawScene(void)
V_DrawMenuString(offset, 125, subtextalpha, newText); V_DrawMenuString(offset, 125, subtextalpha, newText);
V_DrawMenuString(offset, 165, subtextalpha, twoText); V_DrawMenuString(offset, 165, subtextalpha, twoText);
V_DrawMenuString(offset, 165, V_BLUEMAP|subtextalpha, "Photosensitivity warning"); V_DrawMenuString(offset, 165, V_BLUEMAP|subtextalpha, "Photosensitivity warning");
Z_Free(twoText);
} }
Z_Free(newText); Z_Free(newText);
Z_Free(twoText);
} }
// ================================= STATE LOGIC // ================================= STATE LOGIC

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

@ -859,6 +859,12 @@ void M_GonerTick(void)
if (M_TryPassword(cv_dummyextraspassword.string, false) != M_PW_EXTRAS) if (M_TryPassword(cv_dummyextraspassword.string, false) != M_PW_EXTRAS)
{ {
if (LinesOutput.empty() && !LinesToDigest.empty())
{
// Remove "Metal Sonic. Are you online?"
LinesToDigest.pop_front();
}
goner_delay = 0; goner_delay = 0;
LinesToDigest.emplace_front(GONERSPEAKER_EGGMAN, TICRATE, LinesToDigest.emplace_front(GONERSPEAKER_EGGMAN, TICRATE,
"Aha! Nice try. You're tricky enough WITHOUT admin access, thank you."); "Aha! Nice try. You're tricky enough WITHOUT admin access, thank you.");
@ -1259,7 +1265,7 @@ static void M_GonerConclude(INT32 choice)
void M_GonerGDQ(boolean opinion) void M_GonerGDQ(boolean opinion)
{ {
if (currentMenu != &MAIN_GonerDef) if (currentMenu != &MAIN_GonerDef || goner_gdq == true)
return; return;
LinesToDigest.clear(); LinesToDigest.clear();