From cd4338ac340ee4def77a474e7c06b998fd26ab05 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 11 Apr 2019 09:48:56 +1000 Subject: [PATCH] Fix compile with TURRET_DEBUG --- qcsrc/common/turrets/turret/flac_weapon.qc | 4 ++-- qcsrc/common/turrets/util.qc | 6 +++--- qcsrc/common/turrets/util.qh | 4 ++++ qcsrc/server/pathlib/main.qc | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/turrets/turret/flac_weapon.qc b/qcsrc/common/turrets/turret/flac_weapon.qc index d9d7a3f14..64b5e2054 100644 --- a/qcsrc/common/turrets/turret/flac_weapon.qc +++ b/qcsrc/common/turrets/turret/flac_weapon.qc @@ -42,8 +42,8 @@ void turret_flac_projectile_think_explode(entity this) #ifdef TURRET_DEBUG float d = RadiusDamage (this, this.owner, this.owner.shot_dmg, this.owner.shot_dmg, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, DMG_NOWEP, NULL); - this.owner.tur_dbg_dmg_t_h = this.owner.tur_dbg_dmg_t_h + d; - this.owner.tur_dbg_dmg_t_f = this.owner.tur_dbg_dmg_t_f + this.owner.shot_dmg; + this.owner.tur_debug_dmg_t_h = this.owner.tur_debug_dmg_t_h + d; + this.owner.tur_debug_dmg_t_f = this.owner.tur_debug_dmg_t_f + this.owner.shot_dmg; #else RadiusDamage (this, this.realowner, this.owner.shot_dmg, this.owner.shot_dmg, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, DMG_NOWEP, NULL); #endif diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc index 5201f4751..817487c6d 100644 --- a/qcsrc/common/turrets/util.qc +++ b/qcsrc/common/turrets/util.qc @@ -97,7 +97,7 @@ void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax } #ifdef TURRET_DEBUG -void marker_think(entity this, ) +void marker_think(entity this) { if(this.cnt) if(this.cnt < time) @@ -129,7 +129,7 @@ void mark_error(vector where,float lifetime) void mark_info(vector where,float lifetime) { - entity err = spawn(info_marker); + entity err = new(info_marker); setmodel(err, MDL_MARKER); setorigin(err, where); set_movetype(err, MOVETYPE_NONE); @@ -142,7 +142,7 @@ void mark_info(vector where,float lifetime) entity mark_misc(vector where,float lifetime) { - entity err = spawn(mark_misc); + entity err = new(mark_misc); setmodel(err, MDL_MARKER); setorigin(err, where); set_movetype(err, MOVETYPE_NONE); diff --git a/qcsrc/common/turrets/util.qh b/qcsrc/common/turrets/util.qh index 4e5cb0d5b..d42c433a1 100644 --- a/qcsrc/common/turrets/util.qh +++ b/qcsrc/common/turrets/util.qh @@ -9,6 +9,10 @@ void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax void mark_error(vector where,float lifetime); void mark_info(vector where,float lifetime); entity mark_misc(vector where,float lifetime); + +void paint_target(entity onwho, float f_size, vector v_color, float f_time); +void paint_target2(entity onwho, float f_size, vector v_color, float f_time); +void paint_target3(vector where, float f_size, vector v_color, float f_time); #endif #endif diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc index 1aeae109c..fc550fa63 100644 --- a/qcsrc/server/pathlib/main.qc +++ b/qcsrc/server/pathlib/main.qc @@ -4,6 +4,7 @@ #include #include "pathlib.qh" #include "utility.qh" +#include #include "../command/common.qh" void pathlib_deletepath(entity start) -- 2.39.2