thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 10:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Why aren't my files committing fully...

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 12:01:51 -04:00
parent 3b34b3230c
commit 2581ab4bf1
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_clisrv.h
View file

@ -641,11 +641,8 @@ void CL_AddSplitscreenPlayer(void);
void CL_RemoveSplitscreenPlayer(UINT8 p); void CL_RemoveSplitscreenPlayer(UINT8 p);
void CL_Reset(void); void CL_Reset(void);
void CL_ClearPlayer(INT32 playernum); void CL_ClearPlayer(INT32 playernum);
<<<<<<< HEAD
void CL_RemovePlayer(INT32 playernum, INT32 reason); void CL_RemovePlayer(INT32 playernum, INT32 reason);
=======
void CL_QueryServerList(msg_server_t *list); void CL_QueryServerList(msg_server_t *list);
>>>>>>> srb2/next
void CL_UpdateServerList(boolean internetsearch, INT32 room); void CL_UpdateServerList(boolean internetsearch, INT32 room);
// Is there a game running // Is there a game running
boolean Playing(void); boolean Playing(void);