From 9d232dc0194a168a32962214bf47853a81842c08 Mon Sep 17 00:00:00 2001 From: ac_stef Date: Sat, 30 Aug 2008 23:39:04 +0000 Subject: [PATCH] autoteam fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2444 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clients2c.cpp | 2 +- source/src/server.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 8f6716d4..03ba98cb 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -628,7 +628,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) playerent *d = getclient(fpl); bool you = fpl == player1->clientnum; // sound? bool et = team_int(player1->team) != fnt; - conoutf("the server forced %s to %s team", you ? "you" : d ? colorname(d) : "", et ? "the enemy" : "your"); + conoutf("the server forced %s to%s team%s", you ? "you" : d ? colorname(d) : "", you ? "" : et ? " the enemy" : " your", you ? fnt ? " RVSF": " CLA" : ""); break; } diff --git a/source/src/server.cpp b/source/src/server.cpp index 67893cad..52722f8c 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1387,7 +1387,7 @@ bool refillteams(bool now, bool notify) // force only minimal amounts of player } if(pick < 0) break; // should really never happen // move picked player - forceteam(pick, !bigteam, false); + forceteam(pick, !bigteam, true, notify); diffnum -= 2; diffscore -= 2 * clients[pick]->at3_score;