Merge branch 'master' into martin-t/globals

[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 7f72d352716f5c3e452130a8c30659f195110d89..25c008d260d12329b2e16aed6dfdf97fdaf0973d 100644 (file)
--- a/qcsrc/common/campaign_common.qh
+++ b/qcsrc/common/campaign_common.qh
@@ -1,82 +1,12 @@
-#ifndef CAMPAIGN_COMMON_H
-#define CAMPAIGN_COMMON_H
-
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "util-pre.qh"
-    #include "../menu/sys-pre.qh"
-    #include "../dpdefs/menudefs.qc"
-    #include "../dpdefs/keycodes.qc"
-    #include "../menu/sys-post.qh"
-    #include "../menu/config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "util.qh"
-    #include "test.qh"
-    #include "../menu/oo/base.qh"
-    #include "playerstats.qh"
-    #include "teams.qh"
-    #include "constants.qh"
-    #include "mapinfo.qh"
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qc"
-    #include "../dpdefs/dpextensions.qc"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-    #include "net_notice.qh"
-    #include "animdecide.qh"
-    #include "monsters/monsters.qh"
-    #include "monsters/sv_monsters.qh"
-    #include "monsters/spawn.qh"
-    #include "weapons/config.qh"
-    #include "weapons/weapons.qh"
-    #include "../server/weapons/accuracy.qh"
-    #include "../server/weapons/common.qh"
-    #include "../server/weapons/csqcprojectile.qh"
-    #include "../server/weapons/hitplot.qh"
-    #include "../server/weapons/selection.qh"
-    #include "../server/weapons/spawning.qh"
-    #include "../server/weapons/throwing.qh"
-    #include "../server/weapons/tracing.qh"
-    #include "../server/weapons/weaponstats.qh"
-    #include "../server/weapons/weaponsystem.qh"
-    #include "../server/t_items.qh"
-    #include "../server/autocvars.qh"
-    #include "../server/constants.qh"
-    #include "../server/defs.qh"
-    #include "notifications.qh"
-    #include "deathtypes.qh"
-    #include "../server/mutators/mutators_include.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-    #include "../server/vehicles/vehicles_def.qh"
-    #include "../server/campaign.qh"
-#endif
+#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];
@@ -99,5 +29,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);
-#endif
\ No newline at end of file
+void CampaignSetup(int n);