]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use the correct flag for capture scores (shouldn't be the base one)
authorMario <mario@smbclan.net>
Fri, 3 Mar 2017 14:23:31 +0000 (00:23 +1000)
committerMario <mario@smbclan.net>
Fri, 3 Mar 2017 14:23:31 +0000 (00:23 +1000)
qcsrc/server/mutators/mutator/gamemode_ctf.qc

index 534b41618f81f946c667a0409dd9618318ffe889..d19f52567fcd641b5afda647e090180cf0f6a334 100644 (file)
@@ -596,7 +596,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, int capturetype)
        }
 
        // scoring
-       PlayerTeamScore_AddScore(player, ((flag.score_capture) ? flag.score_capture : autocvar_g_ctf_score_capture));
+       PlayerTeamScore_AddScore(player, ((enemy_flag.score_capture) ? enemy_flag.score_capture : autocvar_g_ctf_score_capture));
        PlayerTeamScore_Add(player, SP_CTF_CAPS, ST_CTF_CAPS, 1);
 
        old_time = PlayerScore_Add(player, SP_CTF_CAPTIME, 0);
@@ -615,7 +615,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, int capturetype)
                if(flag.speedrunning) { ctf_FakeTimeLimit(player, -1); }
 
                if((enemy_flag.ctf_dropper) && (player != enemy_flag.ctf_dropper))
-                       { PlayerTeamScore_AddScore(enemy_flag.ctf_dropper, ((flag.score_assist) ? flag.score_assist : autocvar_g_ctf_score_capture_assist)); }
+                       { PlayerTeamScore_AddScore(enemy_flag.ctf_dropper, ((enemy_flag.score_assist) ? enemy_flag.score_assist : autocvar_g_ctf_score_capture_assist)); }
        }
 
        // reset the flag