Scripts/Commands: Convert honor command table to new system

(cherry picked from commit 5a5b232a44)
This commit is contained in:
Carbenium
2021-06-27 01:13:20 +02:00
committed by Shauren
parent 548e5bf0c3
commit e3730b7847
2 changed files with 11 additions and 13 deletions

View File

@@ -277,7 +277,7 @@ enum RBACPermissions
RBAC_PERM_COMMAND_GUILD_UNINVITE = 405,
RBAC_PERM_COMMAND_GUILD_RANK = 406,
RBAC_PERM_COMMAND_GUILD_RENAME = 407,
RBAC_PERM_COMMAND_HONOR = 408,
// 408 previously used, do not reuse
RBAC_PERM_COMMAND_HONOR_ADD = 409,
RBAC_PERM_COMMAND_HONOR_ADD_KILL = 410,
RBAC_PERM_COMMAND_HONOR_UPDATE = 411,

View File

@@ -30,32 +30,30 @@ EndScriptData */
#include "RBAC.h"
#include "WorldSession.h"
#if TRINITY_COMPILER == TRINITY_COMPILER_GNU
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
using namespace Trinity::ChatCommands;
class honor_commandscript : public CommandScript
{
public:
honor_commandscript() : CommandScript("honor_commandscript") { }
std::vector<ChatCommand> GetCommands() const override
ChatCommandTable GetCommands() const override
{
static std::vector<ChatCommand> honorAddCommandTable =
static ChatCommandTable honorAddCommandTable =
{
{ "kill", rbac::RBAC_PERM_COMMAND_HONOR_ADD_KILL, false, &HandleHonorAddKillCommand, "" },
{ "", rbac::RBAC_PERM_COMMAND_HONOR_ADD, false, &HandleHonorAddCommand, "" },
{ "kill", HandleHonorAddKillCommand, rbac::RBAC_PERM_COMMAND_HONOR_ADD_KILL, Console::No },
{ "", HandleHonorAddCommand, rbac::RBAC_PERM_COMMAND_HONOR_ADD, Console::No },
};
static std::vector<ChatCommand> honorCommandTable =
static ChatCommandTable honorCommandTable =
{
{ "add", rbac::RBAC_PERM_COMMAND_HONOR_ADD, false, nullptr, "", honorAddCommandTable },
{ "update", rbac::RBAC_PERM_COMMAND_HONOR_UPDATE, false, &HandleHonorUpdateCommand, "" },
{ "add", honorAddCommandTable },
{ "update", HandleHonorUpdateCommand, rbac::RBAC_PERM_COMMAND_HONOR_UPDATE, Console::No },
};
static std::vector<ChatCommand> commandTable =
static ChatCommandTable commandTable =
{
{ "honor", rbac::RBAC_PERM_COMMAND_HONOR, false, nullptr, "", honorCommandTable },
{ "honor", honorCommandTable },
};
return commandTable;
}