From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 26 May 2011 17:26:49 +0000 (+0200)
Subject: Minor stuff (pre-merge)
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24eeef3b4f9c897ed5cfcdf3753f937e46810ce7;p=xonotic%2Fxonotic-data.pk3dir.git

Minor stuff (pre-merge)
---

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index 00d4c0584..00f0db2f6 100644
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -609,13 +609,14 @@ void CSQC_WAKIZASHI_HUD()
         picsize_x *= 0.5;
         picsize_y *= 0.5;
 
+
         drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), waki_xhair, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
     }
 }
 
 void Vehicles_Precache()
 {
-// HAAAAKKKZZZ!!!!!!!!!!!!
+// fixme: HAAAAKKKZZZ!!!!!!!!!!!! (this belongs as a setting in default.cfg)
     autocvar_cl_vehicles_hudscale = 0.5;
     autocvar_cl_vehicles_hudalpha = 0.75;
 
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index ef7617a39..c67c6830a 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -596,7 +596,7 @@ void FixPlayermodel();
 void PutObserverInServer (void)
 {
 	entity	spot;
-
+    self.hud = HUD_NORMAL;
 	race_PreSpawnObserver();
 
 	spot = SelectSpawnPoint (TRUE);
@@ -2368,6 +2368,10 @@ void SpectateCopy(entity spectatee) {
 	self.hud = spectatee.hud;
 	if(spectatee.vehicle)
     {
+        setorigin(self, spectatee.origin);
+        self.velocity = spectatee.vehicle.velocity;
+        self.v_angle += spectatee.vehicle.angles;
+        //self.v_angle_x *= -1;
         self.vehicle_health = spectatee.vehicle_health;
         self.vehicle_shield = spectatee.vehicle_shield;
         self.vehicle_energy = spectatee.vehicle_energy;
@@ -2375,15 +2379,17 @@ 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.vehicle.vehicle_viewport);
+        WriteEntity(MSG_ONE, spectatee);
+        //self.tur_head = spectatee.vehicle.vehicle_viewport;
     }
 }
 
 float SpectateUpdate() {
 	if(!self.enemy)
-		return 0;
+	    return 0;		
 
 	if (self == self.enemy)
 		return 0;
@@ -2406,17 +2412,28 @@ float SpectateNext() {
 		self.enemy = other;
 
 	if(self.enemy.classname == "player") {
-		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);
-
-		if(!SpectateUpdate())
-			PutObserverInServer();
-
-		return 1;
+	    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);
+
+            if(!SpectateUpdate())
+                PutObserverInServer();
+        }
+        return 1;
 	} else {
 		return 0;
 	}
diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index de5c7dfcd..f1cce3c8b 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -195,8 +195,8 @@ void raptor_think()
 void raptor_enter()
 {
     self.owner.PlayerPhysplug = raptor_takeoff;
-    self.movetype       = MOVETYPE_FLY;
-    self.solid          = SOLID_BBOX;
+    self.movetype       = MOVETYPE_BOUNCEMISSILE;
+    self.solid          = SOLID_SLIDEBOX;
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_raptor_health);
     self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_raptor_shield);
     self.velocity_z = 1; // Nudge upwards to takeoff sequense can work.
@@ -616,7 +616,7 @@ void raptor_spawn()
     self.vehicle_health = autocvar_g_vehicle_raptor_health;
     self.vehicle_shield = autocvar_g_vehicle_raptor_shield;
     self.movetype       = MOVETYPE_TOSS;
-    self.solid          = SOLID_BBOX;
+    self.solid          = SOLID_SLIDEBOX;
     self.vehicle_energy = 1;
 
     self.bomb1.gun1.avelocity_y = 90;
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index cef72363d..4ba25be5b 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -460,7 +460,7 @@ void vehicles_enter()
         WriteAngle(MSG_ONE,  0);                  // roll
     }
 #endif
-#endif
+//#endif
 
     vehicles_clearrturn();