X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcampaign_file.qc;h=bc26203399bf44aace75bcff27b303f2caa738b0;hb=69eda62d02bc02ff50547bad514af3f7ce487413;hp=5ab3da67cff47e58a34f3731b1d330d256bb3526;hpb=db7073760c3dbc7726f7f946aa108120d7a7100a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index 5ab3da67c..bc2620339 100644
--- a/qcsrc/common/campaign_file.qc
+++ b/qcsrc/common/campaign_file.qc
@@ -1,8 +1,16 @@
+#include "campaign_file.qh"
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "util.qh"
+    #include "campaign_common.qh"
+#endif
+
 // CampaignFileLoad(offset, n)
 // - 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;
@@ -63,7 +71,7 @@ float CampaignFile_Load(float offset, float n)
 
 				campaign_entries = campaign_entries + 1;
 
-				if(campaign_entries >= n)				
+				if(campaign_entries >= n)
 					break;
 			}
 			lineno = lineno + 1;
@@ -78,19 +86,17 @@ float CampaignFile_Load(float offset, float n)
 
 void CampaignFile_Unload()
 {
-	float i;
 	if(campaign_title)
 	{
-		strunzone(campaign_title);
-		for(i = 0; i < campaign_entries; ++i)
+		strfree(campaign_title);
+		for(int i = 0; i < campaign_entries; ++i)
 		{
-			strunzone(campaign_gametype[i]);
-			strunzone(campaign_mapname[i]);
-			strunzone(campaign_mutators[i]);
-			strunzone(campaign_shortdesc[i]);
-			strunzone(campaign_longdesc[i]);
+			strfree(campaign_gametype[i]);
+			strfree(campaign_mapname[i]);
+			strfree(campaign_mutators[i]);
+			strfree(campaign_shortdesc[i]);
+			strfree(campaign_longdesc[i]);
 		}
 		campaign_entries = 0;
-		campaign_title = string_null;
 	}
 }