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

Fixed setting follower on title screen + mixed declarations

Browse source
This commit is contained in:
Latapostrophe 2020-06-03 01:23:32 +02:00
parent aba1ff72bc
commit 5412358fcf
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/d_netcmd.c
View file

@ -6084,9 +6084,8 @@ static void Name4_OnChange(void)
static void Follower_OnChange(void) static void Follower_OnChange(void)
{ {
char str[SKINNAMESIZE+1], cpy[SKINNAMESIZE+1]; char str[SKINNAMESIZE+1], cpy[SKINNAMESIZE+1];
INT32 num;
if (!Playing()) char set[10]; // This isn't Lua and mixed declarations in the middle of code make caveman compilers scream.
return; // do whatever you want
// there is a slight chance that we will actually use a string instead so... // there is a slight chance that we will actually use a string instead so...
// let's investigate the string... // let's investigate the string...
@ -6098,12 +6097,15 @@ static void Follower_OnChange(void)
if (stricmp(cpy, "None") == 0) if (stricmp(cpy, "None") == 0)
{ {
CV_StealthSet(&cv_follower, "-1"); CV_StealthSet(&cv_follower, "-1");
if (!Playing())
return; // don't send anything there.
SendNameAndColor(); SendNameAndColor();
return; return;
} }
INT32 num = R_FollowerAvailable(str); num = R_FollowerAvailable(str);
char set[10];
if (num == -1) // that's an error. if (num == -1) // that's an error.
CONS_Alert(CONS_WARNING, M_GetText("Follower '%s' not found\n"), str); CONS_Alert(CONS_WARNING, M_GetText("Follower '%s' not found\n"), str);
@ -6111,6 +6113,10 @@ static void Follower_OnChange(void)
sprintf(set, "%d", num); sprintf(set, "%d", num);
CV_StealthSet(&cv_follower, set); // set it to a number. It's easier for us to send later :) CV_StealthSet(&cv_follower, set); // set it to a number. It's easier for us to send later :)
} }
if (!Playing())
return; // don't send anything there.
SendNameAndColor(); SendNameAndColor();
} }