X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcampaign.qc;h=6bd853d1b4af51d053ff9048f5712d184ca60986;hb=480de525d9378ac5baa42568c212dc6b13363879;hp=1a01868fb3b1cc660d0e2720dac392dfdafef648;hpb=9ddd00d3479c56a93e210d16f4870c803e23c680;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 1a01868fb..6bd853d1b 100644
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,12 +1,12 @@
 #include "campaign.qh"
 
-#include "defs.qh"
-
-#include "cheats.qh"
-#include "miscfunctions.qh"
-#include "g_world.qh"
-
-#include "../common/campaign_common.qh"
+#include <common/campaign_common.qh>
+#include <common/mapinfo.qh>
+#include <common/stats.qh>
+#include <common/weapons/_all.qh>
+#include <server/cheats.qh>
+#include <server/intermission.qh>
+#include <server/world.qh>
 
 // campaign cvars:
 //   _campaign_index: index of CURRENT map
@@ -33,7 +33,7 @@ float Campaign_Invalid()
 	string thismapname, wantedmapname;
 	thismapname = GetMapname();
 	wantedmapname = campaign_gametype[0];
-	if(MapInfo_CurrentGametype() != MapInfo_Type_FromString(wantedmapname))
+	if(MapInfo_CurrentGametype() != MapInfo_Type_FromString(wantedmapname, false))
 		return CampaignBailout("wrong game type!");
 	wantedmapname = campaign_mapname[0];
 	if(wantedmapname != thismapname)
@@ -41,6 +41,11 @@ float Campaign_Invalid()
 	return 0;
 }
 
+string Campaign_GetTitle()
+{
+	return campaign_title;
+}
+
 int Campaign_GetLevelNum()
 {
 	return campaign_level + 1;
@@ -67,7 +72,7 @@ void CampaignPreInit()
 
 	if(autocvar_sv_cheats)
 	{
-		MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0]));
+		MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false));
 		CampaignFile_Unload();
 		CampaignBailout("JOLLY CHEATS AHAHAHAHAHAHAH))");
 		return;
@@ -96,7 +101,7 @@ void CampaignPreInit()
 	cvar_settemp("skill", ftos(baseskill));
 	cvar_settemp("bot_number", ftos(campaign_bots[0]));
 
-	MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0]));
+	MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false));
 
 	if(Campaign_Invalid())
 		return;