X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcampaign.qc;h=110704f2bbd9b2d80cfba1f6325faa321b53f378;hp=f0fcea6abf62def2f2d8cabf03556955cf7dbd7d;hb=50b224ef8be4902d6e4ba77b71ebbb2ff187e950;hpb=c4e88ea7edc06a6cd082d8d05547465418291c46

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index f0fcea6abf..110704f2bb 100644
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -75,10 +75,19 @@ float Campaign_Invalid()
 	return 0;
 }
 
+int Campaign_GetLevelNum()
+{
+	return campaign_level + 1;
+}
+
+string Campaign_GetMessage()
+{
+	return strcat(campaign_shortdesc[0], "\n^3\n", campaign_longdesc[0]);
+}
+
 void CampaignPreInit()
 {
 	float baseskill;
-	string title;
 	campaign_level = autocvar__campaign_index;
 	campaign_name = strzone(autocvar__campaign_name);
 	campaign_index_var = strzone(strcat("g_campaign", campaign_name, "_index"));
@@ -115,7 +124,7 @@ void CampaignPreInit()
 		{
 			string arg = argv(j);
 			if(arg == "") continue;
-			_MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 0); // no recursion!
+			_MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 1);
 		}
 	}
 #endif
@@ -142,11 +151,6 @@ void CampaignPreInit()
 
 	if(Campaign_Invalid())
 		return;
-
-	title = campaign_shortdesc[0];
-	title = strzone(strcat("Level ", ftos(campaign_level + 1), ": ", title));
-	campaign_message = strzone(strcat(title, "\n^3\n", campaign_longdesc[0], "\n\n^1press jump to enter the game"));
-	strunzone(title);
 }
 
 void CampaignPostInit()
@@ -309,7 +313,6 @@ void CampaignPostIntermission()
 
 	CampaignSetup(campaign_won);
 	CampaignFile_Unload();
-	strunzone(campaign_message);
 	strunzone(campaign_index_var);
 	strunzone(campaign_name);
 	campaign_name = "";