--- a/hedgewars/CCHandlers.inc	Mon Jul 02 16:21:07 2007 +0000
+++ b/hedgewars/CCHandlers.inc	Mon Jul 02 18:35:31 2007 +0000
@@ -54,11 +54,16 @@
    begin
    inc(TeamsCount);
    ParseCommand('ammstore 93919294221912103323', true);
-   TryDo(TeamsCount <= 5, 'Too many teams', true);
-   AddTeam
-   end;
+   TryDo(TeamsCount <= 6, 'Too many teams', true);
+   AddTeam;
+
 
-if GameType in [gmtDemo, gmtSave] then CurrentTeam^.ExtDriven:= true
+   if GameType in [gmtDemo, gmtSave] then CurrentTeam^.ExtDriven:= true;
+   val(s, CurrentTeam^.Color);
+   TryDo(CurrentTeam^.Color <> 0, 'Error: black team color', true);
+   CurrentTeam^.AdjColor:= CurrentTeam^.Color;
+   AdjustColor(CurrentTeam^.AdjColor)
+   end
 end;
 
 procedure chTeamLocal(var s: shortstring);
@@ -98,14 +103,6 @@
 CurrentTeam^.FortName:= s
 end;
 
-procedure chColor(var id: shortstring);
-begin
-if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/color"', true);
-val(id, CurrentTeam^.Color);
-CurrentTeam^.AdjColor:= CurrentTeam^.Color;
-AdjustColor(CurrentTeam^.AdjColor)
-end;
-
 procedure chAddHH(var id: shortstring);
 var s: shortstring;
     Gear: PGear;