diff options
| author | megamage <none@none> | 2009-02-17 21:54:48 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-17 21:54:48 -0600 |
| commit | 89ba43ef3e3f8d4b563c9e8efaf06bf7f7b44065 (patch) | |
| tree | fbe73c4d529f195d51b8ca4b62be8443da80becf /src/bindings/interface | |
| parent | be53cfe1044d7e913c4c11a7245e2d2846826363 (diff) | |
| parent | 3931b802f1b8b890a615e5b2a4c0ed70407468d7 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/interface')
| -rw-r--r-- | src/bindings/interface/ScriptMgr.cpp | 1 | ||||
| -rw-r--r-- | src/bindings/interface/ScriptMgr.h | 1 | ||||
| -rw-r--r-- | src/bindings/interface/Scripts/sc_default.cpp | 1 | ||||
| -rw-r--r-- | src/bindings/interface/Scripts/sc_defines.cpp | 1 | ||||
| -rw-r--r-- | src/bindings/interface/Scripts/sc_defines.h | 1 | ||||
| -rw-r--r-- | src/bindings/interface/config.h | 1 | ||||
| -rw-r--r-- | src/bindings/interface/system.cpp | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/src/bindings/interface/ScriptMgr.cpp b/src/bindings/interface/ScriptMgr.cpp index 276b5fa3a54..0499db47e66 100644 --- a/src/bindings/interface/ScriptMgr.cpp +++ b/src/bindings/interface/ScriptMgr.cpp @@ -320,3 +320,4 @@ void ScriptedAI::DoGoHome() m_creature->GetMotionMaster()->MoveTargetedHome(); } */ + diff --git a/src/bindings/interface/ScriptMgr.h b/src/bindings/interface/ScriptMgr.h index 30d94ac01e1..911737f0011 100644 --- a/src/bindings/interface/ScriptMgr.h +++ b/src/bindings/interface/ScriptMgr.h @@ -159,3 +159,4 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI }; #endif + diff --git a/src/bindings/interface/Scripts/sc_default.cpp b/src/bindings/interface/Scripts/sc_default.cpp index 79796eba8f6..495de39c270 100644 --- a/src/bindings/interface/Scripts/sc_default.cpp +++ b/src/bindings/interface/Scripts/sc_default.cpp @@ -119,3 +119,4 @@ void AddSC_default() m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/interface/Scripts/sc_defines.cpp b/src/bindings/interface/Scripts/sc_defines.cpp index 2c7c4ec743f..5665a299106 100644 --- a/src/bindings/interface/Scripts/sc_defines.cpp +++ b/src/bindings/interface/Scripts/sc_defines.cpp @@ -152,3 +152,4 @@ uint32 GetSkillLevel(Player *player,uint32 trskill) return TRADESKILL_LEVEL_NONE; } + diff --git a/src/bindings/interface/Scripts/sc_defines.h b/src/bindings/interface/Scripts/sc_defines.h index 1f8b468dc05..e942e755ae0 100644 --- a/src/bindings/interface/Scripts/sc_defines.h +++ b/src/bindings/interface/Scripts/sc_defines.h @@ -96,3 +96,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill); // ----------------------------------- #endif + diff --git a/src/bindings/interface/config.h b/src/bindings/interface/config.h index f074f0a3351..eaef18f9aa4 100644 --- a/src/bindings/interface/config.h +++ b/src/bindings/interface/config.h @@ -31,3 +31,4 @@ #else #define TRINITY_DLL_EXPORT extern "C" export #endif + diff --git a/src/bindings/interface/system.cpp b/src/bindings/interface/system.cpp index 3c76284b5af..3cf3c7acf33 100644 --- a/src/bindings/interface/system.cpp +++ b/src/bindings/interface/system.cpp @@ -25,3 +25,4 @@ BOOL APIENTRY DllMain( HANDLE /*hModule*/, DWORD /*ul_reason_for_call*/, LPVOID return true; } #endif + |
