From: Mario <mario@smbclan.net>
Date: Sat, 24 Dec 2016 21:26:47 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~14
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ff5abbe10f6a0542cc40e931d0f61aafa359eff9

Merge branch 'master' into Mario/wepent_experimental
---

ff5abbe10f6a0542cc40e931d0f61aafa359eff9
diff --cc qcsrc/common/vehicles/sv_vehicles.qc
index 491962b67a,9c8d05ce4e..1bbc18d9c2
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@@ -803,15 -804,10 +804,15 @@@ void vehicles_exit(entity vehic, bool e
  		player.alpha			= 1;
  		player.PlayerPhysplug	= func_null;
  		player.vehicle			= NULL;
- 		player.view_ofs		= STAT(PL_VIEW_OFS, NULL);
+ 		player.view_ofs		= STAT(PL_VIEW_OFS, player);
  		player.event_damage	= PlayerDamage;
  		player.hud				= HUD_NORMAL;
 -		PS(player).m_switchweapon = vehic.m_switchweapon;
 +		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++ slot)
 +		{
 +			.entity weaponentity = weaponentities[slot];
 +			player.(weaponentity).m_switchweapon = vehic.(weaponentity).m_switchweapon;
 +			delete(vehic.(weaponentity)); // no longer needed
 +		}
  		player.last_vehiclecheck = time + 3;
  		player.vehicle_enter_delay = time + 2;