]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/turrets/sv_turrets.qc
Remove oldself variables
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / sv_turrets.qc
index e979c4802ba94cfa7fe75c84cfa2144c13614ecb..92971878370ae1b205fd8c6a27ba61c1ab2a46d1 100644 (file)
@@ -1,11 +1,9 @@
-// =========================
-//  SVQC Turret Properties
-// =========================
-
+#ifdef SVQC
+#include "../../server/autocvars.qh"
 
 // Generic aiming
 vector turret_aim_generic()
-{
+{SELFPARAM();
 
        vector pre_pos, prep;
        float distance, impact_time = 0, i, mintime;
@@ -26,7 +24,7 @@ vector turret_aim_generic()
                if (self.aim_flags & TFL_AIM_SHOTTIMECOMPENSATE)           // Need to conpensate for shot traveltime
                {
                        prep = pre_pos;
-                       
+
                        distance = vlen(prep - self.tur_shotorg);
                        impact_time = distance / self.shot_speed;
 
@@ -166,16 +164,15 @@ float turret_targetscore_generic(entity _turret, entity _target)
 }
 
 // Generic damage handling
-void() turret_respawn;
 void turret_hide()
-{
+{SELFPARAM();
        self.effects   |= EF_NODRAW;
        self.nextthink = time + self.respawntime - 0.2;
        self.think       = turret_respawn;
 }
 
 void turret_die()
-{
+{SELFPARAM();
        self.deadflag             = DEAD_DEAD;
        self.tur_head.deadflag = self.deadflag;
 
@@ -209,9 +206,9 @@ void turret_die()
        }
 }
 
-void turret_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
-{
-       // Enougth allready!
+void turret_damage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce)
+{SELFPARAM();
+       // Enough already!
        if(self.deadflag == DEAD_DEAD)
                return;
 
@@ -219,13 +216,8 @@ void turret_damage (entity inflictor, entity attacker, float damage, float death
        if(!self.active)
                return;
 
-       if (teamplay)
-       if (self.team == attacker.team)
+       if(SAME_TEAM(self, attacker))
        {
-               // This does not happen anymore. Re-enable if you fix that.
-               if(IS_REAL_CLIENT(attacker))
-                       sprint(attacker, "\{1}Turret tells you: I'm on your team!\n");
-
                if(autocvar_g_friendlyfire)
                        damage = damage * autocvar_g_friendlyfire;
                else
@@ -260,7 +252,7 @@ void turret_damage (entity inflictor, entity attacker, float damage, float death
 
 void() turret_think;
 void turret_respawn()
-{
+{SELFPARAM();
        // Make sure all parts belong to the same team since
        // this function doubles as "teamchange" function.
        self.tur_head.team      = self.team;
@@ -282,7 +274,7 @@ void turret_respawn()
        self.think       = turret_think;
 
        self.SendFlags = TNSF_FULL_UPDATE;
-       
+
        TUR_ACTION(self.turretid, TR_SETUP);
 }
 
@@ -291,7 +283,7 @@ void turret_respawn()
 #define cvar_base "g_turrets_unit_"
 .float clientframe;
 void turrets_setframe(float _frame, float client_only)
-{
+{SELFPARAM();
        if((client_only ? self.clientframe : self.frame ) != _frame)
        {
                self.SendFlags |= TNSF_ANIM;
@@ -306,7 +298,7 @@ void turrets_setframe(float _frame, float client_only)
 }
 
 float turret_send(entity to, float sf)
-{
+{SELFPARAM();
 
        WriteByte(MSG_ENTITY, ENT_CLIENT_TURRET);
        WriteByte(MSG_ENTITY, sf);
@@ -363,11 +355,11 @@ float turret_send(entity to, float sf)
                        WriteByte(MSG_ENTITY, ceil((self.health / self.max_health) * 255));
        }
 
-       return TRUE;
+       return true;
 }
 
 void load_unit_settings(entity ent, string unitname, float is_reload)
-{
+{SELFPARAM();
        string sbase;
 
        if (ent == world)
@@ -431,17 +423,17 @@ void load_unit_settings(entity ent, string unitname, float is_reload)
 }
 
 void turret_projectile_explode()
-{
+{SELFPARAM();
 
        self.takedamage = DAMAGE_NO;
        self.event_damage = func_null;
 #ifdef TURRET_DEBUG
        float d;
-       d = RadiusDamage (self, self.owner, self.owner.shot_dmg, 0, self.owner.shot_radius, self, self.owner.shot_force, self.totalfrags, world);
+       d = RadiusDamage (self, self.owner, self.owner.shot_dmg, 0, self.owner.shot_radius, self, world, self.owner.shot_force, self.totalfrags, world);
        self.owner.tur_debug_dmg_t_h = self.owner.tur_debug_dmg_t_h + d;
        self.owner.tur_debug_dmg_t_f = self.owner.tur_debug_dmg_t_f + self.owner.shot_dmg;
 #else
-       RadiusDamage (self, self.realowner, self.owner.shot_dmg, 0, self.owner.shot_radius, self, self.owner.shot_force, self.totalfrags, world);
+       RadiusDamage (self, self.realowner, self.owner.shot_dmg, 0, self.owner.shot_radius, self, world, self.owner.shot_force, self.totalfrags, world);
 #endif
        remove(self);
 }
@@ -452,8 +444,8 @@ void turret_projectile_touch()
        turret_projectile_explode();
 }
 
-void turret_projectile_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
-{
+void turret_projectile_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce)
+{SELFPARAM();
        self.velocity  += vforce;
        self.health     -= damage;
        //self.realowner = attacker; // Dont change realowner, it does not make much sense for turrets
@@ -462,7 +454,7 @@ void turret_projectile_damage(entity inflictor, entity attacker, float damage, f
 }
 
 entity turret_projectile(string _snd, float _size, float _health, float _death, float _proj_type, float _cull, float _cli_anim)
-{
+{SELFPARAM();
        entity proj;
 
        sound (self, CH_WEAPON_A, _snd, VOL_BASE, ATTEN_NORM);
@@ -471,7 +463,7 @@ entity turret_projectile(string _snd, float _size, float _health, float _death,
        setsize(proj, '-0.5 -0.5 -0.5' * _size, '0.5 0.5 0.5' * _size);
        proj.owner                = self;
        proj.realowner    = self;
-       proj.bot_dodge    = TRUE;
+       proj.bot_dodge    = true;
        proj.bot_dodgerating = self.shot_dmg;
        proj.think                = turret_projectile_explode;
        proj.touch                = turret_projectile_touch;
@@ -501,12 +493,10 @@ entity turret_projectile(string _snd, float _size, float _health, float _death,
 ** and updated aim<->predict impact distance.
 **/
 void turret_do_updates(entity t_turret)
-{
+{SELFPARAM();
        vector enemy_pos;
-       entity oldself;
 
-       oldself = self;
-       self = t_turret;
+       setself(t_turret);
 
        enemy_pos = real_origin(self.enemy);
 
@@ -535,7 +525,7 @@ void turret_do_updates(entity t_turret)
        self.tur_impactent                       = trace_ent;
        self.tur_impacttime                     = vlen(self.tur_shotorg - trace_endpos) / self.shot_speed;
 
-       self = oldself;
+       setself(this);
 }
 
 /**
@@ -544,7 +534,7 @@ void turret_do_updates(entity t_turret)
 **/
 .float turret_framecounter;
 void turret_track()
-{
+{SELFPARAM();
        vector target_angle; // This is where we want to aim
        vector move_angle;   // This is where we can aim
        float f_tmp;
@@ -701,14 +691,17 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl
        //if(!validate_flags & TFL_TARGETSELECT_NOBUILTIN)
        //      return -0.5;
 
+       if(!e_target)
+               return -2;
+
        if(e_target.owner == e_turret)
                return -0.5;
 
        if(!checkpvs(e_target.origin, e_turret))
                return -1;
 
-       if(!e_target)
-               return -2;
+       if(e_target.alpha <= 0.3)
+               return -1;
 
        if(g_onslaught)
                if (substring(e_target.classname, 0, 10) == "onslaught_") // don't attack onslaught targets, that's the player's job!
@@ -722,7 +715,7 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl
                return -5;
 
        // Cant touch this
-       if(e_target.vehicle_flags & VHF_ISVEHICLE)
+       if(IS_VEHICLE(e_target))
        {
                if (e_target.vehicle_health <= 0)
                        return -6;
@@ -832,14 +825,14 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl
        */
 
 #ifdef TURRET_DEBUG_TARGETSELECT
-       dprint("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n");
+       LOG_TRACE("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n");
 #endif
 
        return 1;
 }
 
 entity turret_select_target()
-{
+{SELFPARAM();
        entity e;               // target looper entity
        float  score;   // target looper entity score
        entity e_enemy;  // currently best scoreing target
@@ -906,7 +899,7 @@ entity turret_select_target()
 ** Preforms pre-fire checks based on the uints firecheck_flags
 **/
 float turret_firecheck()
-{
+{SELFPARAM();
        // This one just dont care =)
        if (self.firecheck_flags & TFL_FIRECHECK_NO)
                return 1;
@@ -979,11 +972,23 @@ float turret_firecheck()
        return 1;
 }
 
+bool turret_checkfire()
+{SELFPARAM();
+       bool ret = false; // dummy
+       if(MUTATOR_CALLHOOK(Turret_CheckFire, ret))
+               return ret_bool;
+
+       return self.turret_firecheckfunc();
+}
+
 void turret_fire()
-{
+{SELFPARAM();
        if (autocvar_g_turrets_nofire != 0)
                return;
-               
+
+       if(MUTATOR_CALLHOOK(TurretFire, self))
+               return;
+
        TUR_ACTION(self.turretid, TR_ATTACK);
 
        self.attack_finished_single = time + self.shot_refire;
@@ -1007,7 +1012,7 @@ void turret_fire()
 }
 
 void turret_think()
-{
+{SELFPARAM();
        entity e;
 
        self.nextthink = time + self.ticrate;
@@ -1065,7 +1070,7 @@ void turret_think()
 
                                        turret_do_updates(self);
 
-                                       if (self.turret_firecheckfunc())
+                                       if (turret_checkfire())
                                                turret_fire();
                                }
                        }
@@ -1089,7 +1094,7 @@ void turret_think()
                turret_do_updates(self);
 
                // Fire?
-               if (self.turret_firecheckfunc())
+               if (turret_checkfire())
                        turret_fire();
        }
        else
@@ -1109,9 +1114,9 @@ void turret_think()
                                turret_do_updates(self);
 
                                // Fire!
-                               if (self.turret_firecheckfunc() != 0)
+                               if (turret_checkfire())
                                        turret_fire();
-                                       
+
                                TUR_ACTION(self.turretid, TR_THINK);
 
                                return;
@@ -1149,7 +1154,7 @@ void turret_think()
                        // Turn & pitch
                        if(!(self.track_flags & TFL_TRACK_NO))
                                turret_track();
-                               
+
                        TUR_ACTION(self.turretid, TR_THINK);
 
                        // And bail.
@@ -1169,7 +1174,7 @@ void turret_think()
                turret_do_updates(self);
 
                // Fire?
-               if (self.turret_firecheckfunc())
+               if (turret_checkfire())
                        turret_fire();
        }
 
@@ -1181,8 +1186,8 @@ void turret_think()
        If activator is world, the turret go inactive.
 */
 void turret_use()
-{
-       dprint("Turret ",self.netname, " used by ", activator.classname, "\n");
+{SELFPARAM();
+       LOG_TRACE("Turret ",self.netname, " used by ", activator.classname, "\n");
 
        self.team = activator.team;
 
@@ -1194,15 +1199,15 @@ void turret_use()
 }
 
 void turret_link()
-{
-       Net_LinkEntity(self, TRUE, 0, turret_send);
+{SELFPARAM();
+       Net_LinkEntity(self, true, 0, turret_send);
        self.think       = turret_think;
        self.nextthink = time;
        self.tur_head.effects = EF_NODRAW;
 }
 
 void turrets_manager_think()
-{
+{SELFPARAM();
        self.nextthink = time + 1;
 
        entity e;
@@ -1211,7 +1216,7 @@ void turrets_manager_think()
                e = nextent(world);
                while (e)
                {
-                       if (e.turret_flags & TUR_FLAG_ISTURRET)
+                       if (IS_TURRET(e))
                        {
                                load_unit_settings(e,e.cvar_basename,1);
                                TUR_ACTION(self.turretid, TR_THINK);
@@ -1224,14 +1229,16 @@ void turrets_manager_think()
 }
 
 float turret_initialize(float tur_id)
-{
+{SELFPARAM();
        if(!autocvar_g_turrets)
-               return FALSE;
+               return false;
 
        entity e;
        entity tur = get_turretinfo(tur_id);
        if(tur.turretid == 0)
-               return FALSE; // invalid turret
+               return false; // invalid turret
+
+       if(!self.tur_head) { TUR_ACTION(tur_id, TR_PRECACHE); } // if tur_head exists, we can assume this turret re-spawned
 
        e = find(world, classname, "turret_manager");
        if(!e)
@@ -1247,7 +1254,7 @@ float turret_initialize(float tur_id)
 
        self.cvar_basename = tur.cvar_basename;
        load_unit_settings(self, self.cvar_basename, 0);
-       
+
        if(!self.team || !teamplay)             { self.team = MAX_SHOT_DISTANCE; }
        if(!self.ticrate)                               { self.ticrate = ((self.turret_flags & TUR_FLAG_SUPPORT) ? 0.2 : 0.1); }
        if(!self.health)                                { self.health = 1000; }
@@ -1262,19 +1269,19 @@ float turret_initialize(float tur_id)
        if(!self.target_select_flags)   { self.target_select_flags = TFL_TARGETSELECT_LOS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_RANGELIMITS | TFL_TARGETSELECT_ANGLELIMITS; }
        if(!self.firecheck_flags)               { self.firecheck_flags = TFL_FIRECHECK_DEAD | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_LOS
                                                                                                                   | TFL_FIRECHECK_AIMDIST | TFL_FIRECHECK_TEAMCHECK | TFL_FIRECHECK_AMMO_OWN | TFL_FIRECHECK_REFIRE; }
-                                                                                                                  
+
        if(self.track_type != TFL_TRACKTYPE_STEPMOTOR)
        {
                // Fluid / Ineria mode. Looks mutch nicer.
                // Can reduce aim preformance alot, needs a bit diffrent aimspeed
-               
+
                self.aim_speed = bound(0.1, ((!self.aim_speed) ? 180 : self.aim_speed), 1000);
-               
+
                if(!self.track_accel_pitch)             { self.track_accel_pitch = 0.5; }
                if(!self.track_accel_rotate)    { self.track_accel_rotate = 0.5; }
                if(!self.track_blendrate)               { self.track_blendrate = 0.35; }
        }
-       
+
        self.respawntime                                = max(-1, ((!self.respawntime) ? 60 : self.respawntime));
        self.shot_refire                                = bound(0.01, ((!self.shot_refire) ? 1 : self.shot_refire), 9999);
        self.shot_dmg                                   = max(1, ((!self.shot_dmg) ? self.shot_refire * 50 : self.shot_dmg));
@@ -1298,31 +1305,31 @@ float turret_initialize(float tur_id)
        self.target_select_playerbias   = bound(-10, ((!self.target_select_playerbias) ? 1 : self.target_select_playerbias), 10);
        self.ammo_max                                   = max(self.shot_dmg, ((!self.ammo_max) ? self.shot_dmg * 10 : self.ammo_max));
        self.ammo_recharge                              = max(0, ((!self.ammo_recharge) ? self.shot_dmg * 0.5 : self.ammo_recharge));
-       
+
        self.turret_flags = TUR_FLAG_ISTURRET | (tur.spawnflags);
-       
+
        if(self.turret_flags & TUR_FLAG_SPLASH)
                self.aim_flags |= TFL_AIM_SPLASH;
-               
+
        if(self.turret_flags & TUR_FLAG_MISSILE)
                self.target_select_flags |= TFL_TARGETSELECT_MISSILES;
 
        if(self.turret_flags & TUR_FLAG_PLAYER)
                self.target_select_flags |= TFL_TARGETSELECT_PLAYERS;
-               
+
        if(self.spawnflags & TSL_NO_RESPAWN)
                self.damage_flags |= TFL_DMG_DEATH_NORESPAWN;
-               
+
        if (self.turret_flags & TUR_FLAG_SUPPORT)
                self.turret_score_target = turret_targetscore_support;
        else
                self.turret_score_target = turret_targetscore_generic;
-               
+
        ++turret_count;
-               
+
        setmodel(self, tur.model);
        setsize(self, tur.mins, tur.maxs);
-       
+
        self.turretid                           = tur_id;
        self.classname                          = "turret_main";
        self.active                                     = ACTIVE_ACTIVE;
@@ -1340,23 +1347,23 @@ float turret_initialize(float tur_id)
        self.turret_firecheckfunc       = turret_firecheck;
        self.event_damage                       = turret_damage;
        self.use                                        = turret_use;
-       self.bot_attack                         = TRUE;
+       self.bot_attack                         = true;
        self.nextthink                          = time + 1;
        self.nextthink                     += turret_count * sys_frametime;
-       
+
        self.tur_head = spawn();
        setmodel(self.tur_head, tur.head_model);
        setsize(self.tur_head, '0 0 0', '0 0 0');
        setorigin(self.tur_head, '0 0 0');
        setattachment(self.tur_head, self, "tag_head");
-       
+
        self.tur_head.netname           = self.tur_head.classname = "turret_head";
        self.tur_head.team                      = self.team;
        self.tur_head.owner                     = self;
        self.tur_head.takedamage        = DAMAGE_NO;
        self.tur_head.solid                     = SOLID_NOT;
        self.tur_head.movetype          = self.movetype;
-       
+
        if(!self.tur_defend)
        if(self.target != "")
        {
@@ -1364,15 +1371,15 @@ float turret_initialize(float tur_id)
                if (self.tur_defend == world)
                {
                        self.target = "";
-                       dprint("Turret has invalid defendpoint!\n");
+                       LOG_TRACE("Turret has invalid defendpoint!\n");
                }
        }
-       
+
        if (self.tur_defend)
                self.idle_aim = self.tur_head.angles + angleofs(self.tur_head, self.tur_defend);
        else
                self.idle_aim = '0 0 0';
-               
+
 #ifdef TURRET_DEBUG
        self.tur_debug_start = self.nextthink;
        while (vlen(self.tur_debug_rvec) < 2)
@@ -1386,11 +1393,12 @@ float turret_initialize(float tur_id)
        turret_link();
        turret_respawn();
        turret_tag_fire_update();
-       
+
        TUR_ACTION(tur_id, TR_SETUP);
-       
-       if(MUTATOR_CALLHOOK(TurretSpawn))
-               return FALSE;
 
-       return TRUE;
+       if(MUTATOR_CALLHOOK(TurretSpawn, self))
+               return false;
+
+       return true;
 }
+#endif