Merge branch 'master' into Juhu/battle-royale

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / round_handler.qc

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 6c9342b80e30bcb64ec2759cc4a67c245d3bc95f..bb890e980a628738d1cf96ec9d74a81bf84089c8 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,6 +1,7 @@
 #include "round_handler.qh"
 
 #include <common/mapobjects/triggers.qh>
+#include <common/scores.qh>
 #include <common/util.qh>
 #include <server/campaign.qh>
 #include <server/command/vote.qh>
@@ -28,7 +29,7 @@ void round_handler_Think(entity this)
                this.wait = false;
                this.cnt = this.count + 1;  // init countdown
                round_starttime = time + this.count;
-               reset_map(true, false);
+               reset_map(false);
        }
 
        if (this.cnt > 0)  // countdown running
@@ -39,6 +40,9 @@ void round_handler_Think(entity this)
                        int f = this.cnt - 1;
                        if (f == 0)
                        {
+                               FOREACH_CLIENT((IS_PLAYER(it) || INGAME(it)), {
+                                       GameRules_scoring_add(it, ROUNDS_PL, 1);
+                               });
                                this.cnt = 0;
                                this.round_endtime = (this.round_timelimit) ? time + this.round_timelimit : 0;
                                this.nextthink = time;