Core/Commands: Refactored chat command script hook, fixes a crash when building with gcc 5
Closes #15616 Closes #15740 (cherry picked from commit 2d942ddcc528cc9fe718ebbd5903318fcbdab817) Conflicts: src/server/game/Chat/Chat.cpp src/server/scripts/Commands/cs_battlenet_account.cpp src/server/scripts/Commands/cs_cast.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/Commands/cs_go.cpp src/server/scripts/Commands/cs_misc.cpp src/server/scripts/Commands/cs_mmaps.cpp src/server/scripts/Commands/cs_npc.cpp src/server/scripts/Commands/cs_reload.cpp src/server/scripts/Commands/cs_ticket.cpp
This commit is contained in:
1 parent
1a5b0067a3
commit
af41a70fe8
47 files changed
+760
-1004
No files matched your search
@@ -553,7 +553,7 @@ class CommandScript : public ScriptObject
|
||||
public:
|
||||
|
||||
// Should return a pointer to a valid command table (ChatCommand array) to be used by ChatHandler.
|
||||
virtual ChatCommand* GetCommands() const = 0;
|
||||
virtual std::vector<ChatCommand> GetCommands() const = 0;
|
||||
};
|
||||
|
||||
class WeatherScript : public ScriptObject, public UpdatableScript<Weather>
|
||||
@@ -1013,7 +1013,7 @@ class ScriptMgr
|
||||
|
||||
public: /* CommandScript */
|
||||
|
||||
std::vector<ChatCommand*> GetChatCommands();
|
||||
std::vector<ChatCommand> GetChatCommands();
|
||||
|
||||
public: /* WeatherScript */
|
||||
|
||||
|
||||
Reference in new issue
Block a user