mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 12:50:44 +00:00
Merge branch 'small-fixes-jug' into 'master'
Discord Invite Fixes + DUMPCONSISTENCY flag for makefile See merge request KartKrew/Kart-Public!255
This commit is contained in:
commit
ff26ff9b61
2 changed files with 6 additions and 6 deletions
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue