Merge branch 'master' into Mario/vehicles

[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..b822c34942a49eece429b68f32e9e43675b6bcdd 100644 (file)
--- a/qcsrc/common/campaign_setup.qc
+++ b/qcsrc/common/campaign_setup.qc
@@ -1,12 +1,12 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qc"
+       #include "../dpdefs/progsdefs.qh"
     #include "campaign_common.qh"
     #include "mapinfo.qh"
 #endif
 
-void CampaignSetup(float n)
+void CampaignSetup(int n)
 {
        localcmd("set g_campaign 1\n");
        localcmd("set _campaign_name \"");