Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Fix room config being sent unmodified
authorunc0rr
Sun, 28 Feb 2016 00:00:46 +0300
changeset 11586 fd02a080d962
parent 11585 c8edd93b970f
child 11587 e54f8e0ca3bb
- Fix room config being sent unmodified - Fix server ghost color
gameServer/Actions.hs file | annotate | diff | comparison | revisions
share/hedgewars/Data/Scripts/Multiplayer/Racer.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua file | annotate | diff | comparison | revisions 
--- 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]
--- 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 = {}
--- 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 = {}
sheepy-clone