From: Rudolf Polzer Date: Tue, 12 Feb 2013 16:01:18 +0000 (+0100) Subject: get rid of sv_use_csqc_players cvar, as the legacy-player code is now quite broken... X-Git-Tag: xonotic-v0.7.0~89 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbd812668d202b78b269c9c60fa036d861a63fde;p=xonotic%2Fxonotic-data.pk3dir.git get rid of sv_use_csqc_players cvar, as the legacy-player code is now quite broken anyway --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 16fe913ae..e3252bea5 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1317,14 +1317,13 @@ set developer_csqcentities 0 "csqc entity spam" set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code" set g_debug_bot_commands 0 "print scripted bot commands before executing" set g_debug_defaultsounds 0 "always use default sounds" -set sv_use_csqc_players 1 "set to 0 to disable CSQC players for better Xonotic 0.5 compat" set cl_precacheplayermodels 0 "TODO please check if this needs to be 1 or if precaching a model the server already requested is fast enough to do it at runtime" -seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0)" -seta cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0, and is ignored in teamplay with more than two teams)" -seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)" -seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)" -seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (requires server to have sv_use_csqc_players 1, and is ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)" -seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)" +seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)" +seta cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_defaultcharacter 0, and is ignored in teamplay with more than two teams)" +seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)" +seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)" +seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)" +seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag" // debug cvars for keyhunt attaching set _angles "0 0 0" diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 9e5505b0a..ad0ca01c5 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -581,12 +581,6 @@ vector getplayerorigin(float pl) if(e) return e.origin; -#ifndef NO_LEGACY_NETWORKING - s = getplayerkeyvalue(pl, "TEMPHACK_origin"); - if(s != "") - return stov(s); -#endif - e = entcs_receiver[pl]; if(e) return e.origin; diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh index 3ade241ae..b21737f9e 100644 --- a/qcsrc/common/csqcmodel_settings.qh +++ b/qcsrc/common/csqcmodel_settings.qh @@ -66,34 +66,8 @@ //vector PL_CROUCH_VIEW_OFS = ...; #ifdef SVQC -# ifdef NO_LEGACY_NETWORKING -# define CSQCMODEL_AUTOINIT() CSQCModel_LinkEntity() -# define CSQCMODEL_AUTOUPDATE() CSQCModel_CheckUpdate() -# else -.float iscsqcmodel; -float autocvar_sv_use_csqc_players; -# define CSQCMODEL_AUTOINIT() \ - if(autocvar_sv_use_csqc_players) \ - { \ - CSQCModel_LinkEntity(); \ - self.iscsqcmodel = 1; \ - } \ - else \ - self.iscsqcmodel = 0 -# define CSQCMODEL_AUTOUPDATE() \ - if(autocvar_sv_use_csqc_players && !self.iscsqcmodel) \ - { \ - CSQCModel_LinkEntity(); \ - self.iscsqcmodel = 1; \ - } \ - if(!autocvar_sv_use_csqc_players && self.iscsqcmodel) \ - { \ - CSQCModel_UnlinkEntity(); \ - self.iscsqcmodel = 0; \ - } \ - if(self.iscsqcmodel) \ - CSQCModel_CheckUpdate() -# endif +# define CSQCMODEL_AUTOINIT() CSQCModel_LinkEntity() +# define CSQCMODEL_AUTOUPDATE() CSQCModel_CheckUpdate() #endif #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 53dd6f1dd..1c4f220e2 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2660,10 +2660,6 @@ void PlayerPreThink (void) if(frametime) { -#ifndef NO_LEGACY_NETWORKING - self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2; -#endif - if(self.weapon == WEP_NEX && autocvar_g_balance_nex_charge) { self.weaponentity_glowmod_x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, self.nex_charge / autocvar_g_balance_nex_charge_animlimit); diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 03347a9c8..e81b08e58 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -252,11 +252,6 @@ void player_anim (void) animdecide_setstate(self, animbits, FALSE); animdecide_setimplicitstate(self, (self.flags & FL_ONGROUND)); -#ifndef NO_LEGACY_NETWORKING - if(!self.iscsqcmodel) - animdecide_setframes(self, FALSE, frame, frame1time, frame2, frame2time); -#endif - if (self.weaponentity) { updateanim(self.weaponentity); diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 680afbc89..5e5fc4c7d 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -340,9 +340,6 @@ void cvar_changes_init() BADCVAR("gameversion"); BADPREFIX("gameversion_"); BADCVAR("sv_namechangetimer"); -#ifndef NO_LEGACY_NETWORKING - BADCVAR("sv_use_csqc_players"); // transition -#endif // allowed changes to server admins (please sync this to server.cfg) // vi commands: