forked from Mirrorlandia_minetest/minetest
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:
parent
7e610aece5
commit
153f07fdfb
12
src/game.cpp
12
src/game.cpp
@ -115,18 +115,6 @@ struct TextDestChat : public TextDest
|
|||||||
if(text == L"")
|
if(text == L"")
|
||||||
return;
|
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
|
// Send to others
|
||||||
m_client->sendChatMessage(text);
|
m_client->sendChatMessage(text);
|
||||||
// Show locally
|
// Show locally
|
||||||
|
@ -3245,12 +3245,14 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
|
|||||||
u64 privs = getPlayerPrivs(player);
|
u64 privs = getPlayerPrivs(player);
|
||||||
|
|
||||||
// Parse commands
|
// Parse commands
|
||||||
std::wstring commandprefix = L"/#";
|
if(message[0] == L'/')
|
||||||
if(message.substr(0, commandprefix.size()) == commandprefix)
|
|
||||||
{
|
{
|
||||||
line += L"Server: ";
|
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);
|
WStrfnd f1(message);
|
||||||
f1.next(L" "); // Skip over /#whatever
|
f1.next(L" "); // Skip over /#whatever
|
||||||
|
Loading…
Reference in New Issue
Block a user