X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcampaign.qc;h=ddc7e47fa6c31386d3ff17c3d9b2d6e0a441ecbc;hp=650855989edebccc0ee31cf1aba8984b6a634b2f;hb=1a18ff8e9f729e903015f5baa6605c92c92ea13d;hpb=02e0727816326407cc681dd2d12c67d157e618cf

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 650855989..ddc7e47fa 100644
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,4 +1,7 @@
 #include "campaign.qh"
+
+#include "defs.qh"
+
 #include "cheats.qh"
 #include "miscfunctions.qh"
 #include "g_world.qh"
@@ -22,7 +25,7 @@ float CampaignBailout(string s)
 	cvar_string = cvar_string_normal;
 	cvar_set = cvar_set_normal;
 	cvar_set("g_campaign", "0");
-	print("^4campaign initialization failed: ", s, "\n");
+	LOG_INFO("^4campaign initialization failed: ", s);
 	if(autocvar__campaign_testrun)
 		error("CAMPAIGN FAIL AHAHAHAHAHAHAHAHAH))");
 	return 1;
@@ -49,8 +52,7 @@ void cvar_set_campaignwrapper(string theCvar, string theValue)
 {
 	if(cvar_string_campaignwrapper(theCvar) == theValue)
 		return;
-	string s;
-	s = cvar_campaignwrapper_list;
+	string s = cvar_campaignwrapper_list;
 	cvar_campaignwrapper_list = strzone(strcat("; ", theCvar, " ", theValue, s));
 	strunzone(s);
 	//print(cvar_campaignwrapper_list, "\n");
@@ -73,26 +75,32 @@ void CampaignPreInit()
 {
 	float baseskill;
 	string title;
-	if(autocvar_sv_cheats)
-	{
-		CampaignBailout("JOLLY CHEATS AHAHAHAHAHAHAH))");
-		return;
-	}
 	campaign_level = autocvar__campaign_index;
 	campaign_name = strzone(autocvar__campaign_name);
 	campaign_index_var = strzone(strcat("g_campaign", campaign_name, "_index"));
 	CampaignFile_Load(campaign_level, 2);
+
 	if(campaign_entries < 1)
 	{
 		CampaignBailout("unknown map");
 		return;
 	}
 
+	if(autocvar_sv_cheats)
+	{
+		MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0]));
+		CampaignFile_Unload();
+		CampaignBailout("JOLLY CHEATS AHAHAHAHAHAHAH))");
+		return;
+	}
+
 	baseskill = autocvar_g_campaign_skill;
 	baseskill = baseskill + campaign_botskill[0];
 	if(baseskill < 0)
 		baseskill = 0;
 
+	campaign_forcewin = false;
+
 	cvar_set("sv_public", "0");
 	cvar_set("pausable", "1");
 
@@ -184,31 +192,27 @@ void CampaignSaveCvar(string cvarname, float value)
 
 void CampaignPreIntermission()
 {
-	entity head;
-	float won;
-	float lost;
+	int won = 0;
+	int lost = 0;
 	string savevar;
 
-	won = lost = 0;
-
-	head = findchain(classname, "player");
-	while(head)
-	{
-		if(IS_REAL_CLIENT(head))
-		{
-			if(head.winning)
-				won = won + 1;
-			else
-				lost = lost + 1;
-		}
-		head = head.chain;
-	}
+	FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), {
+		if(it.winning)
+			won += 1;
+		else
+			lost += 1;
+	});
 
 	if(autocvar__campaign_testrun)
 	{
 		campaign_won = 1;
 		bprint("Campaign test run, advancing level.\n");
 	}
+	else if(campaign_forcewin)
+	{
+		campaign_won = 1;
+		bprint("The current level has been WON.\n");
+	}
 	else if(won == 1 && lost == 0 && checkrules_equality == 0)
 	{
 		if(autocvar_timelimit != 0 && autocvar_fraglimit != 0 && time > autocvar_timelimit * 60) // checks if the timelimit has expired.
@@ -265,7 +269,7 @@ void CampaignPostIntermission()
 	if(campaign_won && campaign_entries < 2)
 	{
 		// last map won!
-		print("^2test run: campaign looks GOOD\n");
+		LOG_DEBUG("^2test run: campaign looks GOOD");
 		localcmd("togglemenu 1\n");
 		CampaignFile_Unload();
 		return;