netserver/Miscutils.hs
author unc0rr
Fri, 02 Jan 2009 21:00:27 +0000
changeset 1571 574063b456c0
parent 1558 3370b7ffeb5c
child 1577 e3e37c730dc0
permissions -rw-r--r--
Show joins of ppl with 097 too
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
849
82ac0596aa3c Start work on standalone server in Haskell
unc0rr
parents:
diff changeset
     1
module Miscutils where
82ac0596aa3c Start work on standalone server in Haskell
unc0rr
parents:
diff changeset
     2
82ac0596aa3c Start work on standalone server in Haskell
unc0rr
parents:
diff changeset
     3
import IO
82ac0596aa3c Start work on standalone server in Haskell
unc0rr
parents:
diff changeset
     4
import Control.Concurrent.STM
894
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
     5
import Data.Word
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
     6
import Data.Char
901
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
     7
import Data.List
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
     8
import Maybe (fromJust)
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
     9
import qualified Data.Map as Map
1478
8bfb417d165e Add simple DoS protection
unc0rr
parents: 1466
diff changeset
    10
import Data.Time
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    11
import Network
849
82ac0596aa3c Start work on standalone server in Haskell
unc0rr
parents:
diff changeset
    12
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    13
data ClientInfo =
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    14
 ClientInfo
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    15
	{
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    16
		chan :: TChan [String],
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
    17
		sendChan :: TChan [String],
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    18
		handle :: Handle,
1478
8bfb417d165e Add simple DoS protection
unc0rr
parents: 1466
diff changeset
    19
		host :: String,
8bfb417d165e Add simple DoS protection
unc0rr
parents: 1466
diff changeset
    20
		connectTime :: UTCTime,
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    21
		nick :: String,
894
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
    22
		protocol :: Word16,
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    23
		room :: String,
1391
735f6d43780b Implement kick
unc0rr
parents: 1383
diff changeset
    24
		isMaster :: Bool,
1403
b8c921ed0f13 Bring back old 'Go!' button behavior
unc0rr
parents: 1402
diff changeset
    25
		isReady :: Bool,
1391
735f6d43780b Implement kick
unc0rr
parents: 1383
diff changeset
    26
		forceQuit :: Bool
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    27
	}
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    28
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    29
instance Eq ClientInfo where
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    30
	a1 == a2 = handle a1 == handle a2
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    31
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    32
data HedgehogInfo =
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    33
	HedgehogInfo String String
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    34
1083
3448dd03483f Further work on dedicated server
unc0rr
parents: 1082
diff changeset
    35
data TeamInfo =
3448dd03483f Further work on dedicated server
unc0rr
parents: 1082
diff changeset
    36
	TeamInfo
3448dd03483f Further work on dedicated server
unc0rr
parents: 1082
diff changeset
    37
	{
1329
69ddc231a911 - Only team owner can remove team from the list
unc0rr
parents: 1327
diff changeset
    38
		teamowner :: String,
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    39
		teamname :: String,
1321
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
    40
		teamcolor :: String,
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
    41
		teamgrave :: String,
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
    42
		teamfort :: String,
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
    43
		difficulty :: Int,
1327
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
    44
		hhnum :: Int,
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    45
		hedgehogs :: [HedgehogInfo]
1083
3448dd03483f Further work on dedicated server
unc0rr
parents: 1082
diff changeset
    46
	}
3448dd03483f Further work on dedicated server
unc0rr
parents: 1082
diff changeset
    47
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    48
data RoomInfo =
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    49
	RoomInfo
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    50
	{
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    51
		name :: String,
1083
3448dd03483f Further work on dedicated server
unc0rr
parents: 1082
diff changeset
    52
		password :: String,
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    53
		roomProto :: Word16,
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    54
		teams :: [TeamInfo],
1333
b0b0510eb82d - Fix a bug with chosen map (new clinet gets wrong information)
unc0rr
parents: 1329
diff changeset
    55
		gamemap :: String,
1350
99a921e292f4 - Reverse the order of client list
unc0rr
parents: 1333
diff changeset
    56
		gameinprogress :: Bool,
1396
abb28dcb6d0d - Send additional info on rooms
unc0rr
parents: 1391
diff changeset
    57
		playersIn :: Int,
1403
b8c921ed0f13 Bring back old 'Go!' button behavior
unc0rr
parents: 1402
diff changeset
    58
		readyPlayers :: Int,
1411
df78c9571bc7 Room control menu works
unc0rr
parents: 1408
diff changeset
    59
		isRestrictedJoins :: Bool,
df78c9571bc7 Room control menu works
unc0rr
parents: 1408
diff changeset
    60
		isRestrictedTeams :: Bool,
1558
3370b7ffeb5c - Send previous moves info to newly connected client when it joins a room with already started game
unc0rr
parents: 1513
diff changeset
    61
		roundMsgs :: [String],
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
    62
		params :: Map.Map String [String]
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    63
	}
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    64
createRoom = (
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    65
	RoomInfo
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    66
		""
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    67
		""
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    68
		0
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    69
		[]
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    70
		"+rnd+"
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    71
		False
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    72
		1
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    73
		0
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    74
		False
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    75
		False
1558
3370b7ffeb5c - Send previous moves info to newly connected client when it joins a room with already started game
unc0rr
parents: 1513
diff changeset
    76
		[]
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    77
		Map.empty
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    78
	)
