X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcampaign.qc;h=825b9bfc179d71a4787f6f2a89fb22756c28b8be;hb=d5fdcf33ed6bf561a90134526bc2d4c1814d35a8;hp=b6a39ee6744686ae5465f06a47ce05724cf8e3fc;hpb=ef3193f7a8b94d570b83a09e5f75ba2c87fe2bb9;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index b6a39ee67..825b9bfc1 100644 --- a/qcsrc/server/campaign.qc +++ b/qcsrc/server/campaign.qc @@ -1,3 +1,10 @@ +#include "campaign.qh" +#include "cheats.qh" +#include "miscfunctions.qh" +#include "g_world.qh" + +#include "../common/campaign_common.qh" + // campaign cvars: // _campaign_index: index of CURRENT map // _campaign_name: name of the current campaign @@ -7,7 +14,7 @@ float campaign_level; float campaign_won; string campaign_index_var; -float checkrules_equality; +//float checkrules_equality; float CampaignBailout(string s) { @@ -15,7 +22,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, "\n"); if(autocvar__campaign_testrun) error("CAMPAIGN FAIL AHAHAHAHAHAHAHAHAH))"); return 1; @@ -114,7 +121,6 @@ void CampaignPreInit() strunzone(title); } -string GetMapname(); void CampaignPostInit() { // now some sanity checks @@ -259,7 +265,7 @@ void CampaignPostIntermission() if(campaign_won && campaign_entries < 2) { // last map won! - print("^2test run: campaign looks GOOD\n"); + LOG_INFO("^2test run: campaign looks GOOD\n"); localcmd("togglemenu 1\n"); CampaignFile_Unload(); return;