From: Mario <mario.mario@y7mail.com>
Date: Sun, 18 Oct 2020 03:30:19 +0000 (+1000)
Subject: Merge branch 'master' into Mario/q3compat_sanity
X-Git-Tag: xonotic-v0.8.6~328^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c859a2a87cbeb3dd30f402782cf7e59d132b1b81;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/q3compat_sanity
---

c859a2a87cbeb3dd30f402782cf7e59d132b1b81
diff --cc qcsrc/common/mapinfo.qc
index f8c960a4a,1b3fa8faf..384b3a555
--- a/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/server/world.qh
index 2894299d6,7448c0847..e35162470
--- a/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(); }