X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcampaign.qc;h=5dcd0ad9359d353687409b097c3654a1f30cd65e;hb=06d3f628c5e91ba1dec8016ef082f664e59d2eb6;hp=650855989edebccc0ee31cf1aba8984b6a634b2f;hpb=2aed36e128f8f00da9c76f9e66baae89d5bb26b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index 650855989..5dcd0ad93 100644 --- a/qcsrc/server/campaign.qc +++ b/qcsrc/server/campaign.qc @@ -22,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; @@ -184,25 +184,16 @@ 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), LAMBDA( + if(it.winning) + won += 1; + else + lost += 1; + )); if(autocvar__campaign_testrun) { @@ -265,7 +256,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\n"); localcmd("togglemenu 1\n"); CampaignFile_Unload(); return;