Merge branch 'Mario/cts_respawn_clear' into 'master'

[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 69dbb0b1d3af124d6900d59381e6f67919f31036..d3efe77e844a498365a55ce6c264c5a554df0dd7 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.qh"
-    #include "../dpdefs/dpextensions.qh"
     #include "util.qh"
     #include "campaign_common.qh"
 #endif
@@ -90,8 +89,7 @@ void CampaignFile_Unload()
        if(campaign_title)
        {
                strunzone(campaign_title);
-               int i;
-               for(i = 0; i < campaign_entries; ++i)
+               for(int i = 0; i < campaign_entries; ++i)
                {
                        strunzone(campaign_gametype[i]);
                        strunzone(campaign_mapname[i]);