sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Chat: fixed some commands

Browse Source 
This fixes all those commands that can take in input both a param and a subcommand, e.g.: .learn, .tele, etc...
This commit is contained in:
ShinDarth
2016-08-22 01:40:58 +02:00
parent d641365b3b
commit b6d2c9b226
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Chat/Chat.cpp
+4 -5
View File
@@ -247,7 +247,7 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
for (uint32 i = 0; i < table.size(); ++i) for (uint32 i = 0; i < table.size(); ++i)
{ {
// for data fill use full explicit command names // for data fill use full explicit command names
if (table[i].Name == nullptr || table[i].Name != cmd) if (table[i].Name == nullptr)
continue; continue;
if (!hasStringAbbr(table[i].Name, cmd.c_str())) if (!hasStringAbbr(table[i].Name, cmd.c_str()))
@@ -261,15 +261,14 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
if (!hasStringAbbr(table[j].Name, cmd.c_str())) if (!hasStringAbbr(table[j].Name, cmd.c_str()))
continue; continue;
if (strcmp(table[j].Name, cmd.c_str()) != 0) if (strcmp(table[j].Name, cmd.c_str()) == 0)
continue;
else
{ {
match = true; match = true;
break; break;
} }
} }
} }
if (match) if (match)
continue; continue;
@@ -278,7 +277,7 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c
{ {
if (!ExecuteCommandInTable(table[i].ChildCommands, text, fullcmd)) if (!ExecuteCommandInTable(table[i].ChildCommands, text, fullcmd))
{ {
if (text && text[0] != '\0') if (text[0] != '\0')
SendSysMessage(LANG_NO_SUBCMD); SendSysMessage(LANG_NO_SUBCMD);
else else
SendSysMessage(LANG_CMD_SYNTAX); SendSysMessage(LANG_CMD_SYNTAX);