thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-05 15:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More d_netcmd.h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-02 16:36:40 -04:00
parent 178087289e
commit b156899390
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/d_netcmd.h
View file

@ -181,7 +181,6 @@ typedef enum
XD_SETMOTD, // 19
XD_RESPAWN, // 20
XD_DEMOTED, // 21
<<<<<<< HEAD
XD_SETUPVOTE, // 22
XD_MODIFYVOTE, // 23
XD_PICKVOTE, // 24
@ -193,15 +192,9 @@ typedef enum
XD_CANCELPARTYINVITE, // 30
XD_GIVEITEM, // 31
XD_ADDBOT, // 32
#ifdef HAVE_BLUA
XD_LUACMD, // 33
XD_LUAVAR, // 34
#endif
=======
XD_LUACMD, // 22
XD_LUAVAR, // 23
XD_LUAFILE, // 24
>>>>>>> srb2/next
XD_LUAFILE, // 35
MAXNETXCMD
} netxcmd_t;