Skip to content

Commit

Permalink
Core/Commands: Convert lookup commands in commandscript
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vincent-Michael
Vincent-Michael committed Jul 6, 2012
1 parent 6a83cd4 commit 91cd710
Show file tree
Hide file tree
Showing 8 changed files with 1,394 additions and 1,357 deletions.
29 changes: 0 additions & 29 deletions src/server/game/Chat/Chat.cpp
View file
Expand Up @@ -112,34 +112,6 @@ ChatCommand* ChatHandler::getCommandTable()
{ NULL, 0, false, NULL, "", NULL }
};

static ChatCommand lookupPlayerCommandTable[] =
{
{ "ip", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleLookupPlayerIpCommand>, "", NULL },
{ "account", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleLookupPlayerAccountCommand>, "", NULL },
{ "email", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleLookupPlayerEmailCommand>, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};

static ChatCommand lookupCommandTable[] =
{
{ "area", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleLookupAreaCommand>, "", NULL },
{ "creature", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupCreatureCommand>, "", NULL },
{ "event", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleLookupEventCommand>, "", NULL },
{ "faction", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupFactionCommand>, "", NULL },
{ "item", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupItemCommand>, "", NULL },
{ "itemset", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupItemSetCommand>, "", NULL },
{ "object", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupObjectCommand>, "", NULL },
{ "quest", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupQuestCommand>, "", NULL },
{ "player", SEC_GAMEMASTER, true, NULL, "", lookupPlayerCommandTable },
{ "skill", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupSkillCommand>, "", NULL },
{ "spell", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupSpellCommand>, "", NULL },
{ "taxinode", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupTaxiNodeCommand>, "", NULL },
{ "tele", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleLookupTeleCommand>, "", NULL },
{ "title", SEC_GAMEMASTER, true, OldHandler<&ChatHandler::HandleLookupTitleCommand>, "", NULL },
{ "map", SEC_ADMINISTRATOR, true, OldHandler<&ChatHandler::HandleLookupMapCommand>, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};

static ChatCommand petCommandTable[] =
{
{ "create", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleCreatePetCommand>, "", NULL },
Expand Down Expand Up @@ -203,7 +175,6 @@ ChatCommand* ChatHandler::getCommandTable()

static ChatCommand commandTable[] =
{
{ "lookup", SEC_ADMINISTRATOR, true, NULL, "", lookupCommandTable },
{ "pdump", SEC_ADMINISTRATOR, true, NULL, "", pdumpCommandTable },
{ "group", SEC_ADMINISTRATOR, false, NULL, "", groupCommandTable },

Expand Down
18 changes: 0 additions & 18 deletions src/server/game/Chat/Chat.h
View file
Expand Up @@ -157,24 +157,6 @@ class ChatHandler
bool HandleBindSightCommand(const char* args);
bool HandleUnbindSightCommand(const char* args);

bool HandleLookupAreaCommand(const char* args);
bool HandleLookupCreatureCommand(const char* args);
bool HandleLookupEventCommand(const char* args);
bool HandleLookupFactionCommand(const char * args);
bool HandleLookupItemCommand(const char * args);
bool HandleLookupItemSetCommand(const char * args);
bool HandleLookupObjectCommand(const char* args);
bool HandleLookupPlayerIpCommand(const char* args);
bool HandleLookupPlayerAccountCommand(const char* args);
bool HandleLookupPlayerEmailCommand(const char* args);
bool HandleLookupQuestCommand(const char* args);
bool HandleLookupSkillCommand(const char* args);
bool HandleLookupSpellCommand(const char* args);
bool HandleLookupTaxiNodeCommand(const char * args);
bool HandleLookupTeleCommand(const char * args);
bool HandleLookupMapCommand(const char* args);
bool HandleLookupTitleCommand(const char * args);

bool HandlePDumpLoadCommand(const char *args);
bool HandlePDumpWriteCommand(const char *args);

Expand Down
134 changes: 0 additions & 134 deletions src/server/game/Chat/Commands/Level1.cpp
View file
Expand Up @@ -450,140 +450,6 @@ bool ChatHandler::HandleTaxiCheatCommand(const char* args)
return false;
}

bool ChatHandler::HandleLookupAreaCommand(const char* args)
{
if (!*args)
return false;

std::string namepart = args;
std::wstring wnamepart;

if (!Utf8toWStr (namepart, wnamepart))
return false;

bool found = false;
uint32 count = 0;
uint32 maxResults = sWorld->getIntConfig(CONFIG_MAX_RESULTS_LOOKUP_COMMANDS);

// converting string that we try to find to lower case
wstrToLower (wnamepart);

// Search in AreaTable.dbc
for (uint32 areaflag = 0; areaflag < sAreaStore.GetNumRows(); ++areaflag)
{
AreaTableEntry const* areaEntry = sAreaStore.LookupEntry(areaflag);
if (areaEntry)
{
int loc = GetSessionDbcLocale();
std::string name = areaEntry->area_name[loc];
if (name.empty())
continue;

if (!Utf8FitTo (name, wnamepart))
{
loc = 0;
for (; loc < TOTAL_LOCALES; ++loc)
{
if (loc == GetSessionDbcLocale())
continue;

name = areaEntry->area_name[loc];
if (name.empty())
continue;

if (Utf8FitTo (name, wnamepart))
break;
}
}

if (loc < TOTAL_LOCALES)
{
if (maxResults && count++ == maxResults)
{
PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);
return true;
}

// send area in "id - [name]" format
std::ostringstream ss;
if (m_session)
ss << areaEntry->ID << " - |cffffffff|Harea:" << areaEntry->ID << "|h[" << name << ' ' << localeNames[loc]<< "]|h|r";
else
ss << areaEntry->ID << " - " << name << ' ' << localeNames[loc];

SendSysMessage(ss.str().c_str());

if (!found)
found = true;
}
}
}

if (!found)
SendSysMessage(LANG_COMMAND_NOAREAFOUND);

return true;
}

//Find tele in game_tele order by name
bool ChatHandler::HandleLookupTeleCommand(const char * args)
{
if (!*args)
{
SendSysMessage(LANG_COMMAND_TELE_PARAMETER);
SetSentErrorMessage(true);
return false;
}

char const* str = strtok((char*)args, " ");
if (!str)
return false;

std::string namepart = str;
std::wstring wnamepart;

if (!Utf8toWStr(namepart, wnamepart))
return false;

// converting string that we try to find to lower case
wstrToLower(wnamepart);

std::ostringstream reply;
uint32 count = 0;
uint32 maxResults = sWorld->getIntConfig(CONFIG_MAX_RESULTS_LOOKUP_COMMANDS);
bool limitReached = false;

GameTeleContainer const & teleMap = sObjectMgr->GetGameTeleMap();
for (GameTeleContainer::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
{
GameTele const* tele = &itr->second;

if (tele->wnameLow.find(wnamepart) == std::wstring::npos)
continue;

if (maxResults && count++ == maxResults)
{
limitReached = true;
break;
}

if (m_session)
reply << " |cffffffff|Htele:" << itr->first << "|h[" << tele->name << "]|h|r\n";
else
reply << " " << itr->first << ' ' << tele->name << "\n";
}

if (reply.str().empty())
SendSysMessage(LANG_COMMAND_TELE_NOLOCATION);
else
PSendSysMessage(LANG_COMMAND_TELE_LOCATION, reply.str().c_str());

if (limitReached)
PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);

return true;
}

//Enable\Dissable accept whispers (for GM)
bool ChatHandler::HandleWhispersCommand(const char* args)
{
Expand Down

0 comments on commit 91cd710

Please sign in to comment.