ktf cleanup; demo playback fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2628 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-15 15:06:54 +00:00
parent 69e4cf7fde
commit 4dd4b46f2a
7 changed files with 30 additions and 28 deletions
@@ -627,11 +627,11 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)

        case SV_FORCETEAM:
        {
-            int team = getint(p);
+            int team = getint(p), oldteam = team_int(player1->team);
            int attr = getint(p);
            bool respawn = (attr & 1) == 1;
            changeteam(team, respawn);
-            if(attr & 2) hudoutf("you got forced to team %s", team_string(team));
+            if(attr & 2) hudoutf("you %s team %s", team == oldteam ? "stay in" : "got forced to", team_string(team));
            break;
        }