# HG changeset patch # User unc0rr # Date 1329760338 -14400 # Node ID 7dbf8a0c1f5d3e8932c110964392a8f969a83b54 # Parent 84261c3408a619bb6d2318ce45bdf799e3850e54 - Register HWTeam metatype so HWTeam objects could be passed via queued connections - A bit more verbose server message about unknown protocol command diff -r 84261c3408a6 -r 7dbf8a0c1f5d QTfrontend/main.cpp --- a/QTfrontend/main.cpp Mon Feb 20 20:33:26 2012 +0400 +++ b/QTfrontend/main.cpp Mon Feb 20 21:52:18 2012 +0400 @@ -30,6 +30,7 @@ #include "hwform.h" #include "hwconsts.h" +#include "newnetclient.h" #include "HWDataManager.h" @@ -151,6 +152,8 @@ Q_INIT_RESOURCE(hedgewars); + qRegisterMetaType("HWTeam"); + bindir->cd("bin"); // workaround over NSIS installer if(cConfigDir->length() == 0) diff -r 84261c3408a6 -r 7dbf8a0c1f5d gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Mon Feb 20 20:33:26 2012 +0400 +++ b/gameServer/HWProtoInRoomState.hs Mon Feb 20 21:52:18 2012 +0400 @@ -286,4 +286,6 @@ where engineMsg cl = toEngineMsg $ B.concat ["b", nick cl, "(team): ", msg, "\x20\x20"] -handleCmd_inRoom _ = return [ProtocolError "Incorrect command (state: in room)"] +handleCmd_inRoom (s:_) = return [ProtocolError $ "Incorrect command '" `B.append` s `B.append` "' (state: in room)"] + +handleCmd_inRoom [] = return [ProtocolError "Empty command (state: in room)"]