diff -r 6b04a266feee -r 5182d44fb733 hedgewars/uFLNetProtocol.pas --- a/hedgewars/uFLNetProtocol.pas Thu Dec 03 23:59:06 2015 +0300 +++ b/hedgewars/uFLNetProtocol.pas Sat Dec 05 16:14:59 2015 +0300 @@ -18,6 +18,13 @@ var isInRoom: boolean; myNickname: shortstring; +procedure onRoomLeaving(); +begin + isInRoom:= false; + sendUI(mtMoveToLobby, nil, 0); + netResetTeams +end; + var teamIndex: LongInt; tmpTeam: TTeam; @@ -293,6 +300,7 @@ procedure handler_HH_NUM(var p: TCmdParamSS); begin + netSetHedgehogsNumber(p.str1, StrToInt(p.str2)) end; procedure handler_INFO(var p: TCmdParam); @@ -324,8 +332,7 @@ procedure handler_KICKED(var p: TCmdParam); begin - isInRoom:= false; - sendUI(mtMoveToLobby, nil, 0); + onRoomLeaving() end; procedure handler_LEFT(var p: TCmdParamSL); @@ -381,6 +388,7 @@ procedure handler_REMOVE_TEAM(var p: TCmdParamS); begin + netRemoveTeam(p.str1) end; var roomInfo: string; @@ -529,12 +537,12 @@ begin if isInRoom then begin - isInRoom:= false; s:= 'PART'; if length(msg) > 0 then s:= s + #10 + msg; sendNet(s); - sendUI(mtMoveToLobby, nil, 0); + + onRoomLeaving() end end;