diff options
| author | Carbenium <carbenium@outlook.com> | 2021-06-27 01:13:20 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-11 13:53:58 +0100 |
| commit | e3730b7847bfbbc5863eabbd7f4a2ee56ed9696b (patch) | |
| tree | a471d947294cff70bc36bb28e7983704ba210d5a /src | |
| parent | 548e5bf0c3ba47fa56b1c024bbcd139d69a03e42 (diff) | |
Scripts/Commands: Convert honor command table to new system
(cherry picked from commit 5a5b232a44b4bd7cdec7e23999d5edbba1891761)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Accounts/RBAC.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_honor.cpp | 22 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index f885cf232a0..a44e168c9d7 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -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, diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index d2c7eb58385..16aaa5b6bc8 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -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; } |