# HG changeset patch # User unc0rr # Date 1230926462 0 # Node ID 4456a0dfc647d8dacefc3d30d01f2b891f568f2f # Parent 15a44630799314bd96af8b4f84b94762da8c35bd - Update some copyrights - Don't show users list in server message to those who can see it in lobby chat diff -r 15a446307993 -r 4456a0dfc647 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Fri Jan 02 19:54:23 2009 +0000 +++ b/QTfrontend/hwform.cpp Fri Jan 02 20:01:02 2009 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a free turn based strategy game - * Copyright (c) 2005-2008 Andrey Korotaev + * Copyright (c) 2005-2009 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r 15a446307993 -r 4456a0dfc647 QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Fri Jan 02 19:54:23 2009 +0000 +++ b/QTfrontend/newnetclient.cpp Fri Jan 02 20:01:02 2009 +0000 @@ -1,6 +1,7 @@ /* * Hedgewars, a free turn based strategy game * Copyright (c) 2006-2008 Ulyanov Igor + * Copyright (c) 2009 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r 15a446307993 -r 4456a0dfc647 netserver/HWProto.hs --- a/netserver/HWProto.hs Fri Jan 02 19:54:23 2009 +0000 +++ b/netserver/HWProto.hs Fri Jan 02 20:01:02 2009 +0000 @@ -82,7 +82,7 @@ (answerClientOnly ["TEAM_COLOR", teamname team, teamcolor team]) ++ (answerClientOnly ["HH_NUM", teamname team, show $ hhnum team]) -answerServerMessage clients = [\serverInfo -> (clientOnly, "SERVER_MESSAGE" : +answerServerMessage client clients = [\serverInfo -> (clientOnly, "SERVER_MESSAGE" : [(mainbody serverInfo) ++ clientsIn ++ (lastHour serverInfo)])] where mainbody serverInfo = serverMessage serverInfo ++ @@ -91,7 +91,7 @@ else "

Private server

" - clientsIn = "

" ++ (show $ length nicks) ++ " clients in: " ++ clientslist ++ "

" + clientsIn = if protocol client < 20 then "

" ++ (show $ length nicks) ++ " clients in: " ++ clientslist ++ "

" else [] clientslist = if not $ null nicks then foldr1 (\a b -> a ++ ", " ++ b) nicks else "" lastHour serverInfo = if isDedicated serverInfo then @@ -175,7 +175,7 @@ -- 'noRoom' clients state command handlers handleCmd_noRoom :: CmdHandler handleCmd_noRoom client clients rooms ["LIST"] = - (noChangeClients, noChangeRooms, answerServerMessage clients ++ (answerRoomsList $ concatMap roomInfo $ sameProtoRooms)) + (noChangeClients, noChangeRooms, answerServerMessage client clients ++ (answerRoomsList $ concatMap roomInfo $ sameProtoRooms)) where roomInfo room = [ name room,