# HG changeset patch
# User unc0rr
# Date 1209657623 0
# Node ID 36f91881e83fb8f79c72048ef6c4192d6bbf639f
# Parent  344ba7dba23db1615fd078ec1a62555568d08b1d
 - Add comment
 - Modify JOIN reply

diff -r 344ba7dba23d -r 36f91881e83f netserver/HWProto.hs
--- a/netserver/HWProto.hs	Thu May 01 15:55:03 2008 +0000
+++ b/netserver/HWProto.hs	Thu May 01 16:00:23 2008 +0000
@@ -43,7 +43,7 @@
 	if haveSameRoom then
 		(client, rooms, [client], ["WARNING", "There's already a room with that name"])
 	else
-		(client{room = newRoom, isMaster = True}, (RoomInfo newRoom roomPassword):rooms, [client], ["JOIN", newRoom, nick client])
+		(client{room = newRoom, isMaster = True}, (RoomInfo newRoom roomPassword):rooms, [client], ["JOINS", nick client])
 	where
 		haveSameRoom = not . null $ filter (\room -> newRoom == name room) rooms
 
@@ -56,13 +56,13 @@
 	else if roomPassword /= password (getRoom roomName) then
 		(client, rooms, [client], ["WARNING", "Wrong password"])
 	else
-		(client{room = roomName}, rooms, client : fromRoom roomName clients, ["JOIN", roomName, nick client])
+		(client{room = roomName}, rooms, client : fromRoom roomName clients, ["JOINS", nick client])
 	where
 		noRoom = null $ filter (\room -> roomName == name room) rooms
 		getRoom roomName = fromJust $ find (\room -> roomName == name room) rooms
 
 handleCmd_noRoom client clients rooms ("JOIN":roomName:[]) =
-	handleCmd_noRoom client clients rooms ["JOIN", roomName, ""]
+	handleCmd_noRoom client clients rooms ["JOIN", ""]
 
 handleCmd_noRoom client _ rooms _ = (client, rooms, [client], ["ERROR", "Bad command or incorrect parameter"])
 
@@ -78,7 +78,7 @@
 	if null (room client) then
 		(client, rooms, [client], ["QUIT"])
 	else if isMaster client then
-		(client, filter (\rm -> room client /= name rm) rooms, fromRoom (room client) clients, ["ROOMABANDONED"])
+		(client, filter (\rm -> room client /= name rm) rooms, fromRoom (room client) clients, ["ROOMABANDONED"]) -- core disconnect clients on ROOMABANDONED command
 	else
 		(client, rooms, fromRoom (room client) clients, ["QUIT", nick client])