X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcampaign_file.qc;h=8bac6f35ee05678647caf62ec410df13bf5da770;hp=69dbb0b1d3af124d6900d59381e6f67919f31036;hb=4eab3f0253a063bdbd4e1ff64c4b2b08077c44c4;hpb=e921ae9f86a09d0a20cd4c72b44e6d71d25975ea

diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index 69dbb0b1d3..8bac6f35ee 100644
--- 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
@@ -53,16 +52,14 @@ float CampaignFile_Load(int offset, float n)
 		a = ""; \
 	else \
 		++i
-// What you're seeing here is what people will do when your compiler supports
-// C-style macros but no line continuations.
 
 				i = -1; // starts at -1 so I don't need postincrement; that is, i points to BEFORE the current arg!
 				CAMPAIGN_GETARG; campaign_gametype[campaign_entries] = strzone(a);
 				CAMPAIGN_GETARG; campaign_mapname[campaign_entries] = strzone(a);
 				CAMPAIGN_GETARG; campaign_bots[campaign_entries] = stof(a);
 				CAMPAIGN_GETARG; campaign_botskill[campaign_entries] = stof(a);
-				CAMPAIGN_GETARG; campaign_fraglimit[campaign_entries] = stof(a);
-				CAMPAIGN_GETARG; campaign_timelimit[campaign_entries] = stof(a);
+				CAMPAIGN_GETARG; campaign_fraglimit[campaign_entries] = strzone(a);
+				CAMPAIGN_GETARG; campaign_timelimit[campaign_entries] = strzone(a);
 				CAMPAIGN_GETARG; campaign_mutators[campaign_entries] = strzone(a);
 				CAMPAIGN_GETARG; campaign_shortdesc[campaign_entries] = strzone(a);
 				CAMPAIGN_GETARG; campaign_longdesc[campaign_entries] = strzone(strreplace("\\n", "\n", a));
@@ -89,17 +86,17 @@ void CampaignFile_Unload()
 {
 	if(campaign_title)
 	{
-		strunzone(campaign_title);
-		int i;
-		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_fraglimit[i]);
+			strfree(campaign_timelimit[i]);
+			strfree(campaign_mutators[i]);
+			strfree(campaign_shortdesc[i]);
+			strfree(campaign_longdesc[i]);
 		}
 		campaign_entries = 0;
-		campaign_title = string_null;
 	}
 }