Merge branch 'Mario/monster_lod_models' into 'master'

[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 b63883dcc828e4b932a984d6bd8d959455610100..6c9342b80e30bcb64ec2759cc4a67c245d3bc95f 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -42,6 +42,7 @@ void round_handler_Think(entity this)
                                this.cnt = 0;
                                this.round_endtime = (this.round_timelimit) ? time + this.round_timelimit : 0;
                                this.nextthink = time;
+                               rounds_played++;
                                if (this.roundStart) this.roundStart();
                                return;
                        }
@@ -114,7 +115,10 @@ void round_handler_Reset(float next_think)
                if (this.cnt < this.count + 1) this.cnt = this.count + 1;
        this.nextthink = next_think;
        if (next_think)
+       {
+               if (next_think <= game_starttime) rounds_played = 0;
                round_starttime = next_think + this.count;
+       }
 }
 
 void round_handler_Remove()