From: Rudolf Polzer Date: Sat, 26 Nov 2011 11:38:16 +0000 (+0100) Subject: fix some compat issues X-Git-Tag: xonotic-v0.6.0~74^2~100^2~42 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c59e14a26143d67566bc8788c86667afc0db681;p=xonotic%2Fxonotic-data.pk3dir.git fix some compat issues --- diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 481fc2480..07d6e0eda 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -6,7 +6,7 @@ void CSQCModel_Hook_PreDraw() { // auto glowmod from colormap - self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? (self.colormap & 0xFF) : stof(getplayerkey(self.entnum - 1, "colors"))), TRUE) * 2; + self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? (self.colormap & 0xFF) : stof(getplayerkeyvalue(self.entnum - 1, "colors"))), TRUE) * 2; if(self.modelindex != 0) { diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 4e9530c81..38cf75946 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -582,7 +582,7 @@ var vector autocvar_sv_player_viewoffset = '0 0 20'; var vector autocvar_sv_player_crouch_maxs = '16 16 25'; var vector autocvar_sv_player_crouch_mins = '-16 -16 -24'; var vector autocvar_sv_player_crouch_viewoffset = '0 0 20'; -var vector autocvar_sv_player_headsize = '24 24 12'; +noref var vector autocvar_sv_player_headsize = '24 24 12'; #define PL_VIEW_OFS autocvar_sv_player_viewoffset #define PL_MIN autocvar_sv_player_mins diff --git a/qcsrc/csqcmodel/cl_player.qc b/qcsrc/csqcmodel/cl_player.qc index add59971c..64ac42c0d 100644 --- a/qcsrc/csqcmodel/cl_player.qc +++ b/qcsrc/csqcmodel/cl_player.qc @@ -21,8 +21,6 @@ */ var float autocvar_cl_predictionerrorcompensation = 0; -var float autocvar_chase_active; -var float autocvar_chase_back; // engine stuff .float pmove_flags; @@ -133,7 +131,6 @@ void CSQCPlayer_SetCamera() { if(csqcplayer) { - vector org, ang; entity oldself; oldself = self; self = csqcplayer; @@ -213,7 +210,7 @@ void CSQCPlayer_SetCamera() V_CalcRefdef(self, refdefflags); } else - R_SetView3fv(VF_ORIGIN, self.origin + self.view_ofs); + setproperty(VF_ORIGIN, self.origin + self.view_ofs); { CSQCPLAYER_HOOK_POSTCAMERASETUP } diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 8d6419674..60136efc2 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -780,7 +780,6 @@ float autocvar_g_ctf_shield_max_ratio; float autocvar_g_ctf_shield_min_negscore; float autocvar_g_cts_finish_kill_delay; float autocvar_g_cts_selfdamage; -float autocvar_g_deathglow; float autocvar_g_debug_bot_commands; float autocvar_g_domination_default_teams; float autocvar_g_domination_disable_frags;