Merge branch 'master' into Mario/q3compat_sanity

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / campaign_setup.qc

diff --git a/qcsrc/common/campaign_setup.qc b/qcsrc/common/campaign_setup.qc
index 3aae078adbf3431be6a8f57d45bde85eee207cd9..8be208980a3061d1b595d04ccb40c25235538f37 100644 (file)
--- a/qcsrc/common/campaign_setup.qc
+++ b/qcsrc/common/campaign_setup.qc
@@ -1,4 +1,13 @@
-void CampaignSetup(float n)
+#include "campaign_setup.qh"
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include <common/campaign_common.qh>
+       #include <common/mapinfo.qh>
+#endif
+
+void CampaignSetup(int n)
 {
        localcmd("set g_campaign 1\n");
        localcmd("set _campaign_name \"");
@@ -8,5 +17,5 @@ void CampaignSetup(float n)
                localcmd(ftos(campaign_offset + n));
                localcmd("\n");
        localcmd("disconnect\nmaxplayers 16\n");
-       MapInfo_LoadMap(campaign_mapname[n]);
+       MapInfo_LoadMap(campaign_mapname[n], 1);
 }