X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcampaign_file.qc;h=69dbb0b1d3af124d6900d59381e6f67919f31036;hb=823702246ca2f7b69a926fcf266911bd35f3c1b5;hp=7031b92c9b7592cf1582efda6a26c11f676ac33a;hpb=ba0988ca930f50286f8cf3b6c114ebc6584964af;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc index 7031b92c9..69dbb0b1d 100644 --- a/qcsrc/common/campaign_file.qc +++ b/qcsrc/common/campaign_file.qc @@ -1,8 +1,8 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../dpdefs/progsdefs.qc" - #include "../dpdefs/dpextensions.qc" + #include "../dpdefs/progsdefs.qh" + #include "../dpdefs/dpextensions.qh" #include "util.qh" #include "campaign_common.qh" #endif @@ -11,7 +11,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 +87,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]);