851
8ffa4ad0d8ea Introduce function to atomically change both lists
unc0rr
parents: 849
diff changeset
    79
1491
0b1f44751509 Make answers creation more abstract, in prepare for a conversion
unc0rr
parents: 1484
diff changeset
    80
data ServerInfo =
0b1f44751509 Make answers creation more abstract, in prepare for a conversion
unc0rr
parents: 1484
diff changeset
    81
	ServerInfo
0b1f44751509 Make answers creation more abstract, in prepare for a conversion
unc0rr
parents: 1484
diff changeset
    82
	{
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    83
		isDedicated :: Bool,
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    84
		serverMessage :: String,
1493
1e422bc5d863 Show last hour logins number
unc0rr
parents: 1492
diff changeset
    85
		listenPort :: PortNumber,
1e422bc5d863 Show last hour logins number
unc0rr
parents: 1492
diff changeset
    86
		loginsNumber :: Int,
1e422bc5d863 Show last hour logins number
unc0rr
parents: 1492
diff changeset
    87
		lastHourUsers :: [UTCTime]
1491
0b1f44751509 Make answers creation more abstract, in prepare for a conversion
unc0rr
parents: 1484
diff changeset
    88
	}
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    89
newServerInfo = (
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    90
	ServerInfo
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    91
		True
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    92
		"<h2><p align=center><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p></h2>"
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    93
		46631
1493
1e422bc5d863 Show last hour logins number
unc0rr
parents: 1492
diff changeset
    94
		0
1e422bc5d863 Show last hour logins number
unc0rr
parents: 1492
diff changeset
    95
		[]
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
    96
	)
1491
0b1f44751509 Make answers creation more abstract, in prepare for a conversion
unc0rr
parents: 1484
diff changeset
    97
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    98
type ClientsTransform = [ClientInfo] -> [ClientInfo]
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
    99
type RoomsTransform = [RoomInfo] -> [RoomInfo]
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   100
type HandlesSelector = ClientInfo -> [ClientInfo] -> [RoomInfo] -> [ClientInfo]
1492
2da1fe033f23 Finish refactoring
unc0rr
parents: 1491
diff changeset
   101
type Answer = ServerInfo -> (HandlesSelector, [String])
1491
0b1f44751509 Make answers creation more abstract, in prepare for a conversion
unc0rr
parents: 1484
diff changeset
   102
type CmdHandler = ClientInfo -> [ClientInfo] -> [RoomInfo] -> [String] -> (ClientsTransform, RoomsTransform, [Answer])
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   103
901
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   104
902
3cc10f0aae37 Finish conversion
unc0rr
parents: 901
diff changeset
   105
roomByName :: String -> [RoomInfo] -> RoomInfo
3cc10f0aae37 Finish conversion
unc0rr
parents: 901
diff changeset
   106
roomByName roomName rooms = fromJust $ find (\room -> roomName == name room) rooms
3cc10f0aae37 Finish conversion
unc0rr
parents: 901
diff changeset
   107
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   108
tselect :: [ClientInfo] -> STM ([String], ClientInfo)
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   109
tselect = foldl orElse retry . map (\ci -> (flip (,) ci) `fmap` readTChan (chan ci))
889
3bf9dc791f45 Some work on newhwserv
unc0rr
parents: 852
diff changeset
   110
894
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
   111
maybeRead :: Read a => String -> Maybe a
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
   112
maybeRead s = case reads s of
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
   113
	[(x, rest)] | all isSpace rest -> Just x
2ca76a7f3121 - Fixed some bugs
unc0rr
parents: 890
diff changeset
   114
	_         -> Nothing
901
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   115
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   116
deleteBy2t :: (a -> b -> Bool) -> b -> [a] -> [a]
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   117
deleteBy2t _  _ [] = []
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   118
deleteBy2t eq x (y:ys) = if y `eq` x then ys else y : deleteBy2t eq x ys
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   119
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   120
deleteFirstsBy2t :: (a -> b -> Bool) -> [a] -> [b] -> [a]
2f5ce9a584f9 Modify protocol implementation functions interface (convertation not yet finished)
unc0rr
parents: 895
diff changeset
   121
