# HG changeset patch # User unc0rr # Date 1456606846 -10800 # Node ID fd02a080d962dc32258deda1019ad0e54f101cc7 # Parent c8edd93b970f1ebd4d19485e672ad638151783ca - Fix room config being sent unmodified - Fix server ghost color diff -r c8edd93b970f -r fd02a080d962 gameServer/Actions.hs --- a/gameServer/Actions.hs Sat Feb 27 20:56:49 2016 +0300 +++ b/gameServer/Actions.hs Sun Feb 28 00:00:46 2016 +0300 @@ -732,13 +732,14 @@ ri <- clientRoomA rnc <- gets roomsClients thisRoomChans <- liftM (map sendChan) $ roomClientsS ri +#if defined(OFFICIAL_SERVER) rm <- io $ room'sM rnc id ri -#if defined(OFFICIAL_SERVER) points <- io $ loadFile (B.unpack $ "ghosts/" `B.append` sanitizeName location) when (roomProto rm > 51) $ do processAction $ ModifyRoom $ \r -> r{params = Map.insert "DRAWNMAP" [prependGhostPoints (toP points) $ head $ (params r) Map.! "DRAWNMAP"] (params r)} #endif cl <- client's id + rm <- io $ room'sM rnc id ri mapM_ processAction $ map (replaceChans thisRoomChans) $ answerFullConfigParams cl (mapParams rm) (params rm) where loadFile :: String -> IO [Int] diff -r c8edd93b970f -r fd02a080d962 share/hedgewars/Data/Scripts/Multiplayer/Racer.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Sat Feb 27 20:56:49 2016 +0300 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Sun Feb 28 00:00:46 2016 +0300 @@ -94,7 +94,7 @@ local fastY = {} local fastCount = 0 local fastIndex = 0 -local fastColour = 0x0a0a0a +local fastColour = 0xffffffff local currX = {} local currY = {} diff -r c8edd93b970f -r fd02a080d962 share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua Sat Feb 27 20:56:49 2016 +0300 +++ b/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua Sun Feb 28 00:00:46 2016 +0300 @@ -173,7 +173,7 @@ local fastY = {} local fastCount = 0 local fastIndex = 0 -local fastColour = 0x0a0a0a +local fastColour = 0xffffffff local currX = {} local currY = {}