X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fvehicles%2Fsv_vehicles.qc;h=8727298991371aba37755ee0c2e049f83e2291af;hb=3589bb7872babf0ee489a54c85c9213562c1ffe9;hp=b06596bbc9cd4da869ba3cab1d758831e210a96b;hpb=ae2c1407ec9a05e4f501a6604a7cce8e1030df9f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index b06596bbc..872729899 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -1,6 +1,5 @@ -#include "../effects.qh" -#include "vehicles.qh" #include "sv_vehicles.qh" +#include "../effects/effects.qh" #if 0 bool vehicle_send(entity to, int sf) @@ -39,7 +38,7 @@ 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); @@ -95,7 +94,7 @@ void CSQCVehicleSetup(entity own, int vehicle_id) } vector targetdrone_getnewspot() -{ +{SELFPARAM(); vector spot; int i; for(i = 0; i < 100; ++i) @@ -109,7 +108,7 @@ vector targetdrone_getnewspot() } 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; @@ -182,7 +181,7 @@ void vehicles_locktarget(float incr, float decr, float _lock_time) } 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); @@ -194,7 +193,7 @@ vector vehicles_force_fromtag_hover(string tag_name, float spring_length, float } 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; @@ -215,7 +214,7 @@ vector vehicles_force_fromtag_maglev(string tag_name, float spring_length, float // 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; @@ -232,7 +231,7 @@ void vehicles_projectile_damage(entity inflictor, entity attacker, float damage, } void vehicles_projectile_explode() -{ +{SELFPARAM(); if(self.owner && other != world) { if(other == self.owner.vehicle) @@ -255,7 +254,7 @@ entity vehicles_projectile(string _mzlfx, string _mzlsound, 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(); @@ -290,10 +289,10 @@ entity vehicles_projectile(string _mzlfx, string _mzlsound, 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); @@ -303,15 +302,15 @@ entity vehicles_projectile(string _mzlfx, string _mzlsound, } void vehicles_gib_explode() -{ - sound (self, CH_SHOTS, "weapons/rocket_impact.wav", 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); @@ -320,9 +319,9 @@ void vehicles_gib_think() } 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; @@ -370,8 +369,8 @@ bool vehicle_addplayerslot( entity _owner, _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, ""); @@ -398,7 +397,7 @@ vector vehicle_aimturret(entity _vehic, vector _target, entity _turrret, string } void vehicles_reset_colors() -{ +{SELFPARAM(); entity e; float _effects = 0, _colormap; vector _glowmod, _colormod; @@ -479,8 +478,8 @@ void vehicles_clearreturn(entity veh) 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; @@ -492,7 +491,7 @@ void vehicles_return() } void vehicles_showwp_goaway() -{ +{SELFPARAM(); if(self.waypointsprite_attached) WaypointSprite_Kill(self.waypointsprite_attached); @@ -501,7 +500,7 @@ void vehicles_showwp_goaway() } void vehicles_showwp() -{ +{SELFPARAM(); entity oldself = world; vector rgb; @@ -516,8 +515,8 @@ void vehicles_showwp() 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); @@ -530,17 +529,18 @@ void vehicles_showwp() rgb = Team_ColorRGB(self.team); else rgb = '1 1 1'; - WaypointSprite_Spawn("vehicle", 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP, rgb); + entity wp = WaypointSprite_Spawn(WP_Vehicle, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP); + 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) @@ -565,14 +565,14 @@ void vehicles_setreturn(entity veh) 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; @@ -583,7 +583,7 @@ void vehicle_use() 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; @@ -598,26 +598,26 @@ void vehicle_use() } 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; } @@ -628,14 +628,14 @@ void shieldhit_think() } 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(particleeffectnum(EFFECT_SMOKE_SMALL), (self.origin + (randomvec() * 80)), '0 0 0', 1); if(self.vehicle_flags & VHF_DMGSHAKE) self.velocity += randomvec() * 30; @@ -650,26 +650,26 @@ void vehicles_painframe() } 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; @@ -683,7 +683,7 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, int deatht 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); @@ -737,7 +737,8 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, int deatht antilag_clear(self); - VEH_ACTION(self.vehicleid, VR_DEATH); + Vehicle info = get_vehicleinfo(self.vehicleid); + info.vr_death(info); vehicles_setreturn(self); } } @@ -754,7 +755,7 @@ float vehicles_crushable(entity e) } void vehicles_impact(float _minspeed, float _speedfac, float _maxpain) -{ +{SELFPARAM(); if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) return; @@ -766,7 +767,7 @@ void vehicles_impact(float _minspeed, float _speedfac, float _maxpain) 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"); @@ -777,7 +778,7 @@ void vehicles_impact(float _minspeed, float _speedfac, float _maxpain) // vehicle enter/exit handling vector vehicles_findgoodexit(vector prefer_spot) -{ +{SELFPARAM(); //vector exitspot; float mysize; @@ -825,14 +826,13 @@ vector vehicles_findgoodexit(vector prefer_spot) } 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; } @@ -844,7 +844,7 @@ void vehicles_exit(bool eject) if (_vehicle.vehicle_flags & VHF_PLAYERSLOT) { _vehicle.vehicle_exit(eject); - self = _oldself; + setself(this); vehicles_exit_running = false; return; } @@ -854,7 +854,7 @@ void vehicles_exit(bool eject) _player = _vehicle.owner; - self = _vehicle; + setself(_vehicle); if (_player) { @@ -908,7 +908,7 @@ void vehicles_exit(bool eject) _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; @@ -918,15 +918,14 @@ void vehicles_exit(bool eject) 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; @@ -939,13 +938,15 @@ void vehicles_touch() 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; } @@ -957,7 +958,7 @@ void vehicles_touch() } bool vehicle_impulse(int imp) -{ +{SELFPARAM(); switch(imp) { case 17: @@ -971,7 +972,7 @@ bool vehicle_impulse(int imp) } 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; @@ -988,8 +989,7 @@ void vehicles_enter(entity pl, entity veh) if(veh.vehicle_flags & VHF_MULTISLOT) if(veh.owner) { - entity oldself = self; - self = veh; + setself(veh); other = pl; // TODO: fix if(!veh.gunner1) @@ -997,7 +997,7 @@ void vehicles_enter(entity pl, entity veh) if(veh.gun1.vehicle_enter) if(veh.gun1.vehicle_enter()) { - self = oldself; + setself(this); return; } @@ -1006,11 +1006,11 @@ void vehicles_enter(entity pl, entity veh) if(veh.gun2.vehicle_enter) if(veh.gun2.vehicle_enter()) { - self = oldself; + setself(this); return; } - self = oldself; + setself(this); } if(teamplay) @@ -1024,8 +1024,10 @@ void vehicles_enter(entity pl, entity veh) Send_Notification(NOTIF_ONE, pl, MSG_CENTER, CENTER_VEHICLE_STEAL_SELF); - if(autocvar_g_vehicles_steal_show_waypoint) - WaypointSprite_Spawn("intruder", 0, 0, pl, '0 0 68', world, veh.team, veh, wps_intruder, true, RADARICON_DANGER, Team_ColorRGB(pl.team)); + if (autocvar_g_vehicles_steal_show_waypoint) { + entity wp = WaypointSprite_Spawn(WP_VehicleIntruder, 0, 0, pl, '0 0 68', world, veh.team, veh, wps_intruder, true, RADARICON_DANGER); + wp.colormod = Team_ColorRGB(pl.team); + } } else return; @@ -1112,31 +1114,32 @@ void vehicles_enter(entity pl, entity veh) 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); - CSQCMODEL_AUTOUPDATE(); + Vehicle info = get_vehicleinfo(self.vehicleid); + info.vr_think(info); + + 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; @@ -1167,7 +1170,7 @@ void vehicles_spawn() 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; @@ -1179,22 +1182,24 @@ void vehicles_spawn() 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(int vehicle_id, bool nodrop) -{ +bool vehicle_initialize(entity veh, bool nodrop) +{SELFPARAM(); if(!autocvar_g_vehicles) return false; - entity veh = get_vehicleinfo(vehicle_id); - if(!veh.vehicleid) return false; - - if(!veh.tur_head) { VEH_ACTION(vehicle_id, VR_PRECACHE); } + + if(!veh.tur_head) { + Vehicle info = get_vehicleinfo(veh.vehicleid); + info.vr_precache(info); + } if(self.targetname && self.targetname != "") { @@ -1224,9 +1229,9 @@ bool vehicle_initialize(int vehicle_id, bool nodrop) 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; @@ -1239,7 +1244,7 @@ bool vehicle_initialize(int vehicle_id, bool nodrop) self.iscreature = true; self.teleportable = false; // no teleporting for vehicles, too buggy self.damagedbycontents = true; - self.vehicleid = vehicle_id; + self.vehicleid = veh.vehicleid; self.PlayerPhysplug = veh.PlayerPhysplug; self.event_damage = func_null; self.touch = vehicles_touch; @@ -1257,12 +1262,12 @@ bool vehicle_initialize(int vehicle_id, bool nodrop) 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); @@ -1287,7 +1292,8 @@ bool vehicle_initialize(int vehicle_id, bool nodrop) self.pos2 = self.angles; self.tur_head.team = self.team; - VEH_ACTION(vehicle_id, VR_SETUP); + Vehicle info = get_vehicleinfo(veh.vehicleid); + info.vr_setup(info); if(self.active == ACTIVE_NOT) self.nextthink = 0; // wait until activated