ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'threading_rewrite' of https://github.com/ShinDarth/azerothcore-wotlk into threading_rewrite

Browse source
This commit is contained in:
Yehonal 2016-08-19 23:54:55 +02:00
commit ee0ead5e4f
36 changed files with 751 additions and 781 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Scripting/ScriptMgr.h
View file

@ -549,7 +549,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>
@ -969,7 +969,7 @@ class ScriptMgr
public: /* CommandScript */
std::vector<ChatCommand*> GetChatCommands();
std::vector<ChatCommand> GetChatCommands();
public: /* WeatherScript */