X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fctf%2Fsv_ctf.qc;h=2c82db96c806b3d9825785b7cbdbfd62c392bc7a;hb=0ade80044244ecfd180e7a3dfc0113dcf3a26572;hp=91952b2d15746ce085923c62007e35213717722d;hpb=51199f1c36a07bbb122733e032ecb805717b0d55;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc index 91952b2d15..2c82db96c8 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc @@ -1118,7 +1118,7 @@ METHOD(Flag, giveTo, bool(Flag this, entity flag, entity toucher)) ctf_Handle_Pickup(flag, toucher, PICKUP_BASE); // toucher just stole the neutral flag } else if(CTF_SAMETEAM(toucher, flag) && (toucher.flagcarried) && DIFF_TEAM(toucher.flagcarried, flag) && is_not_monster) - ctf_Handle_Capture(flag, toucher, CAPTURE_NORMAL); // toucher just captured the enemies flag to his base + ctf_Handle_Capture(flag, toucher, CAPTURE_NORMAL); // toucher just captured the enemies flag to their base else if(CTF_DIFFTEAM(toucher, flag) && (toucher.flagcarried) && CTF_SAMETEAM(toucher.flagcarried, toucher) && (!toucher.ctf_captureshielded) && autocvar_g_ctf_flag_return_carrying && (time > toucher.next_take_time) && is_not_monster) { ctf_Handle_Return(toucher.flagcarried, toucher); // return their current flag @@ -1132,7 +1132,7 @@ METHOD(Flag, giveTo, bool(Flag this, entity flag, entity toucher)) case FLAG_DROPPED: { if(CTF_SAMETEAM(toucher, flag) && ctf_Immediate_Return_Allowed(flag, toucher)) - ctf_Handle_Return(flag, toucher); // toucher just returned his own flag + ctf_Handle_Return(flag, toucher); // toucher just returned their own flag else if(is_not_monster && (!toucher.flagcarried) && ((toucher != flag.ctf_dropper) || (time > flag.ctf_droptime + autocvar_g_ctf_flag_collect_delay))) ctf_Handle_Pickup(flag, toucher, PICKUP_DROPPED); // toucher just picked up a dropped enemy flag break; @@ -1560,7 +1560,7 @@ void havocbot_goalrating_ctf_enemyflag(entity this, float ratingscale) { if (head.ctf_status == FLAG_CARRY) { - // adjust rating of our flag carrier depending on his health + // adjust rating of our flag carrier depending on their health head = head.tag_entity; float f = bound(0, (GetResource(head, RES_HEALTH) + GetResource(head, RES_ARMOR)) / 100, 2) - 1; ratingscale += ratingscale * f * 0.1;