Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / campaign_common.qh

diff --git a/qcsrc/common/campaign_common.qh b/qcsrc/common/campaign_common.qh
index f6e240a6faf5bd4411a1919fc9badf34ddf56e04..8f70c51cfaf5e960b6c7c8982332926070f88242 100644 (file)
--- a/qcsrc/common/campaign_common.qh
+++ b/qcsrc/common/campaign_common.qh
@@ -1,19 +1,23 @@
+#pragma once
+
 #ifndef CAMPAIGN_MAX_ENTRIES
 #define CAMPAIGN_MAX_ENTRIES 64
 #endif
 
 // each i-th array element corresponds to the list entry campaign_offset+i
-float campaign_entries;
-float campaign_offset;
+int campaign_entries;
+int campaign_offset;
 string campaign_gametype[CAMPAIGN_MAX_ENTRIES];
 string campaign_mapname[CAMPAIGN_MAX_ENTRIES];
 float campaign_bots[CAMPAIGN_MAX_ENTRIES];
 float campaign_botskill[CAMPAIGN_MAX_ENTRIES];
-float campaign_fraglimit[CAMPAIGN_MAX_ENTRIES];
-float campaign_timelimit[CAMPAIGN_MAX_ENTRIES];
+string campaign_fraglimit[CAMPAIGN_MAX_ENTRIES];
+string campaign_timelimit[CAMPAIGN_MAX_ENTRIES];
 string campaign_mutators[CAMPAIGN_MAX_ENTRIES];
+#ifndef SVQC
 string campaign_shortdesc[CAMPAIGN_MAX_ENTRIES];
 string campaign_longdesc[CAMPAIGN_MAX_ENTRIES];
+#endif
 string campaign_title; // filled upon loading
 
 // load the campaign file, but use the given offset and limit the number of
@@ -27,4 +31,4 @@ void CampaignFile_Unload();
 
 // Sets up the campaign for the n-th array item (meaning: campaign_offset+nth
 // level) using localcmd()
-void CampaignSetup(float n);
+void CampaignSetup(int n);