diff options
| author | KingPin <none@none> | 2008-11-02 16:53:46 -0600 |
|---|---|---|
| committer | KingPin <none@none> | 2008-11-02 16:53:46 -0600 |
| commit | d5beb2bbe97afa0e50df8a2cef49bcac4a607f4a (patch) | |
| tree | 4ce9fec826220b2476406e38915a15b6d00a4ce1 /src/bindings | |
| parent | 6633d3c680d4f75d743f705e9b26278674f11ee0 (diff) | |
[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE
* Disallowed sending wrapped items as COD
* Prevent loading and saving single target auras for pet in same way as already implemented for player
* Correctly limit use some flask types to zones.
* Fixed extracting common.MPQ under *nix
* Many small xleanups and fixes.
** mangos merge rev.
TEST REV so be careful of creepy crawly bugs!
--HG--
branch : trunk
Diffstat (limited to 'src/bindings')
| -rw-r--r-- | src/bindings/scripts/ScriptMgr.cpp | 6 | ||||
| -rw-r--r-- | src/bindings/scripts/ScriptMgr.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index be711d82a7b..64c49f0f1d2 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -1838,6 +1838,12 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target) //********************************* //*** Functions used internally *** +//Trinity_DLL_EXPORT +//char const* ScriptsVersion() +//{ +// return "Default Trinity scripting library"; +//} + Script* GetScriptByName(std::string Name) { if (Name.empty()) diff --git a/src/bindings/scripts/ScriptMgr.h b/src/bindings/scripts/ScriptMgr.h index c7a8cea1e0a..83b2c0dd7a0 100644 --- a/src/bindings/scripts/ScriptMgr.h +++ b/src/bindings/scripts/ScriptMgr.h @@ -77,9 +77,9 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target = NULL); #ifdef WIN32 #define TRINITY_DLL_EXPORT extern "C" __declspec(dllexport) #elif defined( __GNUC__ ) - #define TRINITY_DLL_EXPORT extern "C" +#define TRINITY_DLL_EXPORT extern "C" #else - #define TRINITY_DLL_EXPORT extern "C" export +#define TRINITY_DLL_EXPORT extern "C" export #endif #endif |