From 6dcea2c4ca59e0f1ac8450cc31550bdb35bc21b1 Mon Sep 17 00:00:00 2001 From: Alfred Eriksson Date: Sun, 7 Sep 2008 08:10:56 +0000 Subject: mermerge from 0.4.3: auto team balancing --- src/game/server/gamecontroller.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/game/server/gamecontroller.hpp') diff --git a/src/game/server/gamecontroller.hpp b/src/game/server/gamecontroller.hpp index 1a87034b..2cffc8a8 100644 --- a/src/game/server/gamecontroller.hpp +++ b/src/game/server/gamecontroller.hpp @@ -34,7 +34,7 @@ protected: void cyclemap(); void resetgame(); - + const char *gametype; int round_start_tick; @@ -52,6 +52,8 @@ protected: public: bool is_teamplay() const; + int unbalanced_tick; + GAMECONTROLLER(); void do_team_score_wincheck(); @@ -118,6 +120,8 @@ public: virtual const char *get_team_name(int team); virtual int get_auto_team(int notthisid); virtual bool can_join_team(int team, int notthisid); + bool check_team_balance(); + bool can_change_team(PLAYER *pplayer, int jointeam); int clampteam(int team); virtual void post_reset(); -- cgit 1.4.1