Merge branch 'master' into Mario/vehicles

Conflicts:
	qcsrc/client/damage.qc
	qcsrc/client/main.qc
	qcsrc/client/progs.src
	qcsrc/client/vehicles/all.qc
	qcsrc/client/vehicles/all.qh
	qcsrc/common/monsters/sv_monsters.qc
	qcsrc/common/vehicles/sv_vehicles.qh
	qcsrc/server/antilag.qc
	qcsrc/server/command/cmd.qc
	qcsrc/server/g_damage.qc
	qcsrc/server/g_damage.qh
	qcsrc/server/g_hook.qc
	qcsrc/server/g_world.qc
	qcsrc/server/mutators/mutators_include.qc
	qcsrc/server/progs.src
	qcsrc/server/sv_main.qc
	qcsrc/server/t_halflife.qc
	qcsrc/server/t_teleporters.qc
	qcsrc/server/vehicles/bumblebee.qc
	qcsrc/server/vehicles/bumblebee.qh
	qcsrc/server/vehicles/racer.qc
	qcsrc/server/vehicles/raptor.qc
	qcsrc/server/vehicles/spiderbot.qc
	qcsrc/server/vehicles/vehicle.qc

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/damage.qc
index bed41a1ca3ef2076cf0c61211432ebf19910b8fb,39c422e1cca700cabe13953c50af3c7234bcbc40..cae0f154b99e565c2c58d053dd0968df84acbcee
--- 1/qcsrc/client/damage.qc
--- 2/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@@ -1,18 -1,23 +1,23 @@@
- #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/constants.qh"
-       #include "../common/util.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "autocvars.qh"
-       #include "../common/deathtypes.qh"
-       #include "damage.qh"
-       #include "movetypes.qh"
-       #include "prandom.qh"
-       #include "../common/vehicles/cl_vehicles.qh"
- #elif defined(MENUQC)
- #elif defined(SVQC)
- #endif
+ #include "damage.qh"
+ #include "_all.qh"
+ 
+ #include "gibs.qh"
+ #include "movetypes.qh"
+ #include "prandom.qh"
+ 
 -#include "vehicles/all.qh"
