From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 22 May 2016 05:02:00 +0000 (+1000)
Subject: Kill more setself
X-Git-Tag: xonotic-v0.8.2~904
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2fd21a1453b64681d080e71eb005e0f437b08437;p=xonotic%2Fxonotic-data.pk3dir.git

Kill more setself
---

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index caa82e880..0b16b1517 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -822,7 +822,6 @@ void vehicles_exit(bool eject)
 		if (_vehicle.vehicle_flags & VHF_PLAYERSLOT)
 		{
 			_vehicle.vehicle_exit(eject);
-			setself(this);
 			vehicles_exit_running = false;
 			return;
 		}
@@ -1086,11 +1085,9 @@ void vehicles_enter(entity pl, entity veh)
 
 	MUTATOR_CALLHOOK(VehicleEnter, pl, veh);
 
-	setself(veh);
 	CSQCModel_UnlinkEntity(veh);
 	Vehicle info = Vehicles_from(veh.vehicleid);
-	info.vr_enter(info, veh);
-	setself(oldself);
+	WITHSELF(veh, info.vr_enter(info, veh));
 
 	antilag_clear(pl, CS(pl));
 }