From 4ac681f32fd8f0554c631359e5cff3d50fa8277d Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 18 Dec 2011 20:59:21 +0100
Subject: [PATCH] Revert "vehicles-no-viewport test" as it never was meant to
 be committed.

This reverts commit 8ad395df2c29ab67b0cfffab57fa45d1077b734a.
---
 qcsrc/server/cl_client.qc             | 17 +++++++++++------
 qcsrc/server/vehicles/vehicles.qc     |  7 ++-----
 qcsrc/server/vehicles/vehicles_def.qh |  1 -
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 8acc933cd..d34a0c287 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2165,6 +2165,11 @@ void SpectateCopy(entity spectatee) {
         self.vehicle_ammo2 = spectatee.vehicle_ammo2;
         self.vehicle_reload1 = spectatee.vehicle_reload1;
         self.vehicle_reload2 = spectatee.vehicle_reload2;
+        
+        msg_entity = self;
+        WriteByte (MSG_ONE, SVC_SETVIEWPORT);
+        WriteEntity(MSG_ONE, spectatee);
+        //self.tur_head = spectatee.vehicle.vehicle_viewport;
     }
 }
 
@@ -2222,17 +2227,20 @@ float SpectateNext() {
 		self.enemy = other;
 
 	if(self.enemy.classname == "player") {
-            msg_entity = self;
-            WriteByte(MSG_ONE, SVC_SETVIEW);
-            WriteEntity(MSG_ONE, self.enemy);
 	    if(self.enemy.vehicle)
 	    {	   
+            msg_entity = self;
+            WriteByte(MSG_ONE, SVC_SETVIEWPORT);
+            WriteEntity(MSG_ONE, self.enemy);
             //stuffcmd(self, "set viewsize $tmpviewsize \n");
             self.movetype = MOVETYPE_NONE;
             accuracy_resend(self);
 	    }
 	    else 
 	    {	        
+            msg_entity = self;
+            WriteByte(MSG_ONE, SVC_SETVIEW);
+            WriteEntity(MSG_ONE, self.enemy);
             //stuffcmd(self, "set viewsize $tmpviewsize \n");
             self.movetype = MOVETYPE_NONE;
             accuracy_resend(self);
@@ -3044,8 +3052,5 @@ void PlayerPostThink (void)
 		dprint(sprintf("%f %.6f\n", time, race_GetFractionalLapCount(self)));
 	*/
 
-	if(self.vehicle)
-		vehicles_updateplayer();
-
 	CSQCMODEL_AUTOUPDATE();
 }
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 94f44b077..8063c2791 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -499,6 +499,8 @@ void vehicles_enter()
     self.flags               -= FL_NOTARGET;
 
     msg_entity = other;
+    WriteByte (MSG_ONE, SVC_SETVIEWPORT);
+    WriteEntity(MSG_ONE, self.vehicle_viewport);
 
     WriteByte (MSG_ONE, SVC_SETVIEWANGLES);
     if(self.tur_head)
@@ -1054,8 +1056,3 @@ void bugmenot()
     self.vehicle_spawn      = self.vehicle_exit;
     self.AuxiliaryXhair     = self.AuxiliaryXhair;
 }
-
-void vehicles_updateplayer()
-{
-	setorigin(self, gettaginfo(self.vehicle.vehicle_viewport, 0));
-}
diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh
index 6e1a4cbfe..dcb1854f3 100644
--- a/qcsrc/server/vehicles/vehicles_def.qh
+++ b/qcsrc/server/vehicles/vehicles_def.qh
@@ -44,7 +44,6 @@ float VHF_DMGHEADROLL   = 4096;
 .void() vehicle_spawn;
 
 void vehicles_exit(float eject);
-void vehicles_updateplayer(void);
 var .void(float exit_flags) vehicle_exit;
 float VHEF_NORMAL = 0;  /// User pressed exit key
 float VHEF_EJECT  = 1;  /// User pressed exit key 3 times fast (not implemented) or vehile is dying
-- 
2.39.2