++#include "../common/vehicles/cl_vehicles.qh"
+ 
+ #include "../common/constants.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/util.qh"
+ 
+ #include "../common/weapons/all.qh"
+ 
+ .entity tag_entity;
+ 
+ .float cnt;
+ .int state;
+ .bool isplayermodel;
  
  void DamageEffect_Think()
  {

diff --cc qcsrc/client/main.qc
index e0d8052a87fd6f9950c99e5f60dbadf4b9d4b679,7648b129775afa875f38ff5e16de5339c62c3a80..f061dfed3b4ff161f6dfc1febc3d224088c81602
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -9,13 -24,27 +24,28 @@@
  #include "wall.qh"
  #include "waypointsprites.qh"
  
 -#include "vehicles/bumblebee.qh"
 -#include "vehicles/all.qh"
 +#include "../common/vehicles/unit/bumblebee.qh"
 +#include "../common/vehicles/cl_vehicles.qh"
 +#include "../common/vehicles/vehicles.qh"
  
+ #include "weapons/projectile.qh"
+ 
+ #include "../common/buffs.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/mapinfo.qh"
+ #include "../common/monsters/all.qh"
+ #include "../common/nades.qh"
  #include "../common/net_notice.qh"
+ #include "../common/notifications.qh"
+ #include "../common/stats.qh"
+ #include "../common/teams.qh"
+ 
+ #include "../common/items/all.qh"
+ 
+ #include "../common/weapons/all.qh"
  
- #include "../common/monsters/monsters.qh"
+ #include "../csqcmodellib/cl_model.qh"
+ #include "../csqcmodellib/interpolate.qh"
  
  #include "../warpzonelib/client.qh"
  
@@@ -108,8 -137,8 +138,9 @@@ void CSQC_Init(void
  
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 +      CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
        CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+       CALL_ACCUMULATED_FUNCTION(RegisterItems);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);

diff --cc qcsrc/client/progs.src
index 7be926506266336e5bbbd661054a5ff3a97f4534,8ba12b9e71d957c7260fcbd09dbf80b562c9b4ee..3467a0f481c5351210cdbdf62a45c016111ec237
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -35,8 -37,11 +37,8 @@@ view.q
  wall.qc
  waypointsprites.qc
  
- command/cl_cmd.qc
+ command/all.qc
  
 -vehicles/bumblebee.qc
 -vehicles/all.qc
 -
  weapons/projectile.qc // TODO
  
  ../common/animdecide.qc
@@@ -62,10 -65,6 +62,8 @@@
  ../csqcmodellib/cl_player.qc
  ../csqcmodellib/interpolate.qc
  
- ../server/movelib.qc
- ../server/t_items.qc
 +../common/vehicles/vehicles_include.qc
 +
  ../warpzonelib/anglestransform.qc
  ../warpzonelib/client.qc
  ../warpzonelib/common.qc

diff --cc qcsrc/client/tturrets.qc
Simple merge

diff --cc qcsrc/client/view.qc
index 6eac9dac52370d7f8d89b0a9105cf7cd75d6693a,d3bcf92447bc928f8c26680f18a230cd60915eb9..25f97727b2d5a90ec37b95c9706fe26b6567285f
--- 1/qcsrc/client/view.qc
--- 2/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@@ -1,25 -1,31 +1,32 @@@
- #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "autocvars.qh"
-       #include "hud.qh"
-       #include "scoreboard.qh"
-       #include "noise.qh"
-       #include "main.qh"
-       #include "../csqcmodellib/cl_player.qh"
- #elif defined(MENUQC)
- #elif defined(SVQC)
- #endif
+ #include "_all.qh"
+ 
+ #include "announcer.qh"
+ #include "hook.qh"
+ #include "hud.qh"
+ #include "hud_config.qh"
+ #include "mapvoting.qh"
+ #include "noise.qh"
+ #include "scoreboard.qh"
+ #include "shownames.qh"
+ #include "target_music.qh"
 -#include "vehicles/all.qh"
+ #include "waypointsprites.qh"
+ 
+ #include "../common/constants.qh"
+ #include "../common/mapinfo.qh"
+ #include "../common/nades.qh"
+ #include "../common/stats.qh"
+ #include "../common/teams.qh"
+ #include "../common/util.qh"
+ 
+ #include "../common/weapons/all.qh"
+ 
++#include "../common/vehicles/cl_vehicles.qh"
++
+ #include "../csqcmodellib/cl_player.qh"
+ 
+ #include "../warpzonelib/client.qh"
+ #include "../warpzonelib/common.qh"
+ #include "../warpzonelib/mathlib.qh"
  
  entity porto;
  vector polyline[16];

diff --cc qcsrc/client/waypointsprites.qc
Simple merge

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

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

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

diff --cc qcsrc/common/vehicles/sv_vehicles.qh
index 36b4f5f3e970431cda92d07acf5068382bcadc1b,0000000000000000000000000000000000000000..27df7fac69f26aa190e31da16d396b41d684fea4
mode 100644,000000..100644
--- 1/qcsrc/common/vehicles/sv_vehicles.qh
--- /dev/null
+++ b/qcsrc/common/vehicles/sv_vehicles.qh
@@@ -1,114 -1,0 +1,108 @@@
- #ifdef VEHICLES_USE_ODE
- void(entity e, float physics_enabled) physics_enable = #540; // enable or disable physics on object
- void(entity e, vector force, vector force_pos) physics_addforce = #541; // apply a force from certain origin, length of force vector is power of force
- void(entity e, vector torque) physics_addtorque = #542; // add relative torque
- #endif  // VEHICLES_USE_ODE
- 
 +#ifndef VEHICLES_DEF_H
 +#define VEHICLES_DEF_H
 +#ifdef SVQC
 +
 +#include "../server/tturrets/include/turrets_early.qh"
 +#include "sv_vehicles.qh"
 +
 +// #define VEHICLES_USE_ODE
 +
 +// vehicle cvars
 +float autocvar_g_vehicles;
 +float autocvar_g_vehicles_enter;
 +float autocvar_g_vehicles_enter_radius;
 +float autocvar_g_vehicles_steal;
 +float autocvar_g_vehicles_steal_show_waypoint;
 +float autocvar_g_vehicles_crush_dmg;
 +float autocvar_g_vehicles_crush_force;
 +float autocvar_g_vehicles_delayspawn;
 +float autocvar_g_vehicles_delayspawn_jitter;
 +float autocvar_g_vehicles_allow_bots;
 +float autocvar_g_vehicles_teams;
 +float autocvar_g_vehicles_teleportable;
 +float autocvar_g_vehicles_vortex_damagerate = 0.5;
 +float autocvar_g_vehicles_machinegun_damagerate = 0.5;
 +float autocvar_g_vehicles_rifle_damagerate = 0.75;
 +float autocvar_g_vehicles_vaporizer_damagerate = 0.001;
 +float autocvar_g_vehicles_tag_damagerate = 5;
 +float autocvar_g_vehicles_weapon_damagerate = 1;
 +
 +// flags:
 +.int vehicle_flags;
 +
 +// vehicle definitions
 +.entity gun1;
 +.entity gun2;
 +.entity gun3;
 +.entity vehicle_shieldent;  /// Entity to disply the shild effect on damage
 +.entity vehicle;
 +.entity vehicle_viewport;
 +.entity vehicle_hudmodel;
 +.entity vehicle_controller;
 +
 +.entity gunner1;
 +.entity gunner2;
 +
 +.float vehicle_health;      /// If self is player this is 0..100 indicating precentage of health left on vehicle. If self is vehile, this is the real health value.
 +.float vehicle_energy;      /// If self is player this is 0..100 indicating precentage of energy left on vehicle. If self is vehile, this is the real energy value.
 +.float vehicle_shield;      /// If self is player this is 0..100 indicating precentage of shield left on vehicle. If self is vehile, this is the real shield value.
 +
 +.float vehicle_ammo1;   /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real ammo1 value.
 +.float vehicle_reload1; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real reload1 value.
 +.float vehicle_ammo2;   /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real ammo2 value.
 +.float vehicle_reload2; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real reload2 value.
 +
 +.float sound_nexttime;
 +const float VOL_VEHICLEENGINE = 1;
 +
 +const float SVC_SETVIEWPORT   = 5;   // Net.Protocol 0x05
 +const float SVC_SETVIEWANGLES = 10;  // Net.Protocol 0x0A
 +const float SVC_UPDATEENTITY  = 128; // Net.Protocol 0x80
 +
 +const float VHSF_NORMAL = 0;
 +const float VHSF_FACTORY = 2;
 +
 +.int hud;
 +.float dmg_time;
 +
 +.int volly_counter;
 +
 +const int MAX_AXH = 4;
 +.entity AuxiliaryXhair[MAX_AXH];
 +
 +.entity wps_intruder;
 +
 +.entity lock_target;
 +.float  lock_strength;
 +.float  lock_time;
 +.float  lock_soundtime;
 +const float   DAMAGE_TARGETDRONE = 10;
 +
 +// vehicle functions
 +.void(int _spawnflag) vehicle_spawn;  /// Vehicles custom fucntion to be efecuted when vehicle (re)spawns
 +.bool(int _imp) vehicles_impulse;
 +.int vehicle_weapon2mode;
 +.void(int exit_flags) vehicle_exit;
 +.bool() vehicle_enter;
 +const int VHEF_NORMAL = 0;  /// User pressed exit key
 +const int VHEF_EJECT  = 1;  /// User pressed exit key 3 times fast (not implemented) or vehile is dying
 +const int VHEF_RELEASE = 2;  /// Release ownership, client possibly allready dissconnected / went spec / changed team / used "kill" (not implemented)
 +
 +float  force_fromtag_power;
 +float  force_fromtag_normpower;
 +vector force_fromtag_origin;
 +
 +float vehicles_exit_running;
 +
 +// macros
 +#define VEHICLE_UPDATE_PLAYER(ply,fld,vhname) \
 +      ply.vehicle_##fld = (self.vehicle_##fld / autocvar_g_vehicle_##vhname##_##fld) * 100
 +
 +.float vehicle_enter_delay; // prevent players jumping to and from vehicles instantly
 +
 +void vehicles_exit(float eject);
 +float vehicle_initialize(float vehicle_id, float nodrop);
 +
 +#endif
 +
 +#endif

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

diff --cc qcsrc/server/cl_client.qc
index ec9fd19b0e4130994a4f8f5e4892b410a873c32c,b73eebbf4a021b95d270a97fb81ae62586d44287..71349c924765fa29d621928ebad90da74913530c
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -14,6 -28,8 +28,8 @@@
  #include "bot/bot.qh"
  #include "bot/navigation.qh"
  
 -#include "vehicles/vehicle.qh"
++#include "../common/vehicles/sv_vehicles.qh"
+ 
  #include "weapons/hitplot.qh"
  #include "weapons/weaponsystem.qh"
  

diff --cc qcsrc/server/cl_impulse.qc
index f0e4d1173838558a80a78050d33a9e4e97b88478,bb4c171c87272a7ce10cba28b78a3654b17e01fc..03fdf7ede799071fd4f60438f2794f1a07788b8c
--- 1/qcsrc/server/cl_impulse.qc
--- 2/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@@ -3,8 -4,16 +4,16 @@@
  #include "bot/waypoints.qh"
  
  #include "weapons/throwing.qh"
 -#include "vehicles/vehicle.qh"
+ #include "command/common.qh"
+ #include "cheats.qh"
+ #include "bot/navigation.qh"
+ #include "weapons/selection.qh"
+ #include "weapons/tracing.qh"
+ #include "weapons/weaponsystem.qh"
++#include "../common/vehicles/sv_vehicles.qh"
+ #include "waypointsprites.qh"
  
- #include "../common/weapons/weapons.qh"
+ #include "../common/weapons/all.qh"
  
  /*
   * Impulse map:

diff --cc qcsrc/server/command/cmd.qc
index e9c3af16af4d83af980e1112c8a157481602f710,beb04103628d7e52e3a0b5890e7d5fb9772fb6cb..924e61e090b73aa40229a7080ed32ab3c41d5290
--- 1/qcsrc/server/command/cmd.qc
--- 2/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@@ -1,32 -1,40 +1,40 @@@
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-       #include "../../dpdefs/progsdefs.qh"
-     #include "../../dpdefs/dpextensions.qh"
-     #include "../../warpzonelib/common.qh"
-     #include "../../common/constants.qh"
-     #include "../../common/teams.qh"
-     #include "../../common/util.qh"
-     #include "../../common/command/shared_defs.qh"
-     #include "../../common/monsters/monsters.qh"
-     #include "../../common/monsters/sv_monsters.qh"
-     #include "../../common/monsters/spawn.qh"
-     #include "../autocvars.qh"
-     #include "../defs.qh"
-     #include "../../common/notifications.qh"
-     #include "../../common/deathtypes.qh"
-     #include "../mutators/mutators_include.qh"
-     #include "../../common/vehicles/sv_vehicles.qh"
-     #include "../campaign.qh"
-     #include "../../common/mapinfo.qh"
-     #include "common.qh"
-     #include "vote.qh"
-     #include "cmd.qh"
-     #include "../cheats.qh"
-     #include "../scores.qh"
-     #include "../ipban.qh"
+ #include "../../common/command/command.qh"
+ #include "cmd.qh"
+ #include "../_all.qh"
+ 
+ #include "common.qh"
+ #include "vote.qh"
+ 
+ #include "../campaign.qh"
+ #include "../cheats.qh"
+ #include "../cl_player.qh"
+ #include "../g_triggers.qh"
+ #include "../ipban.qh"
+ #include "../mapvoting.qh"
+ #include "../scores.qh"
+ #include "../teamplay.qh"
+ 
+ #include "../mutators/mutators_include.qh"
+ 
+ #ifdef SVQC
 -      #include "../vehicles/vehicle.qh"
++      #include "../../common/vehicles/sv_vehicles.qh"
  #endif
  
+ #include "../../common/constants.qh"
+ #include "../../common/deathtypes.qh"
+ #include "../../common/mapinfo.qh"
+ #include "../../common/notifications.qh"
+ #include "../../common/teams.qh"
+ #include "../../common/util.qh"
+ 
+ #include "../../common/monsters/all.qh"
+ #include "../../common/monsters/spawn.qh"
+ #include "../../common/monsters/sv_monsters.qh"
+ 
+ #include "../../warpzonelib/common.qh"
+ 
+ void ClientKill_TeamChange (float targetteam); // 0 = don't change, -1 = auto, -2 = spec
+ 
  // =========================================================
  //  Server side networked commands code, reworked by Samual
  //  Last updated: December 28th, 2011

diff --cc qcsrc/server/g_damage.qc
index 913f3dd23d4c206a5da3d15983728298b75aa45d,24bce642d8c7509785f328464225ec793e34daa0..585a97e6bb3fb50aebf987f9773941b16fcdb367
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -1,33 -1,28 +1,28 @@@
  #include "g_damage.qh"
- 
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-     #include "../warpzonelib/common.qh"
-     #include "../common/constants.qh"
-     #include "../common/teams.qh"
-     #include "../common/util.qh"
-     #include "../common/weapons/weapons.qh"
-     #include "weapons/accuracy.qh"
-     #include "weapons/csqcprojectile.qh"
-     #include "weapons/selection.qh"
-     #include "t_items.qh"
-     #include "autocvars.qh"
-     #include "constants.qh"
-     #include "defs.qh"
-     #include "../common/notifications.qh"
-     #include "../common/deathtypes.qh"
-     #include "mutators/mutators_include.qh"
-     #include "tturrets/include/turrets_early.qh"
-     #include "../common/vehicles/sv_vehicles.qh"
-     #include "../csqcmodellib/sv_model.qh"
-     #include "../common/playerstats.qh"
-     #include "g_hook.qh"
-     #include "scores.qh"
-     #include "spawnpoints.qh"
- #endif
- 
- float Damage_DamageInfo_SendEntity(entity to, float sf)
+ #include "_all.qh"
+ 
+ #include "g_hook.qh"
+ #include "mutators/mutators_include.qh"
+ #include "scores.qh"
+ #include "waypointsprites.qh"
+ #include "spawnpoints.qh"
+ #include "tturrets/include/turrets_early.qh"
+ #include "t_items.qh"
 -#include "vehicles/vehicle.qh"
++#include "../common/vehicles/sv_vehicles.qh"
+ #include "weapons/accuracy.qh"
+ #include "weapons/csqcprojectile.qh"
+ #include "weapons/selection.qh"
+ #include "../common/constants.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/notifications.qh"
+ #include "../common/playerstats.qh"
+ #include "../common/teams.qh"
+ #include "../common/util.qh"
+ #include "../common/weapons/all.qh"
+ #include "../csqcmodellib/sv_model.qh"
+ #include "../warpzonelib/common.qh"
+ 
+ float Damage_DamageInfo_SendEntity(entity to, int sf)
  {
        WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO);
        WriteShort(MSG_ENTITY, self.projectiledeathtype);

diff --cc qcsrc/server/g_damage.qh
Simple merge

diff --cc qcsrc/server/g_hook.qc
index b5cb030d077b21c5b8a39ec8f0f5121d8f3f6032,4a3f3101ac663eaf3b92c0a31f27f97ac4ae5365..1d7de64997c857de448490e82083d196e9e18990
--- 1/qcsrc/server/g_hook.qc
--- 2/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@@ -1,21 -1,20 +1,20 @@@
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-     #include "../dpdefs/dpextensions.qh"
-     #include "../warpzonelib/common.qh"
-     #include "../warpzonelib/server.qh"
-     #include "../common/constants.qh"
-     #include "../common/util.qh"
-     #include "../common/weapons/weapons.qh"
-     #include "autocvars.qh"
-     #include "constants.qh"
-     #include "defs.qh"
-     #include "../common/vehicles/sv_vehicles.qh"
-     #include "command/common.qh"
-     #include "g_hook.qh"
-     #include "round_handler.qh"
- #endif
+ #include "g_hook.qh"
+ #include "_all.qh"
+ 
+ #include "weapons/common.qh"
+ #include "weapons/weaponsystem.qh"
+ #include "weapons/selection.qh"
+ #include "weapons/tracing.qh"
+ #include "cl_player.qh"
+ #include "t_teleporters.qh"
+ #include "command/common.qh"
+ #include "round_handler.qh"
 -#include "vehicles/vehicle.qh"
++#include "../common/vehicles/sv_vehicles.qh"
+ #include "../common/constants.qh"
+ #include "../common/util.qh"
+ #include "../common/weapons/all.qh"
+ #include "../warpzonelib/common.qh"
+ #include "../warpzonelib/server.qh"
  
  /*============================================
  
@@@ -315,10 -314,9 +314,9 @@@ void FireGrapplingHook (void
  {
        entity missile;
        vector org;
-       float s;
        vector vs;
  
 -      if(forbidWeaponUse()) return;
 +      if(forbidWeaponUse(self)) return;
        if(self.vehicle) return;
  
        makevectors(self.v_angle);

diff --cc qcsrc/server/g_world.qc
index ecc3005a335a22469769bc8c2e9668ac5b64eaa0,13d63dab3fd28fca0beef5f61d38b9ac7ec428aa..a31871d8648ed90339637a28096e7b1167710b42
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -1,40 -1,39 +1,40 @@@
  #include "g_world.qh"
- 
+ #include "_all.qh"
+ 
+ #include "anticheat.qh"
+ #include "antilag.qh"
+ #include "bot/bot.qh"
+ #include "campaign.qh"
+ #include "cheats.qh"
+ #include "cl_client.qh"
+ #include "command/common.qh"
+ #include "command/getreplies.qh"
+ #include "command/sv_cmd.qh"
+ #include "command/vote.qh"
+ #include "g_hook.qh"
+ #include "ipban.qh"
+ #include "mapvoting.qh"
+ #include "mutators/mutators_include.qh"
+ #include "race.qh"
+ #include "scores.qh"
+ #include "secret.qh"
+ #include "teamplay.qh"
+ #include "waypointsprites.qh"
+ #include "weapons/weaponstats.qh"
  #include "../common/buffs.qh"
- 
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-     #include "../common/constants.qh"
-     #include "../common/stats.qh"
-     #include "../common/teams.qh"
-     #include "../common/util.qh"
-     #include "../common/monsters/sv_monsters.qh"
-     #include "../common/vehicles/vehicles.qh"
-     #include "../common/weapons/weapons.qh"
-     #include "weapons/weaponstats.qh"
-     #include "autocvars.qh"
-     #include "constants.qh"
-     #include "defs.qh"
-     #include "../common/notifications.qh"
-     #include "mutators/mutators_include.qh"
-     #include "campaign.qh"
-     #include "../common/mapinfo.qh"
-     #include "command/common.qh"
-     #include "command/vote.qh"
-     #include "command/getreplies.qh"
-     #include "command/sv_cmd.qh"
-     #include "anticheat.qh"
-     #include "cheats.qh"
-     #include "../common/playerstats.qh"
-     #include "g_hook.qh"
-     #include "scores.qh"
-     #include "mapvoting.qh"
-     #include "ipban.qh"
-     #include "race.qh"
-     #include "antilag.qh"
-     #include "secret.qh"
- #endif
+ #include "../common/constants.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/mapinfo.qh"
+ #include "../common/monsters/all.qh"
+ #include "../common/monsters/sv_monsters.qh"
++#include "../common/vehicles/vehicles.qh"
+ #include "../common/notifications.qh"
+ #include "../common/playerstats.qh"
+ #include "../common/stats.qh"
+ #include "../common/teams.qh"
+ #include "../common/util.qh"
+ #include "../common/items/all.qh"
+ #include "../common/weapons/all.qh"
  
  const float LATENCY_THINKRATE = 10;
  .float latency_sum;
@@@ -559,8 -561,8 +562,9 @@@ void spawnfunc___init_dedicated_server(
  
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 +      CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
        CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+       CALL_ACCUMULATED_FUNCTION(RegisterItems);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
@@@ -608,8 -610,8 +612,9 @@@ void spawnfunc_worldspawn (void
  
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 +      CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
        CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+       CALL_ACCUMULATED_FUNCTION(RegisterItems);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);

diff --cc qcsrc/server/mutators/gamemode_assault.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index 5ea2924cc4a40184fc80f9197ac49cebdb0dfab0,d8a4e357bbde7ea69a37477d28e710bcb6956a6e..57469f11da425965608beb90a13736391579c904
--- 1/qcsrc/server/mutators/gamemode_ctf.qc
--- 2/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@@ -1,3 -1,15 +1,15 @@@
 -#include "../vehicles/vehicle.qh"
+ #include "gamemode_ctf.qh"
+ #include "../_all.qh"
+ 
+ #include "gamemode.qh"
+ 
+ #ifdef SVQC
++#include "../../common/vehicles/sv_vehicles.qh"
+ #endif
+ 
+ #include "../../warpzonelib/common.qh"
+ #include "../../warpzonelib/mathlib.qh"
+ 
  // ================================================================
  //  Official capture the flag game mode coding, reworked by Samual
  //  Last updated: September, 2012

diff --cc qcsrc/server/mutators/mutator_nades.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_overkill.qc
Simple merge

diff --cc qcsrc/server/mutators/mutators_include.qc
Simple merge

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

diff --cc qcsrc/server/progs.src
index 9160f6f0bd676a90abd198e2fe833f1e44c30b47,75301d592972ee3e67ade8b01a84a72c7d188f19..308cf8b7813df96d34b4bb635f1d9f1115a85b23
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -73,6 -72,15 +72,13 @@@ command/all.q
  mutators/mutators_include.qc
  mutators/mutators.qc
  
 -vehicles/all.qc
 -
+ pathlib/costs.qc
+ pathlib/expandnode.qc
+ pathlib/main.qc
+ pathlib/movenode.qc
+ pathlib/path_waypoint.qc
+ pathlib/utility.qc
+ 
  weapons/accuracy.qc
  weapons/common.qc
  weapons/csqcprojectile.qc // TODO
@@@ -102,9 -107,11 +105,12 @@@ weapons/weaponsystem.q
  ../common/test.qc
  ../common/urllib.qc
  ../common/util.qc
 +../common/vehicles/vehicles_include.qc
+ 
+ ../common/items/all.qc
+ 
  ../common/weapons/config.qc
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/sv_model.qc
  

diff --cc qcsrc/server/sv_main.qc
index 249b6738268a77f7e936a0c3b0c1b092edcdc9f0,0f7d1763b0ce2ebf184661f5ad8182f7173498b2..52da17fa88958bd460221959429c028feeba994e
--- 1/qcsrc/server/sv_main.qc
--- 2/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@@ -1,26 -1,31 +1,31 @@@
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-     #include "../dpdefs/dpextensions.qh"
-     #include "../warpzonelib/common.qh"
-     #include "../warpzonelib/server.qh"
-     #include "../common/constants.qh"
-     #include "../common/util.qh"
-     #include "../common/weapons/weapons.qh"
-     #include "weapons/csqcprojectile.qh"
-     #include "autocvars.qh"
-     #include "constants.qh"
-     #include "defs.qh"
-     #include "../common/deathtypes.qh"
-     #include "mutators/mutators_include.qh"
-     #include "../common/vehicles/sv_vehicles.qh"
-     #include "../common/mapinfo.qh"
-     #include "command/common.qh"
-     #include "../csqcmodellib/sv_model.qh"
-     #include "anticheat.qh"
-     #include "g_hook.qh"
- #endif
+ #include "_all.qh"
+ 
+ #include "anticheat.qh"
+ #include "g_hook.qh"
+ #include "g_world.qh"
+ 
+ #include "bot/bot.qh"
+ #include "bot/waypoints.qh"
+ 
+ #include "command/common.qh"
+ 
+ #include "mutators/mutators_include.qh"
 -#include "vehicles/vehicle.qh"
+ #include "weapons/csqcprojectile.qh"
+ 
+ #include "../common/constants.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/mapinfo.qh"
+ #include "../common/util.qh"
+ 
++#include "../common/vehicles/sv_vehicles.qh"
+ #include "../common/weapons/all.qh"
+ 
+ #include "../csqcmodellib/sv_model.qh"
+ 
+ #include "../warpzonelib/common.qh"
+ #include "../warpzonelib/server.qh"
+ 
+ .float lastground;
  
  void CreatureFrame (void)
  {

diff --cc qcsrc/server/t_halflife.qc
index a55fbacda1436923baef5c57f21451494489732f,32d597937cc2a422b35176da195cd697ed6b1c90..0d77747242b9fdbd1513dea864e4d048efd680a4
--- 1/qcsrc/server/t_halflife.qc
--- 2/qcsrc/server/t_halflife.qc
+++ b/qcsrc/server/t_halflife.qc
@@@ -1,11 -1,10 +1,10 @@@
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-     #include "../warpzonelib/util_server.qh"
-     #include "defs.qh"
-     #include "../common/vehicles/sv_vehicles.qh"
- #endif
+ #include "_all.qh"
+ 
+ #include "../warpzonelib/util_server.qh"
 -#include "vehicles/vehicle.qh"
++#include "../common/vehicles/sv_vehicles.qh"
+ 
+ .float  ladder_time;
+ .entity ladder_entity;
  
  .float  roomtype;
  .float  radius;

diff --cc qcsrc/server/t_teleporters.qc
index 09fdc9b17a23abcd7d8ec8c27423be115f1f6f62,4ea5f3b45d98311b409c4a7d6cba4ec4c02ababc..a9419dc98bfde9b0e1a5caf8506c52a1aac300aa
--- 1/qcsrc/server/t_teleporters.qc
--- 2/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@@ -1,23 -1,22 +1,22 @@@
  #include "t_teleporters.qh"
+ #include "_all.qh"
  
- #if defined(CSQC)
- #elif defined(MENUQC)
- #elif defined(SVQC)
-     #include "../warpzonelib/common.qh"
-     #include "../warpzonelib/util_server.qh"
-     #include "../warpzonelib/server.qh"
-     #include "../common/constants.qh"
-     #include "../common/util.qh"
-     #include "weapons/csqcprojectile.qh"
-     #include "autocvars.qh"
-     #include "constants.qh"
-     #include "defs.qh"
-     #include "../common/deathtypes.qh"
-     #include "tturrets/include/turrets_early.qh"
-     #include "../common/vehicles/sv_vehicles.qh"
-     #include "../common/mapinfo.qh"
-     #include "anticheat.qh"
- #endif
+ #include "anticheat.qh"
+ #include "cl_player.qh"
+ #include "g_hook.qh"
+ #include "bot/waypoints.qh"
+ #include "tturrets/include/turrets_early.qh"
 -#include "vehicles/vehicle.qh"
+ #include "weapons/csqcprojectile.qh"
+ #include "../common/constants.qh"
+ #include "../common/deathtypes.qh"
+ #include "../common/mapinfo.qh"
+ #include "../common/util.qh"
++#include "../common/vehicles/sv_vehicles.qh"
+ #include "../warpzonelib/common.qh"
+ #include "../warpzonelib/server.qh"
+ #include "../warpzonelib/util_server.qh"
+ 
+ .float lastteleporttime;
  
  void trigger_teleport_use()
  {

diff --cc qcsrc/server/weapons/selection.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge