--- a/QTfrontend/hwconsts.cpp.in Thu Nov 27 14:34:52 2008 +0000
+++ b/QTfrontend/hwconsts.cpp.in Thu Nov 27 14:36:22 2008 +0000
@@ -31,12 +31,12 @@
QString * cDefaultAmmoStore = new QString("eammstore 9391929422199121032235111001");
-QColor * color1 = new QColor( 0, 255, 255);
-QColor * color2 = new QColor(255, 127, 127);
-QColor * color3 = new QColor(103, 167, 231);
-QColor * color4 = new QColor( 37, 181, 61);
-QColor * color5 = new QColor(247, 237, 112);
-QColor * color6 = new QColor(192, 85, 160);
+QColor * color1 = new QColor(221, 0, 0);
+QColor * color2 = new QColor( 67, 118, 233);
+QColor * color3 = new QColor( 62, 147, 33);
+QColor * color4 = new QColor(162, 61, 187);
+QColor * color5 = new QColor(255, 147, 41);
+QColor * color6 = new QColor(115, 115, 115);
QString * netHost = new QString();
quint16 netPort = 46631;
--- a/netserver/hedgewars-server.hs Thu Nov 27 14:34:52 2008 +0000
+++ b/netserver/hedgewars-server.hs Thu Nov 27 14:36:22 2008 +0000
@@ -20,7 +20,7 @@
import System.Posix
#endif
-#define IOException Exception
+-- #define IOException Exception
data Messages =
Accept ClientInfo
@@ -107,7 +107,6 @@
let outHandles = concat clHandles'
unless (null outHandles) $ putStrLn ((show $ length outHandles) ++ " / " ++ (show $ length clients) ++ " : " ++ (show answer))
- -- strange, but this seems to be a bad idea to manually close these handles as it causes hangs
let mclients = deleteFirstsBy (==) clients outHandles
sendAnswers answers client mclients rooms
@@ -139,7 +138,7 @@
case r of
Accept ci -> do
let sameHostClients = filter (\cl -> host ci == host cl) clients
- let haveJustConnected = False--not $ null $ filter (\cl -> connectTime ci `diffUTCTime` connectTime cl <= 25) sameHostClients
+ let haveJustConnected = not $ null $ filter (\cl -> connectTime ci `diffUTCTime` connectTime cl <= 25) sameHostClients
when haveJustConnected $ do
atomically $ do