diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 569420626..6193dca52 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -244,8 +244,6 @@ static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2, "Points"}, {0, NULL}}; -static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}}; - static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; static CV_PossibleValue_t pause_cons_t[] = {{0, "Server"}, {1, "All"}, {0, NULL}}; @@ -267,11 +265,6 @@ consvar_t cv_duelspectatorreentry = CVAR_INIT ("duelspectatorreentry", "180", CV static CV_PossibleValue_t antigrief_cons_t[] = {{10, "MIN"}, {180, "MAX"}, {0, "Off"}, {0, NULL}}; consvar_t cv_antigrief = CVAR_INIT ("antigrief", "30", CV_NETVAR, antigrief_cons_t, NULL); -consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, startingliveslimit_cons_t, NULL); - -static CV_PossibleValue_t respawntime_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "Off"}, {0, NULL}}; -consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "1", CV_NETVAR|CV_CHEAT, respawntime_cons_t, NULL); - consvar_t cv_seenames = CVAR_INIT ("seenames", "On", CV_SAVE, CV_OnOff, NULL); // names @@ -753,10 +746,6 @@ void D_RegisterServerCommands(void) // for master server connection AddMServCommands(); - // p_mobj.c - CV_RegisterVar(&cv_itemrespawntime); - CV_RegisterVar(&cv_itemrespawn); - // misc CV_RegisterVar(&cv_pointlimit); CV_RegisterVar(&cv_numlaps); @@ -774,7 +763,6 @@ void D_RegisterServerCommands(void) K_RegisterKartStuff(); // SRB2kart - CV_RegisterVar(&cv_startinglives); CV_RegisterVar(&cv_countdowntime); CV_RegisterVar(&cv_overtime); CV_RegisterVar(&cv_pause); @@ -789,7 +777,6 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_spectatorreentry); CV_RegisterVar(&cv_duelspectatorreentry); CV_RegisterVar(&cv_antigrief); - CV_RegisterVar(&cv_respawntime); // d_clisrv CV_RegisterVar(&cv_maxconnections); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index acf6b8336..ebd24b266 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -49,10 +49,6 @@ extern consvar_t cv_seenames; extern consvar_t cv_usemouse; extern consvar_t cv_joyscale[MAXSPLITSCREENPLAYERS]; -// normally in p_mobj but the .h is not read -extern consvar_t cv_itemrespawntime; -extern consvar_t cv_itemrespawn; - extern consvar_t cv_pointlimit; extern consvar_t cv_timelimit; extern consvar_t cv_numlaps; @@ -70,7 +66,7 @@ extern consvar_t cv_countdowntime; extern consvar_t cv_mute; extern consvar_t cv_pause; -extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_maxplayers, cv_respawntime; +extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_maxplayers; extern consvar_t cv_spectatorreentry, cv_duelspectatorreentry, cv_antigrief; // SRB2kart items @@ -113,7 +109,6 @@ extern consvar_t cv_alttitle, cv_itemfinder; extern consvar_t cv_inttime, cv_advancemap; extern consvar_t cv_overtime; -extern consvar_t cv_startinglives; // for F_finale.c extern consvar_t cv_rollingdemos; diff --git a/src/p_mobj.c b/src/p_mobj.c index bea139da0..481849eb2 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11380,10 +11380,6 @@ void P_RemoveSavegameMobj(mobj_t *mobj) P_UnlinkThinker((thinker_t*)mobj); } -static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}}; -consvar_t cv_itemrespawntime = CVAR_INIT ("respawnitemtime", "2", CV_NETVAR|CV_CHEAT, respawnitemtime_cons_t, NULL); -consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); - static void P_SpawnPrecipitationAt(fixed_t basex, fixed_t basey) { INT32 j, k;