Mercurial Mercurial > hedgewars / 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.
- Update some copyrights
authorunc0rr
Fri, 02 Jan 2009 20:01:02 +0000
changeset 1569 4456a0dfc647
parent 1568 15a446307993
child 1570 4e6ee597fb34
- Update some copyrights - Don't show users list in server message to those who can see it in lobby chat
QTfrontend/hwform.cpp file | annotate | diff | comparison | revisions
QTfrontend/newnetclient.cpp file | annotate | diff | comparison | revisions
netserver/HWProto.hs file | annotate | diff | comparison | revisions 
--- 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 <unC0Rr@gmail.com>
+ * Copyright (c) 2005-2009 Andrey Korotaev <unC0Rr@gmail.com>
  *
  * 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
--- 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 <iulyanov@gmail.com>
+ * Copyright (c) 2009 Andrey Korotaev <unC0Rr@gmail.com>
  *
  * 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
--- 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
 				"<p align=center>Private server</p>"
 		
-		clientsIn = "<p align=left>" ++ (show $ length nicks) ++ " clients in: " ++ clientslist ++ "</p>"
+		clientsIn = if protocol client < 20 then "<p align=left>" ++ (show $ length nicks) ++ " clients in: " ++ clientslist ++ "</p>" 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,
hedgewars