diff options
| author | Alfred Eriksson <somerunce@gmail.com> | 2008-09-07 08:57:59 +0000 |
|---|---|---|
| committer | Alfred Eriksson <somerunce@gmail.com> | 2008-09-07 08:57:59 +0000 |
| commit | a92c6d44dcb62675cf1937e1e618e50010345ac7 (patch) | |
| tree | 690b97b435c2eddd1640fd160bd3fbb05f92f354 /src/game/server/gamecontroller.hpp | |
| parent | 777e685a2467c7b1b3b3c6f3626048d71a41690b (diff) | |
| download | zcatch-a92c6d44dcb62675cf1937e1e618e50010345ac7.tar.gz zcatch-a92c6d44dcb62675cf1937e1e618e50010345ac7.zip | |
merge from 0.4.3: notification on auto team balance
Diffstat (limited to 'src/game/server/gamecontroller.hpp')
| -rw-r--r-- | src/game/server/gamecontroller.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
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(); /* |