Purge autocvars.qh from the codebase, cvars are defined in the headers of the feature...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / sv_vehicles.qc

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index f03e9dc6b4334b8f2fce53e3ffe4e83e49508cf8..8adfb4f0c98f46206215fafbc52f258cae5c775b 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -1,6 +1,15 @@
 #include "sv_vehicles.qh"
 
+#include <common/items/_mod.qh>
 #include <common/mapobjects/defs.qh>
+#include <common/mapobjects/teleporters.qh>
+#include <common/mapobjects/triggers.qh>
+#include <server/bot/api.qh>
+#include <server/client.qh>
+#include <server/damage.qh>
+#include <server/items/items.qh>
+#include <server/weapons/common.qh>
+#include <server/world.qh>
 
 bool SendAuxiliaryXhair(entity this, entity to, int sf)
 {
@@ -232,7 +241,7 @@ void vehicles_projectile_explode(entity this, entity toucher)
        PROJECTILE_TOUCH(this, toucher);
 
        this.event_damage = func_null;
-       RadiusDamage (this, this.realowner, this.shot_dmg, 0, this.shot_radius, this, NULL, this.shot_force, this.totalfrags, DMG_NOWEP, toucher);
+       RadiusDamage (this, this.realowner, this.shot_dmg, 0, this.shot_radius, this, NULL, this.shot_force, this.projectiledeathtype, DMG_NOWEP, toucher);
 
        delete(this);
 }
@@ -253,10 +262,8 @@ entity vehicles_projectile(entity this, entity _mzlfx, Sound _mzlsound,
                                                   int _deahtype, float _projtype, float _health,
                                                   bool _cull, bool _clianim, entity _owner)
 {
-       TC(Sound, _mzlsound);
-       entity proj;
-
-       proj = spawn();
+    TC(Sound, _mzlsound);
+       entity proj = new(vehicles_projectile);
 
        PROJECTILE_MAKETRIGGER(proj);
        setorigin(proj, _org);
@@ -264,7 +271,7 @@ entity vehicles_projectile(entity this, entity _mzlfx, Sound _mzlsound,
        proj.shot_dmg            = _dmg;
        proj.shot_radius          = _radi;
        proj.shot_force    = _force;
-       proj.totalfrags    = _deahtype;
+       proj.projectiledeathtype           = _deahtype;
        proj.solid                      = SOLID_BBOX;
        set_movetype(proj, MOVETYPE_FLYMISSILE);
        proj.flags = FL_PROJECTILE;
@@ -326,7 +333,7 @@ void vehicles_gib_think(entity this)
 
 entity vehicle_tossgib(entity this, entity _template, vector _vel, string _tag, bool _burn, bool _explode, float _maxtime, vector _rot)
 {
-       entity _gib = spawn();
+       entity _gib = new(vehicle_gib);
        _setmodel(_gib, _template.model);
        vector org = gettaginfo(this, gettagindex(this, _tag));
        setorigin(_gib, org);
@@ -371,8 +378,8 @@ bool vehicle_addplayerslot( entity _owner,
        _slot.vehicle_enter = _enterfunc;
        STAT(HUD, _slot) = _hud;
        _slot.vehicle_flags = VHF_PLAYERSLOT;
-       _slot.vehicle_viewport = spawn();
-       _slot.vehicle_hudmodel = spawn();
+       _slot.vehicle_viewport = new(vehicle_viewport);
+       _slot.vehicle_hudmodel = new(vehicle_hudmodel);
        _slot.vehicle_hudmodel.viewmodelforclient = _slot;
        _slot.vehicle_viewport.effects = (EF_ADDITIVE | EF_DOUBLESIDED | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NOGUNBOB | EF_NOSHADOW | EF_LOWPRECISION | EF_SELECTABLE | EF_TELEPORT_BIT);
 
@@ -685,7 +692,7 @@ void vehicles_damage(entity this, entity inflictor, entity attacker, float damag
        {
                if (wasfreed(this.vehicle_shieldent) || this.vehicle_shieldent == NULL)
                {
-                       this.vehicle_shieldent = spawn();
+                       this.vehicle_shieldent = new(vehicle_shieldent);
                        this.vehicle_shieldent.effects = EF_LOWPRECISION;
 
                        setmodel(this.vehicle_shieldent, MDL_VEH_SHIELD);
@@ -1029,7 +1036,7 @@ void vehicles_enter(entity pl, entity veh)
 
        veh.vehicle_hudmodel.viewmodelforclient = pl;
 
-       pl.crouch = false;
+       UNSET_DUCKED(pl);
        pl.view_ofs = STAT(PL_VIEW_OFS, pl);
        setsize(pl, STAT(PL_MIN, pl), STAT(PL_MAX, pl));
 
@@ -1209,10 +1216,7 @@ bool vehicle_initialize(entity this, Vehicle info, bool nodrop)
                return false;
 
        if(!this.tur_head)
-       {
                info.vr_precache(info);
-               IL_PUSH(g_vehicles, this);
-       }
 
        if(this.targetname && this.targetname != "")
        {