#include "sv_vehicles.qh"
-#include "../effects.qh"
#if 0
bool vehicle_send(entity to, int sf)
}
#endif
-bool SendAuxiliaryXhair(entity to, int sf)
+bool SendAuxiliaryXhair(entity this, entity to, int sf)
{
- WriteByte(MSG_ENTITY, ENT_CLIENT_AUXILIARYXHAIR);
+ WriteHeader(MSG_ENTITY, ENT_CLIENT_AUXILIARYXHAIR);
WriteByte(MSG_ENTITY, self.cnt);
msg_entity = own;
- WriteByte(MSG_ONE, SVC_TEMPENTITY);
- WriteByte(MSG_ONE, TE_CSQC_VEHICLESETUP);
+ WriteHeader(MSG_ONE, TE_CSQC_VEHICLESETUP);
WriteByte(MSG_ONE, vehicle_id);
}
vector targetdrone_getnewspot()
-{
+{SELFPARAM();
vector spot;
int i;
for(i = 0; i < 100; ++i)
}
void vehicles_locktarget(float incr, float decr, float _lock_time)
-{
+{SELFPARAM();
if(self.lock_target && self.lock_target.deadflag != DEAD_NO)
{
self.lock_target = world;
}
vector vehicles_force_fromtag_hover(string tag_name, float spring_length, float max_power)
-{
+{SELFPARAM();
force_fromtag_origin = gettaginfo(self, gettagindex(self, tag_name));
v_forward = normalize(v_forward) * -1;
traceline(force_fromtag_origin, force_fromtag_origin - (v_forward * spring_length), MOVE_NORMAL, self);
}
vector vehicles_force_fromtag_maglev(string tag_name, float spring_length, float max_power)
-{
+{SELFPARAM();
force_fromtag_origin = gettaginfo(self, gettagindex(self, tag_name));
v_forward = normalize(v_forward) * -1;
// projectile handling
void vehicles_projectile_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
// Ignore damage from oterh projectiles from my owner (dont mess up volly's)
if(inflictor.owner == self.owner)
return;
}
void vehicles_projectile_explode()
-{
+{SELFPARAM();
if(self.owner && other != world)
{
if(other == self.owner.vehicle)
float _dmg, float _radi, float _force, float _size,
int _deahtype, float _projtype, float _health,
bool _cull, bool _clianim, entity _owner)
-{
+{SELFPARAM();
entity proj;
proj = spawn();
proj.use = vehicles_projectile_explode;
proj.owner = self;
proj.realowner = _owner;
- proj.think = SUB_Remove;
+ proj.think = SUB_Remove_self;
proj.nextthink = time + 30;
if(_health)
proj.flags = FL_PROJECTILE | FL_NOTARGET;
if(_mzlsound)
- sound (self, CH_WEAPON_A, _mzlsound, VOL_BASE, ATTEN_NORM);
+ _sound (self, CH_WEAPON_A, _mzlsound, VOL_BASE, ATTEN_NORM);
if(_mzlfx)
- Send_Effect(_mzlfx, proj.origin, proj.velocity, 1);
+ Send_Effect_(_mzlfx, proj.origin, proj.velocity, 1);
setsize (proj, '-1 -1 -1' * _size, '1 1 1' * _size);
}
void vehicles_gib_explode()
-{
- sound (self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
- Send_Effect("explosion_small", randomvec() * 80 + (self.origin + '0 0 100'), '0 0 0', 1);
- Send_Effect("explosion_small", self.wp00.origin + '0 0 64', '0 0 0', 1);
+{SELFPARAM();
+ sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
+ Send_Effect(EFFECT_EXPLOSION_SMALL, randomvec() * 80 + (self.origin + '0 0 100'), '0 0 0', 1);
+ Send_Effect(EFFECT_EXPLOSION_SMALL, self.wp00.origin + '0 0 64', '0 0 0', 1);
remove(self);
}
void vehicles_gib_think()
-{
+{SELFPARAM();
self.alpha -= 0.1;
if(self.cnt >= time)
remove(self);
}
entity vehicle_tossgib(entity _template, vector _vel, string _tag, bool _burn, bool _explode, float _maxtime, vector _rot)
-{
+{SELFPARAM();
entity _gib = spawn();
- setmodel(_gib, _template.model);
+ _setmodel(_gib, _template.model);
setorigin(_gib, gettaginfo(self, gettagindex(self, _tag)));
_gib.velocity = _vel;
_gib.movetype = MOVETYPE_TOSS;
_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);
- setmodel(_slot.vehicle_hudmodel, _hud_model);
- setmodel(_slot.vehicle_viewport, "null");
+ _setmodel(_slot.vehicle_hudmodel, _hud_model);
+ setmodel(_slot.vehicle_viewport, MDL_Null);
setattachment(_slot.vehicle_hudmodel, _slot, "");
setattachment(_slot.vehicle_viewport, _slot.vehicle_hudmodel, "");
}
void vehicles_reset_colors()
-{
+{SELFPARAM();
entity e;
float _effects = 0, _colormap;
vector _glowmod, _colormod;
void vehicles_clearreturn(entity veh)
{
- entity ret;
// Remove "return helper", if any.
- ret = findchain(classname, "vehicle_return");
- while(ret)
+ for (entity ret = findchain(classname, "vehicle_return"); ret; ret = ret.chain)
{
if(ret.wp00 == veh)
{
ret.classname = "";
- ret.think = SUB_Remove;
+ ret.think = SUB_Remove_self;
ret.nextthink = time + 0.1;
if(ret.waypointsprite_attached)
return;
}
- ret = ret.chain;
}
}
void vehicles_spawn();
void vehicles_return()
-{
- Send_Effect("teleport", self.wp00.origin + '0 0 64', '0 0 0', 1);
+{SELFPARAM();
+ Send_Effect(EFFECT_TELEPORT, self.wp00.origin + '0 0 64', '0 0 0', 1);
self.wp00.think = vehicles_spawn;
self.wp00.nextthink = time;
}
void vehicles_showwp_goaway()
-{
+{SELFPARAM();
if(self.waypointsprite_attached)
WaypointSprite_Kill(self.waypointsprite_attached);
}
void vehicles_showwp()
-{
+{SELFPARAM();
entity oldself = world;
vector rgb;
self.nextthink = time +1;
oldself = self;
- self = spawn();
- setmodel(self, "null");
+ setself(spawn());
+ setmodel(self, MDL_Null);
self.team = oldself.wp00.team;
self.wp00 = oldself.wp00;
setorigin(self, oldself.wp00.pos1);
rgb = Team_ColorRGB(self.team);
else
rgb = '1 1 1';
- entity wp = WaypointSprite_Spawn(WP_Vehicle, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP);
+ entity wp = WaypointSprite_Spawn(WP_Vehicle, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_Vehicle);
wp.colormod = rgb;
if(self.waypointsprite_attached)
{
WaypointSprite_UpdateRule(self.waypointsprite_attached, self.wp00.team, SPRITERULE_DEFAULT);
- if(oldself == world)
+ if(this == NULL)
WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, self.nextthink);
WaypointSprite_Ping(self.waypointsprite_attached);
}
- if(oldself != world)
- self = oldself;
+ if(this)
+ setself(this);
}
void vehicles_setreturn(entity veh)
vehicles_clearreturn(veh);
- ret = spawn();
- ret.classname = "vehicle_return";
+ ret = new(vehicle_return);
ret.wp00 = veh;
ret.team = veh.team;
ret.think = vehicles_showwp;
ret.nextthink = min(time + veh.respawntime, time + veh.respawntime - 1);
}
- setmodel(ret, "null");
+ setmodel(ret, MDL_Null);
setorigin(ret, veh.pos1 + '0 0 96');
}
void vehicle_use()
-{
- dprint("vehicle ",self.netname, " used by ", activator.classname, "\n");
+{SELFPARAM();
+ LOG_TRACE("vehicle ",self.netname, " used by ", activator.classname, "\n");
self.tur_head.team = activator.team;
if(self.active == ACTIVE_ACTIVE && self.deadflag == DEAD_NO && !gameover)
{
- dprint("Respawning vehicle: ", self.netname, "\n");
+ LOG_TRACE("Respawning vehicle: ", self.netname, "\n");
if(self.effects & EF_NODRAW)
{
self.think = vehicles_spawn;
}
void vehicles_regen(float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale)
-{
- if(self.regen_field < field_max)
+{SELFPARAM();
+ if(self.(regen_field) < field_max)
if(timer + rpause < time)
{
if(_healthscale)
regen = regen * (self.vehicle_health / self.max_health);
- self.regen_field = min(self.regen_field + regen * delta_time, field_max);
+ self.(regen_field) = min(self.(regen_field) + regen * delta_time, field_max);
if(self.owner)
- self.owner.regen_field = (self.regen_field / field_max) * 100;
+ self.owner.(regen_field) = (self.(regen_field) / field_max) * 100;
}
}
void shieldhit_think()
-{
+{SELFPARAM();
self.alpha -= 0.1;
if (self.alpha <= 0)
{
- //setmodel(self, "");
+ // setmodel(self, MDL_Null);
self.alpha = -1;
self.effects |= EF_NODRAW;
}
}
void vehicles_painframe()
-{
+{SELFPARAM();
if(self.owner.vehicle_health <= 50)
if(self.pain_frame < time)
{
float _ftmp;
_ftmp = self.owner.vehicle_health / 50;
self.pain_frame = time + 0.1 + (random() * 0.5 * _ftmp);
- pointparticles(particleeffectnum("smoke_small"), (self.origin + (randomvec() * 80)), '0 0 0', 1);
+ pointparticles(EFFECT_SMOKE_SMALL, (self.origin + (randomvec() * 80)), '0 0 0', 1);
if(self.vehicle_flags & VHF_DMGSHAKE)
self.velocity += randomvec() * 30;
}
void vehicles_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
self.dmg_time = time;
// WEAPONTODO
- if(DEATH_ISWEAPON(deathtype, WEP_VORTEX.m_id))
+ if(DEATH_ISWEAPON(deathtype, WEP_VORTEX))
damage *= autocvar_g_vehicles_vortex_damagerate;
- if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN.m_id))
+ if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN))
damage *= autocvar_g_vehicles_machinegun_damagerate;
- if(DEATH_ISWEAPON(deathtype, WEP_RIFLE.m_id))
+ if(DEATH_ISWEAPON(deathtype, WEP_RIFLE))
damage *= autocvar_g_vehicles_rifle_damagerate;
- if(DEATH_ISWEAPON(deathtype, WEP_VAPORIZER.m_id))
+ if(DEATH_ISWEAPON(deathtype, WEP_VAPORIZER))
damage *= autocvar_g_vehicles_vaporizer_damagerate;
- if(DEATH_ISWEAPON(deathtype, WEP_SEEKER.m_id))
+ if(DEATH_ISWEAPON(deathtype, WEP_SEEKER))
damage *= autocvar_g_vehicles_tag_damagerate;
- if(DEATH_WEAPONOFWEAPONDEATH(deathtype))
+ if(DEATH_WEAPONOF(deathtype) != WEP_Null)
damage *= autocvar_g_vehicles_weapon_damagerate;
self.enemy = attacker;
self.vehicle_shieldent = spawn();
self.vehicle_shieldent.effects = EF_LOWPRECISION;
- setmodel(self.vehicle_shieldent, "models/vhshield.md3");
+ setmodel(self.vehicle_shieldent, MDL_VEH_SHIELD);
setattachment(self.vehicle_shieldent, self, "");
setorigin(self.vehicle_shieldent, real_origin(self) - self.origin);
self.vehicle_shieldent.scale = 256 / vlen(self.maxs - self.mins);
antilag_clear(self);
- VEH_ACTION(self.vehicleid, VR_DEATH);
+ Vehicle info = get_vehicleinfo(self.vehicleid);
+ info.vr_death(info);
vehicles_setreturn(self);
}
}
}
void vehicles_impact(float _minspeed, float _speedfac, float _maxpain)
-{
+{SELFPARAM();
if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
return;
if(_minspeed < wc)
{
float take = min(_speedfac * wc, _maxpain);
- Damage (self, world, world, take, DEATH_FALL, self.origin, '0 0 0');
+ Damage (self, world, world, take, DEATH_FALL.m_id, self.origin, '0 0 0');
self.play_time = time + 0.25;
//dprint("wc: ", ftos(wc), "\n");
// vehicle enter/exit handling
vector vehicles_findgoodexit(vector prefer_spot)
-{
+{SELFPARAM();
//vector exitspot;
float mysize;
}
void vehicles_exit(bool eject)
-{
+{SELFPARAM();
entity _vehicle;
entity _player;
- entity _oldself = self;
if(vehicles_exit_running)
{
- dprint("^1vehicles_exit allready running! this is not good..\n");
+ LOG_TRACE("^1vehicles_exit allready running! this is not good..\n");
return;
}
if (_vehicle.vehicle_flags & VHF_PLAYERSLOT)
{
_vehicle.vehicle_exit(eject);
- self = _oldself;
+ setself(this);
vehicles_exit_running = false;
return;
}
_player = _vehicle.owner;
- self = _vehicle;
+ setself(_vehicle);
if (_player)
{
_vehicle.team = _vehicle.tur_head.team;
- sound (_vehicle, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTEN_NORM);
+ sound (_vehicle, CH_TRIGGER_SINGLE, SND_Null, 1, ATTEN_NORM);
_vehicle.vehicle_hudmodel.viewmodelforclient = _vehicle;
_vehicle.phase = time + 1;
vehicles_reset_colors();
_vehicle.owner = world;
- CSQCMODEL_AUTOINIT();
-
- self = _oldself;
+ CSQCMODEL_AUTOINIT(self);
+ setself(this);
vehicles_exit_running = false;
}
void vehicles_touch()
-{
+{SELFPARAM();
if(MUTATOR_CALLHOOK(VehicleTouch, self, other))
return;
if(vehicles_crushable(other))
{
if(vlen(self.velocity) >= 30)
- Damage(other, self, self.owner, autocvar_g_vehicles_crush_dmg, DEATH_VH_CRUSH, '0 0 0', normalize(other.origin - self.origin) * autocvar_g_vehicles_crush_force);
+ Damage(other, self, self.owner, autocvar_g_vehicles_crush_dmg, DEATH_VH_CRUSH.m_id, '0 0 0', normalize(other.origin - self.origin) * autocvar_g_vehicles_crush_force);
return; // Dont do selfdamage when hitting "soft targets".
}
- if(self.play_time < time)
- VEH_ACTION(self.vehicleid, VR_IMPACT);
+ if(self.play_time < time) {
+ Vehicle info = get_vehicleinfo(self.vehicleid);
+ info.vr_impact(info);
+ }
return;
}
vehicles_enter(other, self);
}
-bool vehicle_impulse(int imp)
+bool vehicle_impulse(entity this, int imp)
{
- switch(imp)
+ entity v = this.vehicle;
+ if (!v) return false;
+ if (v.deadflag != DEAD_NO) return false;
+ bool(int) f = v.vehicles_impulse;
+ if (f && f(imp)) return true;
+ switch (imp)
{
case 17:
{
return true;
}
}
-
return false;
}
void vehicles_enter(entity pl, entity veh)
-{
+{SELFPARAM();
// Remove this when bots know how to use vehicles
if((IS_BOT_CLIENT(pl) && !autocvar_g_vehicles_allow_bots))
return;
if(veh.vehicle_flags & VHF_MULTISLOT)
if(veh.owner)
{
- entity oldself = self;
- self = veh;
+ setself(veh);
other = pl; // TODO: fix
if(!veh.gunner1)
if(veh.gun1.vehicle_enter)
if(veh.gun1.vehicle_enter())
{
- self = oldself;
+ setself(this);
return;
}
if(veh.gun2.vehicle_enter)
if(veh.gun2.vehicle_enter())
{
- self = oldself;
+ setself(this);
return;
}
- self = oldself;
+ setself(this);
}
if(teamplay)
MUTATOR_CALLHOOK(VehicleEnter, pl, veh);
- entity oldself = self;
- self = veh;
- CSQCModel_UnlinkEntity();
- VEH_ACTION(veh.vehicleid, VR_ENTER);
- self = oldself;
+ setself(veh);
+ CSQCModel_UnlinkEntity(veh);
+ Vehicle info = get_vehicleinfo(veh.vehicleid);
+ info.vr_enter(info);
+ setself(this);
antilag_clear(pl);
}
void vehicles_think()
-{
+{SELFPARAM();
self.nextthink = time;
if(self.owner)
self.owner.vehicle_weapon2mode = self.vehicle_weapon2mode;
- VEH_ACTION(self.vehicleid, VR_THINK);
+ Vehicle info = get_vehicleinfo(self.vehicleid);
+ info.vr_think(info);
- CSQCMODEL_AUTOUPDATE();
+ CSQCMODEL_AUTOUPDATE(self);
}
// initialization
void vehicles_spawn()
-{
- dprint("Spawning vehicle: ", self.classname, "\n");
+{SELFPARAM();
+ LOG_TRACE("Spawning vehicle: ", self.classname, "\n");
// disown & reset
self.vehicle_hudmodel.viewmodelforclient = self;
self.angles = self.pos2;
setorigin(self, self.pos1);
// Show it
- Send_Effect("teleport", self.origin + '0 0 64', '0 0 0', 1);
+ Send_Effect(EFFECT_TELEPORT, self.origin + '0 0 64', '0 0 0', 1);
if(self.vehicle_controller)
self.team = self.vehicle_controller.team;
vehicles_reset_colors();
- VEH_ACTION(self.vehicleid, VR_SPAWN);
+ Vehicle info = get_vehicleinfo(self.vehicleid);
+ info.vr_spawn(info);
- CSQCMODEL_AUTOINIT();
+ CSQCMODEL_AUTOINIT(self);
}
bool vehicle_initialize(entity veh, bool nodrop)
-{
+{SELFPARAM();
if(!autocvar_g_vehicles)
return false;
if(!veh.vehicleid)
return false;
- if(!veh.tur_head) { VEH_ACTION(veh.vehicleid, VR_PRECACHE); }
+ if(!veh.tur_head) {
+ Vehicle info = get_vehicleinfo(veh.vehicleid);
+ info.vr_precache(info);
+ }
if(self.targetname && self.targetname != "")
{
self.team = 0;
if(self.mdl == "" || !self.mdl)
- setmodel(self, veh.model);
+ _setmodel(self, veh.model);
else
- setmodel(self, self.mdl);
+ _setmodel(self, self.mdl);
self.vehicle_flags |= VHF_ISVEHICLE;
- self.vehicle_viewport = spawn();
- self.vehicle_hudmodel = spawn();
- self.tur_head = spawn();
+ self.vehicle_viewport = new(vehicle_viewport);
+ self.vehicle_hudmodel = new(vehicle_hudmodel);
+ self.tur_head = new(tur_head);
self.tur_head.owner = self;
self.takedamage = DAMAGE_NO;
self.bot_attack = true;
if(autocvar_g_fullbrightplayers)
self.effects |= EF_FULLBRIGHT;
- setmodel(self.vehicle_hudmodel, veh.hud_model);
- setmodel(self.vehicle_viewport, "null");
+ _setmodel(self.vehicle_hudmodel, veh.hud_model);
+ setmodel(self.vehicle_viewport, MDL_Null);
if(veh.head_model != "")
{
- setmodel(self.tur_head, veh.head_model);
+ _setmodel(self.tur_head, veh.head_model);
setattachment(self.tur_head, self, veh.tag_head);
setattachment(self.vehicle_hudmodel, self.tur_head, veh.tag_hud);
setattachment(self.vehicle_viewport, self.vehicle_hudmodel, veh.tag_view);
self.pos2 = self.angles;
self.tur_head.team = self.team;
- VEH_ACTION(veh.vehicleid, VR_SETUP);
+ Vehicle info = get_vehicleinfo(veh.vehicleid);
+ info.vr_setup(info);
if(self.active == ACTIVE_NOT)
self.nextthink = 0; // wait until activated
projects / xonotic / xonotic-data.pk3dir.git / blobdiff