# HG changeset patch # User unc0rr # Date 1223572469 0 # Node ID 4e88eccbe7f6856f41042e6b6ac8d091fa703431 # Parent c795cbc752c10ccf9a2a771f714ce5becb42b1e1 Fix team colors mismatch on some conditions (just synchronize them when team is added) diff -r c795cbc752c1 -r 4e88eccbe7f6 QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Thu Oct 09 16:05:01 2008 +0000 +++ b/QTfrontend/newnetclient.cpp Thu Oct 09 17:14:29 2008 +0000 @@ -66,6 +66,8 @@ } RawSendNet(QString("CREATE%1%2").arg(delimeter).arg(room)); + m_pGameCFGWidget->setEnabled(true); + //m_pTeamSelWidget->setNonInteractive(); isChief = true; } diff -r c795cbc752c1 -r 4e88eccbe7f6 netserver/HWProto.hs --- a/netserver/HWProto.hs Thu Oct 09 16:05:01 2008 +0000 +++ b/netserver/HWProto.hs Thu Oct 09 17:14:29 2008 +0000 @@ -159,7 +159,7 @@ if length (teams clRoom) == 6 || canAddNumber <= 0 || isJust findTeam then (noChangeClients, noChangeRooms, answerCantAdd) else - (noChangeClients, modifyRoom clRoom{teams = teams clRoom ++ [newTeam]}, answerTeamAccepted newTeam ++ answerAddTeam newTeam) + (noChangeClients, modifyRoom clRoom{teams = teams clRoom ++ [newTeam]}, answerTeamAccepted newTeam ++ answerAddTeam newTeam ++ answerTeamColor name color) where clRoom = roomByName (room client) rooms newTeam = (TeamInfo (nick client) name color grave fort difficulty newTeamHHNum (hhsList hhsInfo))