# HG changeset patch
# User koda
# Date 1351802526 -3600
# Node ID a96614777ce6461249640b00ac74a0f3e563831b
# Parent  de3814a13f65623dbc21e0e1269b77db9b760339# Parent  6b074de32beadd30b9e5c6addcd6a2c465cc2bee
merge from default

diff -r de3814a13f65 -r a96614777ce6 CMakeLists.txt
diff -r de3814a13f65 -r a96614777ce6 QTfrontend/hwform.cpp
diff -r de3814a13f65 -r a96614777ce6 QTfrontend/res/BackgroundBirthday.png
Binary file QTfrontend/res/BackgroundBirthday.png has changed
diff -r de3814a13f65 -r a96614777ce6 QTfrontend/res/css/birthday.css
--- a/QTfrontend/res/css/birthday.css	Thu Nov 01 16:22:40 2012 -0400
+++ b/QTfrontend/res/css/birthday.css	Thu Nov 01 21:42:06 2012 +0100
@@ -21,7 +21,7 @@
 background-image: url(":/res/BackgroundBirthday.png");
 background-position: bottom center;
 background-repeat: repeat-x;
-background-color: black;
+background-color: #100308;
 }
 
 * {
diff -r de3814a13f65 -r a96614777ce6 QTfrontend/ui/page/pagemain.cpp
diff -r de3814a13f65 -r a96614777ce6 gameServer/Actions.hs
--- a/gameServer/Actions.hs	Thu Nov 01 16:22:40 2012 -0400
+++ b/gameServer/Actions.hs	Thu Nov 01 21:42:06 2012 +0100
@@ -62,6 +62,7 @@
     | ModifyRoom (RoomInfo -> RoomInfo)
     | ModifyServerInfo (ServerInfo -> ServerInfo)
     | AddRoom B.ByteString B.ByteString
+    | SendUpdateOnThisRoom
     | CheckRegistered
     | ClearAccountsCache
     | ProcessAccountInfo AccountInfo
@@ -319,6 +320,16 @@
     io $ removeRoom rnc ri
 
 
+processAction SendUpdateOnThisRoom = do
+    Just clId <- gets clientIndex
+    proto <- client's clientProto
+    rnc <- gets roomsClients
+    ri <- io $ clientRoomM rnc clId
+    rm <- io $ room'sM rnc id ri
+    chans <- liftM (map sendChan) $! sameProtoClientsS proto
+    processAction $ AnswerClients chans ("ROOM" : "UPD" : name rm : roomInfo (name rm) rm)
+
+
 processAction UnreadyRoomClients = do
     ri <- clientRoomA
     roomPlayers <- roomClientsS ri
@@ -348,6 +359,7 @@
                 }
             )
         : UnreadyRoomClients
+        : SendUpdateOnThisRoom
         : answerRemovedTeams
 
 
diff -r de3814a13f65 -r a96614777ce6 gameServer/HWProtoInRoomState.hs
--- a/gameServer/HWProtoInRoomState.hs	Thu Nov 01 16:22:40 2012 -0400
+++ b/gameServer/HWProtoInRoomState.hs	Thu Nov 01 21:42:06 2012 +0100
@@ -72,6 +72,7 @@
                 [Warning "restricted"]
             else
                 [ModifyRoom (\r -> r{teams = teams r ++ [newTeam ci clNick r teamColor]}),
+                SendUpdateOnThisRoom,
                 ModifyClient (\c -> c{teamsInGame = teamsInGame c + 1, clientClan = Just teamColor}),
                 AnswerClients clChan ["TEAM_ACCEPTED", tName],
                 AnswerClients othChans $ teamToNet $ newTeam ci clNick rm teamColor,
@@ -106,6 +107,7 @@
                 [ProtocolError "Not team owner!"]
             else
                 [RemoveTeam tName,
+                SendUpdateOnThisRoom,
                 ModifyClient
                     (\c -> c{
                         teamsInGame = teamsInGame c - 1,
@@ -194,6 +196,7 @@
                         }
                     )
                 , AnswerClients chans ["RUN_GAME"]
+                , SendUpdateOnThisRoom
                 , AnswerClients chans $ "CLIENT_FLAGS" : "+g" : nicks
                 , ModifyRoomClients (\c -> c{isInGame = True})
                 ]