Clean up ammo_pickupevalfunc to not reference items directly

[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 fed2763d079d6dc2357f194ae29b9bde1d1f6b5d..2b174a68de0a0422cb81bc9d3efc30b8c73acc49 100644 (file)
--- a/qcsrc/common/campaign_setup.qc
+++ b/qcsrc/common/campaign_setup.qc
@@ -1,12 +1,13 @@
+#include "campaign_setup.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qc"
-    #include "campaign_common.qh"
-    #include "mapinfo.qh"
+       #include <common/campaign_common.qh>
+       #include <common/mapinfo.qh>
 #endif
 
-void CampaignSetup(float n)
+void CampaignSetup(int n)
 {
        localcmd("set g_campaign 1\n");
        localcmd("set _campaign_name \"");
@@ -17,4 +18,7 @@ void CampaignSetup(float n)
                localcmd("\n");
        localcmd("disconnect\nmaxplayers 16\n");
        MapInfo_LoadMap(campaign_mapname[n], 1);
+       #ifdef MENUQC
+       makeServerSingleplayer();
+       #endif
 }