Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/tools/map_extractor/dbcfile.h src/tools/vmap4_extractor/adtfile.cpp src/tools/vmap4_extractor/adtfile.h src/tools/vmap4_extractor/loadlib/loadlib.h
This commit is contained in:
commit
81c99b3338
34 files changed
+142
-25
No files matched your search
@@ -182,6 +182,8 @@ template<class TObject> class UpdatableScript
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~UpdatableScript() { }
|
||||
|
||||
public:
|
||||
|
||||
virtual void OnUpdate(TObject* /*obj*/, uint32 /*diff*/) { }
|
||||
|
||||
Reference in new issue
Block a user