Merge branch 'master' into Mario/q3compat_sanity

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

diff --cc qcsrc/common/mapinfo.qc
index f8c960a4a9474b012fd7a4092263094935dbbfc2,1b3fa8faf7d34a46925a337174447423e4ecd220..384b3a5558b21ec3e3a5cac7a3037903c8a2611e
--- 1/qcsrc/common/mapinfo.qc
--- 2/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@@ -1,16 -1,13 +1,16 @@@
  #include "mapinfo.qh"
  #if defined(CSQC)
-     #include "util.qh"
-     #include <common/weapons/_all.qh>
+       #include <common/util.qh>
+       #include <common/weapons/_all.qh>
  #elif defined(MENUQC)
  #elif defined(SVQC)
-     #include "util.qh"
-     #include <common/monsters/_mod.qh>
+       #include <common/util.qh>
+       #include <common/monsters/_mod.qh>
  #endif
  
 +bool autocvar_g_mapinfo_arena_compat = true;
 +bool autocvar_g_mapinfo_arena_generate = false;
 +
  #ifdef MENUQC
  #define WARN_COND false
  #else

diff --cc qcsrc/menu/draw.qc
Simple merge

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

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

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

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

diff --cc qcsrc/server/world.qh
index 2894299d619beee64fd0dbfa9b9510c4dacea443,7448c0847ed3dc710ff34691e5612c5abe34cc75..e351624701a7c6370b0dd6ed49c838b93e83b332
--- 1/qcsrc/server/world.qh
--- 2/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@@ -61,9 -116,12 +116,16 @@@ float MoveToRandomMapLocation(entity e
  void CheckRules_World();
  float RedirectionThink();
  
 +// quake 3 music compatibility
 +.string music;
 +.string noise;
 +
+ void readplayerstartcvars();
+ 
+ void readlevelcvars();
+ 
+ .vector dropped_origin;
+ void droptofloor(entity this);
+ 
  IntrusiveList g_moveables;
  STATIC_INIT(g_moveables) { g_moveables = IL_NEW(); }