From: terencehill <piuntn@gmail.com>
Date: Sat, 4 Jan 2014 18:48:00 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/vehicles_fixes
X-Git-Tag: xonotic-v0.8.0~243^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f0e69c6625fc4db17559e2e47f2fdaed8298076;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/vehicles_fixes

Conflicts:
	qcsrc/server/vehicles/bumblebee.qc
	qcsrc/server/vehicles/raptor.qc
	qcsrc/server/vehicles/spiderbot.qc
---

0f0e69c6625fc4db17559e2e47f2fdaed8298076
diff --cc qcsrc/server/cl_impulse.qc
index 253544496,a4376bd41..28d794c6d
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@@ -52,13 -52,13 +52,13 @@@ void ImpulseCommands (void
  
  	if (timeout_status == TIMEOUT_ACTIVE) //don't allow any impulses while the game is paused
  		return;
-     
+ 
      if(self.vehicle)
          if(self.vehicle.deadflag == DEAD_NO)
 -            if(self.vehicle.vehicles_impusle)
 -                if(self.vehicle.vehicles_impusle(imp))
 +            if(self.vehicle.vehicles_impulse)
 +                if(self.vehicle.vehicles_impulse(imp))
                      return;
-     
+ 
  	if(CheatImpulse(imp))
  	{
  	}
diff --cc qcsrc/server/vehicles/raptor.qc
index c9096a818,58a640e9c..a6ef52649
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@@ -805,9 -797,9 +805,9 @@@ void raptor_spawn(float _f
  
          //FIXME: Camera is in a bad place in HUD model.
          //setorigin(self.vehicle_viewport, '25 0 5');
-         
+ 
 -        self.vehicles_impusle   = raptor_impulse;
 +        self.vehicles_impulse   = raptor_impulse;
-         
+ 
          self.frame = 0;
  
          self.bomb1 = spawn();
diff --cc qcsrc/server/vehicles/spiderbot.qc
index 3d1aa3d83,a73997fda..1085a904e
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@@ -797,10 -783,10 +792,10 @@@ float spiderbot_impulse(float _imp
  void spiderbot_spawn(float _f)
  {
      if(!self.gun1)
-     {        
+     {
 -        self.vehicles_impusle   = spiderbot_impulse;
 +        self.vehicles_impulse   = spiderbot_impulse;
          self.gun1               = spawn();
-         self.gun2               = spawn();    
+         self.gun2               = spawn();
          setmodel(self.gun1, "models/vehicles/spiderbot_barrels.dpm");
          setmodel(self.gun2, "models/vehicles/spiderbot_barrels.dpm");
          setattachment(self.gun1, self.tur_head, "tag_hardpoint01");
diff --cc qcsrc/server/vehicles/vehicles.qc
index aa72658b5,1e5537a25..b9740b5d8
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@@ -683,10 -658,10 +683,10 @@@ void vehicles_enter(
          }
      }
  
 -    vehicles_clearrturn();
 +    vehicles_clearreturn();
  
      CSQCVehicleSetup(self.owner, self.hud);
-     
+ 
      vh_player = other;
      vh_vehicle = self;
      MUTATOR_CALLHOOK(VehicleEnter);