deleteFirstsBy2t eq =  foldl (flip (deleteBy2t eq))
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   122
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   123
--clientByHandle :: Handle -> [ClientInfo] -> Maybe ClientInfo
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   124
--clientByHandle chandle clients = find (\c -> handle c == chandle) clients
1466
c68b0a0969d3 It seems, I finally got the solution
unc0rr
parents: 1461
diff changeset
   125
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   126
sameRoom :: HandlesSelector
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   127
sameRoom client clients rooms = filter (\ci -> room ci == room client) clients
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   128
1484
c01512115c12 - Add es and sv translations to hedgewars.pro
unc0rr
parents: 1478
diff changeset
   129
noRoomSameProto :: HandlesSelector
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   130
noRoomSameProto client clients _ = filter (null . room) $ filter (\ci -> protocol client == protocol ci) clients
1484
c01512115c12 - Add es and sv translations to hedgewars.pro
unc0rr
parents: 1478
diff changeset
   131
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   132
othersInRoom :: HandlesSelector
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   133
othersInRoom client clients rooms = filter (client /=) $ filter (\ci -> room ci == room client) clients
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   134
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   135
fromRoom :: String -> HandlesSelector
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   136
fromRoom roomName _ clients _ = filter (\ci -> room ci == roomName) clients
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   137
1461
87e5a6c3882c Ping clients every 30 seconds, should help with ghosts on server
unc0rr
parents: 1411
diff changeset
   138
allClients :: HandlesSelector
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   139
allClients _ clients _ = clients
1461
87e5a6c3882c Ping clients every 30 seconds, should help with ghosts on server
unc0rr
parents: 1411
diff changeset
   140
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   141
clientOnly :: HandlesSelector
1513
a35c90263e27 Refactor server a bit, now all socket operations are in own threads, two per client
unc0rr
parents: 1493
diff changeset
   142
clientOnly client _ _ = [client]
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   143
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   144
noChangeClients :: ClientsTransform
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   145
noChangeClients a = a
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   146
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   147
modifyClient :: ClientInfo -> ClientsTransform
1321
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
   148
modifyClient _ [] = error "modifyClient: no such client"
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   149
modifyClient client (cl:cls) =
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   150
	if cl == client then
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   151
		client : cls
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   152
	else
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   153
		cl : (modifyClient client cls)
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   154
1408
fab171a17968 Unset ready status after round
unc0rr
parents: 1403
diff changeset
   155
modifyRoomClients :: RoomInfo -> (ClientInfo -> ClientInfo) -> ClientsTransform
fab171a17968 Unset ready status after round
unc0rr
parents: 1403
diff changeset
   156
modifyRoomClients clientsroom clientMod clients = map (\c -> if name clientsroom == room c then clientMod c else c) clients
fab171a17968 Unset ready status after round
unc0rr
parents: 1403
diff changeset
   157
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   158
noChangeRooms :: RoomsTransform
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   159
noChangeRooms a = a
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   160
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   161
addRoom :: RoomInfo -> RoomsTransform
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   162
addRoom room rooms = room:rooms
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   163
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   164
removeRoom :: String -> RoomsTransform
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 902
diff changeset
   165
removeRoom roomname rooms = filter (\rm -> roomname /= name rm) rooms
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
   166
1321
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
   167
modifyRoom :: RoomInfo -> RoomsTransform
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
   168
modifyRoom _ [] = error "changeRoomConfig: no such room"
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
   169
modifyRoom room (rm:rms) =
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
   170
	if name room == name rm then
d7dc4e86201e - Add protocol description (just started)
unc0rr
parents: 1317
diff changeset
   171
		room : rms
1317
13cf8c5a7428 Server now fully supports game options
unc0rr
parents: 1304
diff changeset
   172
	else
1402
c164f215f7d2 - Fix a bug screwing rooms list
unc0rr
parents: 1396
diff changeset
   173
		rm : modifyRoom room rms
1327
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   174
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   175
modifyTeam :: RoomInfo -> TeamInfo -> RoomInfo
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   176
modifyTeam room team = room{teams = replaceTeam team $ teams room}
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   177
	where
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   178
	replaceTeam _ [] = error "modifyTeam: no such team"
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   179
	replaceTeam team (t:teams) =
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   180
		if teamname team == teamname t then
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   181
			team : teams
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   182
		else
9d43a6e6b9ca Can choose hedgehogs number now
unc0rr
parents: 1321
diff changeset
   183
			t : replaceTeam team teams