summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game.cpp12
-rw-r--r--src/server.cpp8
2 files changed, 5 insertions, 15 deletions
diff --git a/src/game.cpp b/src/game.cpp
index ab3852137..22fab706c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -114,18 +114,6 @@ struct TextDestChat : public TextDest
// Discard empty line
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);
diff --git a/src/server.cpp b/src/server.cpp
index 5b657bc2e..1f33a66f5 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -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