From: Rudolf Polzer Date: Sat, 29 Dec 2012 19:50:38 +0000 (+0100) Subject: gmqcc fixes X-Git-Tag: xonotic-v0.7.0~157 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2517decba8c60103ad12c7f3eec2f829b25d3bfd;p=xonotic%2Fxonotic-data.pk3dir.git gmqcc fixes --- diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh index 43e7b6499..28536c256 100644 --- a/qcsrc/client/main.qh +++ b/qcsrc/client/main.qh @@ -1,5 +1,3 @@ -const string string_null; - // -------------------------------------------------------------------------- // MENU Functionality diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index e103fabe7..6cceb42ba 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,5 +1,3 @@ -var float(string text, float handleColors, vector fontSize) stringwidth; - entity players; entity teams; diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc index 177c9b535..5efa11cf5 100644 --- a/qcsrc/client/vehicles/vehicles.qc +++ b/qcsrc/client/vehicles/vehicles.qc @@ -41,7 +41,7 @@ void CSQC_BUMBLE_GUN_HUD(); #define MAX_AXH 4 entity AuxiliaryXhair[MAX_AXH]; -const var void Draw_Not(); +var void Draw_Not(); .string axh_image; .float axh_fadetime; diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc index f328162ff..5f27b60a5 100644 --- a/qcsrc/server/mutators/gamemode_nexball.qc +++ b/qcsrc/server/mutators/gamemode_nexball.qc @@ -773,14 +773,13 @@ void W_Nexball_Attack2(void) missile.flags = FL_PROJECTILE; } -var const float() nullfunc; float ball_customize() { if(!self.owner) { self.effects &~= EF_FLAME; self.scale = 1; - self.customizeentityforclient = nullfunc; + self.customizeentityforclient = func_null; return TRUE; } diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh index 834e65167..30633ed36 100644 --- a/qcsrc/server/vehicles/vehicles_def.qh +++ b/qcsrc/server/vehicles/vehicles_def.qh @@ -62,7 +62,7 @@ var .void() vehicle_die; /// Vehicles custom function to be executed when veh #define VHSF_NORMAL 0 #define VHSF_FACTORY 2 var .void(float _spawnflag) vehicle_spawn; /// Vehicles custom fucntion to be efecuted when vehicle (re)spawns -const var .float(float _imp) vehicles_impusle_null; +var .float(float _imp) vehicles_impusle_null; var .float(float _imp) vehicles_impusle; .float vehicle_weapon2mode = volly_counter; diff --git a/qcsrc/warpzonelib/common.qh b/qcsrc/warpzonelib/common.qh index e7cf23908..c79ee95d6 100644 --- a/qcsrc/warpzonelib/common.qh +++ b/qcsrc/warpzonelib/common.qh @@ -27,7 +27,7 @@ void WarpZone_MakeAllOther(); #define MOVE_NOTHING -1 entity WarpZone_trace_forent; // temp, callback is allowed to change it typedef void(vector start, vector hit, vector end) WarpZone_trace_callback_t; // called on every elementary trace -const var WarpZone_trace_callback_t WarpZone_trace_callback_t_null; +var WarpZone_trace_callback_t WarpZone_trace_callback_t_null; entity WarpZone_trace_transform; // transform accumulator during a trace entity WarpZone_trace_firstzone; // first warpzone hit by a trace (can differ from the requested zone in case of _ThroughZone, the trace is aborted then) entity WarpZone_trace_lastzone; // first warpzone hit by a trace (can differ from the requested zone in case of _ThroughZone, the trace is aborted then)