diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-18 19:40:30 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-18 19:40:30 +0200 |
| commit | ef5bc9c70a6b50e1244a91fb922ecab455f6966f (patch) | |
| tree | c018aa80719c1050314e67d9a5a8d5b2e173232a /src/server/game/Instances/InstanceScript.h | |
| parent | a3793b1741a6ff8cb71c858d12f8de6ca259f338 (diff) | |
| parent | 7228bd3664d9fa6a808e338a2fb2f519a6370672 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
Diffstat (limited to 'src/server/game/Instances/InstanceScript.h')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index de332afe627..ce9b2448dd4 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -249,7 +249,7 @@ AI* GetInstanceAI(T* obj, char const* scriptName) return new AI(obj); return NULL; -}; +} template<class AI, class T> AI* GetInstanceAI(T* obj) @@ -259,6 +259,6 @@ AI* GetInstanceAI(T* obj) return new AI(obj); return NULL; -}; +} #endif // TRINITY_INSTANCE_DATA_H |