Merge remote branch 'origin/master' into tzork/turrets-csqc

Conflicts:
	qcsrc/client/Main.qc
	qcsrc/client/damage.qc
	qcsrc/qc-client.cbp

diff --cc qcsrc/client/Main.qc
index c15d9c5a237d04345feaed9f155ce380d170e350,4e54f811c91ef963d7e3351d5d475510441d58b9..fb9a1bb74db3e4725911dacbbd8d50327579b1fb
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -139,7 -139,8 +139,9 @@@ void CSQC_Init(void
        GibSplash_Precache();
        Casings_Precache();
        DamageInfo_Precache();
+       Vehicles_Precache();
 +      turrets_precache();
+ 
        if(autocvar_cl_announcer != cl_announcer_prev) {
                Announcer_Precache();
                if(cl_announcer_prev)
@@@ -985,7 -986,7 +987,8 @@@ void(float bIsNewEntity) CSQC_Ent_Updat
                case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
                case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
                case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
+               case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
 +              case ENT_CLIENT_TURRET: ent_turret(); break; 
                default:
                        //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
                        error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));

diff --cc qcsrc/client/damage.qc
index 7c750db748a6af063584789d734bd2cb4c4511a0,cd338553adaec3830f4fb2489bc3524674339f10..6ff989e4a6ed598d55e0da35ad71d535f33bfa2d
--- 1/qcsrc/client/damage.qc
--- 2/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@@ -70,72 -70,78 +70,145 @@@ void Ent_DamageInfo(float isNew
  
        self = oldself;
        
+       if(DEATH_ISVEHICLE(w_deathtype))
+       {
+           traceline(w_org - normalize(force) * 16, w_org + normalize(force) * 16, MOVE_NOMONSTERS, world);
+           if(trace_plane_normal != '0 0 0')       
+             w_backoff = trace_plane_normal;
+         else
+             w_backoff = -1 * normalize(w_org - (w_org + normalize(force) * 16));
+           
+           setorigin(self, w_org + w_backoff * 2); // for sound() calls
+           
+           switch(w_deathtype)
+           {            
+             case DEATH_VHCRUSH:
+                 break;
+                 
+             case DEATH_SBMINIGUN:
+                 string _snd;
+                 _snd = strcat("weapons/ric", ftos(1 + rint(random() * 2)), ".waw");
+                 sound(self, CHAN_PROJECTILE, _snd, VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("spiderbot_minigun_impact"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_SBROCKET:
+                 sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("spiderbot_rocket_explode"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_SBBLOWUP:
+                 sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_MIN);
+                 pointparticles(particleeffectnum("explosion_big"), self.origin, w_backoff * 1000, 1);
+                 break;
+                 
+             case DEATH_WAKIGUN:
+                 sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("wakizashi_gun_impact"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_WAKIROCKET:
+                 sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("wakizashi_rocket_explode"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_WAKIBLOWUP:
+                 sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_MIN);
+                 pointparticles(particleeffectnum("explosion_big"), self.origin, w_backoff * 1000, 1);
+                 break;
+                 
+             case DEATH_RAPTOR_CANNON:
+                 sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("raptor_cannon_impact"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_RAPTOR_BOMB_SPLIT:
+                 float i;
+                 vector ang, vel;
+                 for(i = 1; i < 4; ++i)
+                 {
+                     vel = normalize(w_org - (w_org + normalize(force) * 16)) + randomvec() * 128;
+                     ang = vectoangles(vel);
+                     RaptorCBShellfragToss(w_org, vel, ang + '0 0 1' * (120 * i));
+                 }
+                     
+                 
+                 sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("raptor_bomb_spread"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_RAPTOR_BOMB:
+                 sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+                 pointparticles(particleeffectnum("raptor_bomb_impact"), self.origin, w_backoff * 1000, 1);
+                 break;
+             case DEATH_RAPTOR_DEATH:
+                 sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_MIN);
+                 pointparticles(particleeffectnum("explosion_big"), self.origin, w_backoff * 1000, 1);
+                 break;
+           }
+       }
+       
++      
 +      if(DEATH_ISTURRET(w_deathtype))
 +      {           
 +          traceline(w_org - normalize(force) * 16, w_org + normalize(force) * 16, MOVE_NOMONSTERS, world);
 +          if(trace_plane_normal != '0 0 0')       
 +            w_backoff = trace_plane_normal;
 +        else
 +            w_backoff = -1 * normalize(w_org - (w_org + normalize(force) * 16));
 +          
 +          setorigin(self, w_org + w_backoff * 2); // for sound() calls
 +          
 +          switch(w_deathtype)
 +          {   
 +             case DEATH_TURRET_EWHEEL:
 +                sound(self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_MIN);
 +                pointparticles(particleeffectnum("electro_impact"), self.origin, w_backoff * 1000, 1);
 +                break;
 +             
 +             case DEATH_TURRET_FLAC:
 +                vector org2;
 +                org2 = w_org + w_backoff * 6;
 +                pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1);
 +                if (w_random<0.15)
 +                    sound(self, CHAN_PROJECTILE, "weapons/hagexp1.wav", VOL_BASE, ATTN_NORM);
 +                else if (w_random<0.7)
 +                    sound(self, CHAN_PROJECTILE, "weapons/hagexp2.wav", VOL_BASE, ATTN_NORM);
 +                else
 +                    sound(self, CHAN_PROJECTILE, "weapons/hagexp3.wav", VOL_BASE, ATTN_NORM);
 +                
 +                break;
 +                
 +             case DEATH_TURRET_MLRS:
 +             case DEATH_TURRET_HK:
 +             case DEATH_TURRET_WALKER_ROCKET:
 +             case DEATH_TURRET_HELLION:
 +                sound(self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_MIN);
 +                pointparticles(particleeffectnum("rocket_explode"), self.origin, w_backoff * 1000, 1);
 +                break;
 +             
 +             case DEATH_TURRET_MACHINEGUN:
 +             case DEATH_TURRET_WALKER_GUN:
 +                string _snd;
 +                _snd = strcat("weapons/ric", ftos(1 + rint(random() * 2)), ".waw");
 +                sound(self, CHAN_PROJECTILE, _snd, VOL_BASE, ATTN_NORM);
 +                pointparticles(particleeffectnum("machinegun_impact"), self.origin, w_backoff * 1000, 1);
 +                break;
 +                          
 +             case DEATH_TURRET_PLASMA:
 +                sound(self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_MIN);
 +                pointparticles(particleeffectnum("electro_impact"), self.origin, w_backoff * 1000, 1);
 +                break;
 +                          
 +             case DEATH_TURRET_WALKER_MEELE:
 +                sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_MIN);
 +                pointparticles(particleeffectnum("TE_SPARK"), self.origin, w_backoff * 1000, 1);
 +                break;
 +
 +             case DEATH_TURRET_PHASER:
 +                break;
 +                
 +             case DEATH_TURRET_TESLA:
 +                te_smallflash(self.origin);
 +                break;
 +
 +        }        
 +      }
 +      
        // TODO spawn particle effects and sounds based on w_deathtype
        if(!DEATH_ISSPECIAL(w_deathtype))
        {

diff --cc qcsrc/client/progs.src
index 09c3bd1af5bb0735a6c455e639ac93e4c235b99e,3fc65a6722e174bf25835479a4fc13797440f6a0..0d024a9411fc4306280c5b54c22a3d89a7669f59
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -30,10 -30,9 +30,11 @@@ prandom.q
  bgmscript.qh
  noise.qh
  teamplay.qh
 -
 +tturrets.qh
 +../server/tturrets/include/turrets_early.qh
 +../server/movelib.qc
  main.qh
+ vehicles/vehicles.qh
  
  sortlist.qc
  miscfunctions.qc

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/qc-client.cbp
index 5ca67b7c3308240b3b1e70298a62a5479eb17b05,a30c4c4f904eab2654561194baf086a99a6a71df..63e00e9e1774ea707be6c07f377eebdecc922765
--- 1/qcsrc/qc-client.cbp
--- 2/qcsrc/qc-client.cbp
+++ b/qcsrc/qc-client.cbp
@@@ -11,7 -11,7 +11,11 @@@
                        <Build command="$make -src $makefile" />
                        <CompileFile command="$make -src $makefile" />
                        <Clean command="$make -src $makefile" />
++<<<<<<< HEAD
 +                      <DistClean command="$make -f $makefile distclean$target" />
++=======
+                       <DistClean command="" />
++>>>>>>> origin/master
                        <AskRebuildNeeded command="" />
                        <SilentBuild command="$make -src $makefile" />
                </MakeCommands>
@@@ -45,12 -45,12 +49,21 @@@
                                        <Add option="-s" />
                                </Linker>
                                <MakeCommands>
++<<<<<<< HEAD
 +                                      <Build command="$make -src $makefile" />
 +                                      <CompileFile command="$make -src $makefile" />
 +                                      <Clean command="$make -src $makefile" />
 +                                      <DistClean command="" />
 +                                      <AskRebuildNeeded command="" />
 +                                      <SilentBuild command="$make -src $makefile" />
++=======
+                                       <Build command="$make -DRELEASE -src $makefile" />
+                                       <CompileFile command="$make -DRELEASE -src $makefile" />
+                                       <Clean command="$make -DRELEASE -src $makefile" />
+                                       <DistClean command="" />
+                                       <AskRebuildNeeded command="" />
+                                       <SilentBuild command="$make -DRELEASE -src $makefile" />
++>>>>>>> origin/master
                                </MakeCommands>
                        </Target>
                </Build>
@@@ -90,24 -85,15 +103,29 @@@
                <Unit filename="client\prandom.qh" />
                <Unit filename="client\pre.qh" />
                <Unit filename="client\progs.src" />
 +              <Unit filename="client\progs.src.BASE.src" />
 +              <Unit filename="client\progs.src.LOCAL.src" />
 +              <Unit filename="client\progs.src.REMOTE.src" />
                <Unit filename="client\projectile.qc" />
                <Unit filename="client\rubble.qc" />
++<<<<<<< HEAD
 +              <Unit filename="client\scoreboard.qc" />
 +              <Unit filename="client\scoreboard.qh" />
 +              <Unit filename="client\shownames.qc" />
 +              <Unit filename="client\shownames.qh" />
++=======
++>>>>>>> origin/master
                <Unit filename="client\sortlist.qc" />
 +              <Unit filename="client\target_music.qc" />
                <Unit filename="client\teamplay.qc" />
 +              <Unit filename="client\teamplay.qh" />
                <Unit filename="client\teamradar.qc" />
                <Unit filename="client\teamradar.qh" />
 +              <Unit filename="client\tturrets.qc" />
 +              <Unit filename="client\tturrets.qh" />
                <Unit filename="client\tuba.qc" />
+               <Unit filename="client\vehicles\vehicles.qc" />
+               <Unit filename="client\vehicles\vehicles.qh" />
                <Unit filename="client\wall.qc" />
                <Unit filename="client\waypointsprites.qc" />
                <Unit filename="client\waypointsprites.qh" />

diff --cc qcsrc/server/autocvars.qh
index 606de1c3b16dd0e8addd7d42265f7f9a518ca014,2a31300ccaa3c62801913d05a91eb868fa1683f2..f7075b9b24ecbf5ca515150ed7c9f0ab01263447
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1009,74 -1009,7 +1009,12 @@@ float autocvar_g_turrets_unit_walker_st
  float autocvar_g_turrets_unit_walker_std_rocket_turnrate;
  float autocvar_g_turrets_unit_walker_std_rockets_range;
  float autocvar_g_turrets_unit_walker_std_rockets_range_min;
 +float autocvar_g_turrets_unit_walker_turn;
 +float autocvar_g_turrets_unit_walker_turn_walk;
 +float autocvar_g_turrets_unit_walker_turn_run;
 +float autocvar_g_turrets_unit_walker_turn_strafe;
 +float autocvar_g_turrets_unit_walker_turn_swim;
  float autocvar_g_use_ammunition;
- float autocvar_g_vehicle_racer_afterburn_cost;
- float autocvar_g_vehicle_racer_anglestabilizer;
- float autocvar_g_vehicle_racer_downforce;
- float autocvar_g_vehicle_racer_energy;
- float autocvar_g_vehicle_racer_energy_usepause;
- float autocvar_g_vehicle_racer_health;
- float autocvar_g_vehicle_racer_laser_cost;
- float autocvar_g_vehicle_racer_laser_damage;
- float autocvar_g_vehicle_racer_laser_radius;
- float autocvar_g_vehicle_racer_laser_refire;
- float autocvar_g_vehicle_racer_laser_speed;
- float autocvar_g_vehicle_racer_pitchspeed;
- float autocvar_g_vehicle_racer_power_air;
- float autocvar_g_vehicle_racer_power_min;
- float autocvar_g_vehicle_racer_power_solid;
- float autocvar_g_vehicle_racer_reload;
- float autocvar_g_vehicle_racer_respawntime;
- float autocvar_g_vehicle_racer_rocket_accel;
- float autocvar_g_vehicle_racer_rocket_damage;
- float autocvar_g_vehicle_racer_rocket_radius;
- float autocvar_g_vehicle_racer_rocket_refire;
- float autocvar_g_vehicle_racer_rocket_speed;
- float autocvar_g_vehicle_racer_rocket_turnrate;
- float autocvar_g_vehicle_racer_shield;
- float autocvar_g_vehicle_racer_speed_afterburn;
- float autocvar_g_vehicle_racer_speed_forward;
- float autocvar_g_vehicle_racer_speed_strafe;
- float autocvar_g_vehicle_racer_springlength;
- float autocvar_g_vehicle_racer_turnroll;
- float autocvar_g_vehicle_racer_turnspeed;
- float autocvar_g_vehicle_raptor_reload;
- float autocvar_g_vehicle_spiderbot_crush_dmg;
- float autocvar_g_vehicle_spiderbot_crush_force;
- float autocvar_g_vehicle_spiderbot_head_pitchlimit_down;
- float autocvar_g_vehicle_spiderbot_head_pitchlimit_up;
- float autocvar_g_vehicle_spiderbot_head_pitchspeed;
- float autocvar_g_vehicle_spiderbot_head_turnlimit;
- float autocvar_g_vehicle_spiderbot_head_turnspeed;
- float autocvar_g_vehicle_spiderbot_health;
- float autocvar_g_vehicle_spiderbot_minigun_cooldown;
- float autocvar_g_vehicle_spiderbot_minigun_damage;
- float autocvar_g_vehicle_spiderbot_minigun_heat;
- float autocvar_g_vehicle_spiderbot_minigun_refire;
- float autocvar_g_vehicle_spiderbot_minigun_spread;
- float autocvar_g_vehicle_spiderbot_movement_inertia;
- float autocvar_g_vehicle_spiderbot_respawntime;
- float autocvar_g_vehicle_spiderbot_rocket_damage;
- float autocvar_g_vehicle_spiderbot_rocket_edgedamage;
- float autocvar_g_vehicle_spiderbot_rocket_force;
- float autocvar_g_vehicle_spiderbot_rocket_health;
- float autocvar_g_vehicle_spiderbot_rocket_lifetime;
- float autocvar_g_vehicle_spiderbot_rocket_noise;
- float autocvar_g_vehicle_spiderbot_rocket_radius;
- float autocvar_g_vehicle_spiderbot_rocket_refire;
- float autocvar_g_vehicle_spiderbot_rocket_reload;
- float autocvar_g_vehicle_spiderbot_rocket_speed;
- float autocvar_g_vehicle_spiderbot_rocket_turnrate;
- float autocvar_g_vehicle_spiderbot_shield;
- float autocvar_g_vehicle_spiderbot_speed_stop;
- float autocvar_g_vehicle_spiderbot_speed_strafe;
- float autocvar_g_vehicle_spiderbot_speed_walk;
- float autocvar_g_vehicle_spiderbot_turnspeed;
  float autocvar_g_waypointeditor;
  float autocvar_g_waypoints_for_items;
  float autocvar_g_waypointsprite_deadlifetime;

diff --cc qcsrc/server/movelib.qc
Simple merge