Remove distinction between /# and / commands

No need to make the server command syntax more complicated than
necessary. If the need ever arise, we'll find some other way to
distinguish the client commands. Also, the /# syntax is deprecated and
will be made obsolete in time.
This commit is contained in:
Giuseppe Bilotta 2011-08-13 17:09:23 +02:00
parent 7e610aece5
commit 153f07fdfb
2 changed files with 5 additions and 15 deletions

@ -115,18 +115,6 @@ struct TextDestChat : public TextDest
if(text == L"")
return;
// Parse command (server command starts with "/#")
if(text[0] == L'/' && text[1] != L'#')
{
std::wstring reply = L"Local: ";
reply += L"Local commands not yet supported. "
L"Server prefix is \"/#\".";
m_client->addChatMessage(reply);
return;
}
// Send to others
m_client->sendChatMessage(text);
// Show locally

@ -3245,12 +3245,14 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
u64 privs = getPlayerPrivs(player);
// Parse commands
std::wstring commandprefix = L"/#";
if(message.substr(0, commandprefix.size()) == commandprefix)
if(message[0] == L'/')
{
line += L"Server: ";
message = message.substr(commandprefix.size());
size_t strip_size = 1;
if (message[1] == L'#') // support old-style commans
++strip_size;
message = message.substr(strip_size);
WStrfnd f1(message);
f1.next(L" "); // Skip over /#whatever