From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 12 Jun 2011 17:09:49 +0000 (+0200)
Subject: Attach flagcarries flag to vehicle, scale up and position flag when carried by vehicle
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~20
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e578287a40760a4fb6fddc674a9a5701e90f4dc1;p=xonotic%2Fxonotic-data.pk3dir.git

Attach flagcarries flag to vehicle, scale up and position flag when carried by vehicle
---

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 2e705d212..f62925f29 100644
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -487,6 +487,9 @@ void racer_enter()
     self.movetype = MOVETYPE_BOUNCE;
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health);
     self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield);
+    
+    if(self.owner.flagcarried)
+       setorigin(self.owner.flagcarried, '-190 0 96');
 }
 
 void racer_exit(float eject)
diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 65ac2c977..e51174b79 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -197,6 +197,9 @@ void raptor_enter()
     self.delay = time + autocvar_g_vehicle_raptor_bombs_refire;
     self.lip   = time;
 
+    if(self.owner.flagcarried)
+       setorigin(self.owner.flagcarried, '-20 0 96');
+
 }
 
 void raptor_land()
diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 966001e2d..1c33e53f3 100644
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -423,6 +423,14 @@ void spiderbot_enter()
 
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_spiderbot_health);
     self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_spiderbot_shield);
+
+    if(self.owner.flagcarried)
+    {
+        setattachment(self.owner.flagcarried, self.tur_head, ""); 
+        setorigin(self.owner.flagcarried, '-20 0 120'); 
+    }
+       
+
 }
 
 void spiderbot_exit(float eject)
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 1a2079b9c..8a5e3f81b 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -497,7 +497,14 @@ void vehicles_enter()
     vehicles_clearrturn();
 
     CSQCVehicleSetup(self.owner, self.hud);
-
+    
+    if(other.flagcarried)
+    {
+        other.flagcarried.scale = 1;
+        setattachment(other.flagcarried, self, ""); 
+        setorigin(other, '0 0 96');
+    }
+    
     self.vehicle_enter();
 }
 
@@ -508,7 +515,7 @@ void vehicles_enter()
 **/
 vector vehicles_findgoodexit(vector prefer_spot)
 {
-    vector exitspot;
+    //vector exitspot;
     float mysize;
     
     tracebox(self.origin + '0 0 32', PL_MIN, PL_MAX, prefer_spot, MOVE_NORMAL, self.owner);
@@ -601,6 +608,13 @@ void vehicles_exit(float eject)
     if(!teamplay)
         self.team = 0;
 
+    if(self.owner.flagcarried)
+    {
+        self.owner.flagcarried.scale = 0.6;
+        setattachment(self.owner.flagcarried, self.owner, ""); 
+        setorigin(self.owner.flagcarried, FLAG_CARRY_POS);
+    }
+    
     self.vehicle_exit(eject);
     self.owner = world;
 }