X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcampaign_file.qc;h=4f099b53301010a383b9efaa5a27d9e2e5ceebaf;hb=cde1b2352448e15b36dc28a35a4ed0cb49b3a7c3;hp=a8bbe8e856c430a7fdfaf85e9ab5a4988c96a13d;hpb=18e2cd311a581f77ba8eb9c5421dd219ff5d760d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc index a8bbe8e85..4f099b533 100644 --- a/qcsrc/common/campaign_file.qc +++ b/qcsrc/common/campaign_file.qc @@ -1,3 +1,4 @@ +#include "campaign_file.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) @@ -51,8 +52,6 @@ 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); @@ -87,17 +86,15 @@ 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_mutators[i]); + strfree(campaign_shortdesc[i]); + strfree(campaign_longdesc[i]); } campaign_entries = 0; - campaign_title = string_null; } }