From a92c6d44dcb62675cf1937e1e618e50010345ac7 Mon Sep 17 00:00:00 2001 From: Alfred Eriksson Date: Sun, 7 Sep 2008 08:57:59 +0000 Subject: merge from 0.4.3: notification on auto team balance --- src/game/server/gamecontroller.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/game/server/gamecontroller.hpp') diff --git a/src/game/server/gamecontroller.hpp b/src/game/server/gamecontroller.hpp index 2cffc8a8..89a8ad46 100644 --- a/src/game/server/gamecontroller.hpp +++ b/src/game/server/gamecontroller.hpp @@ -47,13 +47,12 @@ protected: int round_count; int game_flags; - + int unbalanced_tick; + bool force_balanced; public: bool is_teamplay() const; - int unbalanced_tick; - GAMECONTROLLER(); void do_team_score_wincheck(); @@ -65,6 +64,8 @@ public: void endround(); bool is_friendly_fire(int cid1, int cid2); + + bool is_force_balanced(); /* -- cgit 1.4.1