araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 13:39:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

[3.3.5] ChatCommands, the other half: chat command resolution refactor (PR #25463)

Browse Source 
(cherry picked from commit 1eca51b417)
This commit is contained in:
Treeston
2020-09-20 02:50:38 +02:00
committed by Shauren
parent 7a2c3af988
commit 3fd2eb126c
57 changed files with 1360 additions and 1294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_scene.cpp
+18 -41
View File
@@ -25,28 +25,30 @@
#include "RBAC.h"
#include "WorldSession.h"
using namespace Trinity::ChatCommands;
class scene_commandscript : public CommandScript
{
public:
scene_commandscript() : CommandScript("scene_commandscript") { }
std::vector<ChatCommand> GetCommands() const override
ChatCommandTable GetCommands() const override
{
static std::vector<ChatCommand> sceneCommandTable =
static ChatCommandTable sceneCommandTable =
{
{ "debug", rbac::RBAC_PERM_COMMAND_SCENE_DEBUG, false, &HandleDebugSceneCommand, "" },
{ "play", rbac::RBAC_PERM_COMMAND_SCENE_PLAY, false, &HandlePlaySceneCommand, "" },
{ "playpackage", rbac::RBAC_PERM_COMMAND_SCENE_PLAY_PACKAGE, false, &HandlePlayScenePackageCommand, "" },
{ "cancel", rbac::RBAC_PERM_COMMAND_SCENE_CANCEL, false, &HandleCancelSceneCommand, "" }
{ "debug", HandleDebugSceneCommand, rbac::RBAC_PERM_COMMAND_SCENE_DEBUG, Console::No },
{ "play", HandlePlaySceneCommand, rbac::RBAC_PERM_COMMAND_SCENE_PLAY, Console::No },
{ "playpackage", HandlePlayScenePackageCommand, rbac::RBAC_PERM_COMMAND_SCENE_PLAY_PACKAGE, Console::No },
{ "cancel", HandleCancelSceneCommand, rbac::RBAC_PERM_COMMAND_SCENE_CANCEL, Console::No }
};
static std::vector<ChatCommand> commandTable =
static ChatCommandTable commandTable =
{
{ "scene", rbac::RBAC_PERM_COMMAND_SCENE, true, nullptr, "", sceneCommandTable }
{ "scene", sceneCommandTable }
};
return commandTable;
}
static bool HandleDebugSceneCommand(ChatHandler* handler, char const* /*args*/)
static bool HandleDebugSceneCommand(ChatHandler* handler)
{
if (Player* player = handler->GetSession()->GetPlayer())
{
@@ -57,17 +59,8 @@ public:
return true;
}
static bool HandlePlaySceneCommand(ChatHandler* handler, char const* args)
static bool HandlePlaySceneCommand(ChatHandler* handler, uint32 sceneId)
{
if (!*args)
return false;
char const* sceneIdStr = strtok((char*)args, " ");
if (!sceneIdStr)
return false;
uint32 sceneId = atoi(sceneIdStr);
Player* target = handler->getSelectedPlayerOrSelf();
if (!target)
@@ -84,19 +77,8 @@ public:
return true;
}
static bool HandlePlayScenePackageCommand(ChatHandler* handler, char const* args)
static bool HandlePlayScenePackageCommand(ChatHandler* handler, uint32 sceneScriptPackageId, Optional<uint32> flags)
{
if (!*args)
return false;
char const* scenePackageIdStr = strtok((char*)args, " ");
char const* flagsStr = strtok(nullptr, "");
if (!scenePackageIdStr)
return false;
uint32 scenePackageId = atoi(scenePackageIdStr);
EnumFlag<SceneFlag> flags = flagsStr ? static_cast<SceneFlag>(atoi(flagsStr)) : SceneFlag::None;
Player* target = handler->getSelectedPlayerOrSelf();
if (!target)
@@ -106,18 +88,15 @@ public:
return false;
}
if (!sSceneScriptPackageStore.HasRecord(scenePackageId))
if (!sSceneScriptPackageStore.HasRecord(sceneScriptPackageId))
return false;
target->GetSceneMgr().PlaySceneByPackageId(scenePackageId, flags);
target->GetSceneMgr().PlaySceneByPackageId(sceneScriptPackageId, static_cast<SceneFlag>(flags.value_or(0)));
return true;
}
static bool HandleCancelSceneCommand(ChatHandler* handler, char const* args)
static bool HandleCancelSceneCommand(ChatHandler* handler, uint32 sceneScriptPackageId)
{
if (!*args)
return false;
Player* target = handler->getSelectedPlayerOrSelf();
if (!target)
@@ -127,12 +106,10 @@ public:
return false;
}
uint32 id = atoi((char*)args);
if (!sSceneScriptPackageStore.HasRecord(id))
if (!sSceneScriptPackageStore.HasRecord(sceneScriptPackageId))
return false;
target->GetSceneMgr().CancelSceneByPackageId(id);
target->GetSceneMgr().CancelSceneByPackageId(sceneScriptPackageId);
return true;
}
};