stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 20:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'small-fixes-jug' into 'master'

Browse source 
Discord Invite Fixes + DUMPCONSISTENCY flag for makefile

See merge request KartKrew/Kart-Public!255
This commit is contained in:
Sal 2021-04-20 15:12:48 -04:00
commit ff26ff9b61
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile
View file

@ -515,6 +515,10 @@ ifdef ZDEBUG
CPPFLAGS+=-DZDEBUG CPPFLAGS+=-DZDEBUG
endif endif
ifdef DUMPCONSISTENCY
CPPFLAGS+=-DDUMPCONSISTENCY
endif
ifdef DEVELOP ifdef DEVELOP
CPPFLAGS+=-DDEVELOP CPPFLAGS+=-DDEVELOP
endif endif

8
src/discord.c
View file

@ -361,8 +361,7 @@ static const char *DRPC_GetServerIP(void)
{ {
// We're not the server, so we could successfully get the IP! // We're not the server, so we could successfully get the IP!
// No need to do anything else :) // No need to do anything else :)
sprintf(self_ip, "%s:%u", address, current_port); return address;
return self_ip;
} }
} }
@ -461,10 +460,7 @@ void DRPC_UpdatePresence(void)
// Grab the host's IP for joining. // Grab the host's IP for joining.
if ((join = DRPC_GetServerIP()) != NULL) if ((join = DRPC_GetServerIP()) != NULL)
{ {
char *xorjoin = DRPC_XORIPString(join); discordPresence.joinSecret = DRPC_XORIPString(join);
discordPresence.joinSecret = xorjoin;
free(xorjoin);
joinSecretSet = true; joinSecretSet = true;
} }
} }