X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fsv_vehicles.qc;h=8727298991371aba37755ee0c2e049f83e2291af;hb=3589bb7872babf0ee489a54c85c9213562c1ffe9;hp=894e0638a19a4e49196ff38bceb8ddce3ae5acc4;hpb=5b22584122d4354ab7819853d0fa5219d14d832e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index 894e0638a..872729899 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -1,5 +1,5 @@
 #include "sv_vehicles.qh"
-#include "../effects.qh"
+#include "../effects/effects.qh"
 
 #if 0
 bool vehicle_send(entity to, int sf)
@@ -38,8 +38,8 @@ bool vehicle_send(entity to, int sf)
 }
 #endif
 
-bool SendAuxiliaryXhair(entity to, int sf)
-{SELFPARAM();
+bool SendAuxiliaryXhair(entity this, entity to, int sf)
+{
 
 	WriteByte(MSG_ENTITY, ENT_CLIENT_AUXILIARYXHAIR);
 
@@ -289,7 +289,7 @@ 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);
@@ -303,7 +303,7 @@ entity vehicles_projectile(string _mzlfx, string _mzlsound,
 
 void vehicles_gib_explode()
 {SELFPARAM();
-	sound (self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
+	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);
@@ -321,7 +321,7 @@ 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;
@@ -369,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, "");
@@ -515,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);
@@ -534,13 +534,13 @@ void vehicles_showwp()
 	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,7 +565,7 @@ 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');
 
 }
@@ -599,16 +599,16 @@ void vehicle_use()
 
 void vehicles_regen(float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale)
 {SELFPARAM();
-	if(self.regen_field < field_max)
+	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;
 	}
 }
 
@@ -617,7 +617,7 @@ void shieldhit_think()
 	self.alpha -= 0.1;
 	if (self.alpha <= 0)
 	{
-		//setmodel(self, "");
+		// setmodel(self, MDL_Null);
 		self.alpha = -1;
 		self.effects |= EF_NODRAW;
 	}
@@ -654,22 +654,22 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, int deatht
 	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);
 	}
 }
@@ -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");
@@ -828,7 +829,6 @@ void vehicles_exit(bool eject)
 {SELFPARAM();
 	entity _vehicle;
 	entity _player;
-	entity _oldself = self;
 
 	if(vehicles_exit_running)
 	{
@@ -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;
 
@@ -920,8 +920,7 @@ void vehicles_exit(bool eject)
 
 	CSQCMODEL_AUTOINIT(self);
 
-	self = _oldself;
-
+	setself(this);
 	vehicles_exit_running = false;
 }
 
@@ -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;
 	}
@@ -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)
@@ -1114,11 +1114,11 @@ 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);
 }
@@ -1130,7 +1130,8 @@ void vehicles_think()
 	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(self);
 }
@@ -1181,7 +1182,8 @@ void vehicles_spawn()
 
 	vehicles_reset_colors();
 
-	VEH_ACTION(self.vehicleid, VR_SPAWN);
+	Vehicle info = get_vehicleinfo(self.vehicleid);
+	info.vr_spawn(info);
 
 	CSQCMODEL_AUTOINIT(self);
 }
@@ -1194,7 +1196,10 @@ bool vehicle_initialize(entity veh, bool nodrop)
 	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 != "")
 	{
@@ -1224,9 +1229,9 @@ bool vehicle_initialize(entity veh, 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;
 
@@ -1257,12 +1262,12 @@ bool vehicle_initialize(entity veh, 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(entity veh, bool nodrop)
 	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