Merge branch 'master' into Mario/wepent_experimental

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

diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index 7031b92c9b7592cf1582efda6a26c11f676ac33a..af81942a2001753c36e9fb1cebdadc6ae283b2bb 100644 (file)
--- a/qcsrc/common/campaign_file.qc
+++ b/qcsrc/common/campaign_file.qc
@@ -1,8 +1,7 @@
+#include "campaign_file.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qc"
-    #include "../dpdefs/dpextensions.qc"
     #include "util.qh"
     #include "campaign_common.qh"
 #endif
@@ -11,7 +10,7 @@
 // - Loads campaign level data (up to n entries starting at offset)
 //   into the globals
 // - Returns the number of entries successfully read
-float CampaignFile_Load(float offset, float n)
+float CampaignFile_Load(int offset, float n)
 {
        float fh;
        float lineno;
@@ -87,10 +86,10 @@ float CampaignFile_Load(float offset, float n)
 
 void CampaignFile_Unload()
 {
-       float i;
        if(campaign_title)
        {
                strunzone(campaign_title);
+               int i;
                for(i = 0; i < campaign_entries; ++i)
                {
                        strunzone(campaign_gametype[i]);