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

Merge d_netcmd.c/h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-02 15:38:53 -04:00
parent c1b1641f35
commit 178087289e
2 changed files with 40 additions and 659 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

685
src/d_netcmd.c
View file

File diff suppressed because it is too large Load diff

14
src/d_netcmd.h
View file

@ -25,7 +25,6 @@ extern consvar_t cv_skin;
extern consvar_t cv_playername2;
extern consvar_t cv_playercolor2;
extern consvar_t cv_skin2;
<<<<<<< HEAD
// third splitscreen player
extern consvar_t cv_playername3;
extern consvar_t cv_playercolor3;
@ -36,13 +35,6 @@ extern consvar_t cv_playercolor4;
extern consvar_t cv_skin4;
// preferred number of players
extern consvar_t cv_splitplayers;
=======
// saved versions of the above six
extern consvar_t cv_defaultplayercolor;
extern consvar_t cv_defaultskin;
extern consvar_t cv_defaultplayercolor2;
extern consvar_t cv_defaultskin2;
>>>>>>> srb2/next
#ifdef SEENAMES
extern consvar_t cv_seenames, cv_allowseenames;
@ -152,16 +144,10 @@ extern consvar_t cv_ringslinger, cv_soundtest;
extern consvar_t cv_specialrings, cv_powerstones, cv_matchboxes, cv_competitionboxes;
extern consvar_t cv_maxping;
<<<<<<< HEAD
extern consvar_t cv_lagless;
extern consvar_t cv_pingtimeout;
extern consvar_t cv_showping;
extern consvar_t cv_showviewpointtext;
=======
extern consvar_t cv_pingtimeout;
extern consvar_t cv_showping;
>>>>>>> srb2/next
extern consvar_t cv_skipmapcheck;