From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 2 Apr 2011 21:36:48 +0000 (+0200)
Subject: Fix fb cockpit, better camera location for raptor
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d65eba09c6fdce25d53b4468f9c079c50f84d291;p=xonotic%2Fxonotic-data.pk3dir.git

Fix fb cockpit, better camera location for raptor
---

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index c8d145fcc..f002b45e4 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -652,7 +652,7 @@ void raptor_dinit()
     }
     setorigin(self, self.origin + '0 0 50');
     //FIXME: Camera is in a bad place in HUD model.
-    setorigin(self.vehicle_viewport, '5 0 5');
+    setorigin(self.vehicle_viewport, '25 0 5');
 
     self.frame = 0;
 
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index b96a2e900..aa221f08a 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -557,9 +557,10 @@ void vehicles_reset_colors()
         e = e.chain;
     }
 
-    self.effects  = _effects;
-    self.colormod = _colormod;
-    self.colormap = _colormap;
+
+    self.vehicle_hudmodel.effects  = self.effects  = _effects;
+    self.vehicle_hudmodel.colormod = self.colormod = _colormod;
+    self.vehicle_hudmodel.colormap = self.colormap = _colormap;
 
     self.alpha          = 1;
     self.avelocity      = '0 0 0';
diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index 8af257393..b74915a24 100644
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -6,15 +6,15 @@ set g_vehicle_raptor_movestyle 1
 
 set g_vehicle_raptor_turnroll 0.1
 
-set g_vehicle_raptor_turnspeed 70
-set g_vehicle_raptor_pitchspeed 30
+set g_vehicle_raptor_turnspeed  90
+set g_vehicle_raptor_pitchspeed 45
 set g_vehicle_raptor_pitchlimit 35
 
 set g_vehicle_raptor_speed_forward 1000
-set g_vehicle_raptor_speed_strafe 750
-set g_vehicle_raptor_speed_up 600
-set g_vehicle_raptor_speed_down 900
-set g_vehicle_raptor_friction 0.7
+set g_vehicle_raptor_speed_strafe  750
+set g_vehicle_raptor_speed_up      600
+set g_vehicle_raptor_speed_down    900
+set g_vehicle_raptor_friction      0.8
 
 set g_vehicle_raptor_bomblets           10
 set g_vehicle_raptor_bomblet_alt        750
@@ -41,12 +41,12 @@ set g_vehicle_raptor_cannon_predicttarget       1
 set g_vehicle_raptor_cannon_cost     1
 set g_vehicle_raptor_cannon_damage   25
 set g_vehicle_raptor_cannon_radius   60
-set g_vehicle_raptor_cannon_refire   0.1
+set g_vehicle_raptor_cannon_refire   0.05
 set g_vehicle_raptor_cannon_speed    12000
 set g_vehicle_raptor_cannon_spread   0.01
 
-set g_vehicle_raptor_energy             40
-set g_vehicle_raptor_energy_regen       20
+set g_vehicle_raptor_energy             20
+set g_vehicle_raptor_energy_regen       10
 set g_vehicle_raptor_energy_regen_pause 0.75
 
 set g_vehicle_raptor_health             200