Merge [SD2]

r1291 Move one misplaced script in yesterday commits.
r1292 Make own folder for tool, not needed for general work of SD2. - skip
r1293 Add script loader to simplify maintenance of scripts. The scripts must now be added to system/ScriptLoader.cpp instead of old way directly in ScriptMgr.

--HG--
branch : trunk

src/bindings/scripts/CMakeLists.txt

@@ -8,7 +8,6 @@ SET(trinityscript_LIB_SRCS
    base/escortAI.h
    base/guard_ai.cpp
    base/guard_ai.h
-   base/guards.cpp
    base/simple_ai.cpp
    base/simple_ai.h
    include/precompiled.cpp
@@ -502,12 +501,15 @@ SET(trinityscript_LIB_SRCS
    scripts/world/boss_taerar.cpp
    scripts/world/boss_ysondre.cpp
    scripts/world/go_scripts.cpp
+   scripts/world/guards.cpp
    scripts/world/item_scripts.cpp
    scripts/world/mob_generic_creature.cpp
    scripts/world/npc_innkeeper.cpp
    scripts/world/npc_professions.cpp
    scripts/world/npcs_special.cpp
    scripts/world/npc_taxi.cpp
+   system/ScriptLoader.cpp
+   system/ScriptLoader.h
    system.cpp
 )
 

src/bindings/scripts/VC80/80ScriptDev2.vcproj

@@ -379,10 +379,6 @@
                 RelativePath="..\base\guard_ai.h"
                 >
             </File>
-            <File
-                RelativePath="..\base\guards.cpp"
-                >
-            </File>
             <File
                 RelativePath="..\base\simple_ai.cpp"
                 >
@@ -2743,6 +2739,10 @@
                 RelativePath="..\scripts\world\go_scripts.cpp"
                 >
             </File>
+            <File
+                RelativePath="..\scripts\world\guards.cpp"
+                >
+            </File>
             <File
                 RelativePath="..\scripts\world\item_scripts.cpp"
                 >
@@ -2832,6 +2832,18 @@
 				>
 			</File>
 		</Filter>
+        <Filter
+            Name="system"
+            >
+            <File
+                RelativePath="..\system\ScriptLoader.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\system\ScriptLoader.h"
+                >
+            </File>
+        </Filter>
 		<File
 			RelativePath="..\ScriptMgr.cpp"
 			>

src/bindings/scripts/VC90/90ScriptDev2.vcproj

@@ -376,10 +376,6 @@
                 RelativePath="..\base\guard_ai.h"
                 >
             </File>
-            <File
-                RelativePath="..\base\guards.cpp"
-                >
-            </File>
             <File
                 RelativePath="..\base\simple_ai.cpp"
                 >
@@ -2740,6 +2736,10 @@
                 RelativePath="..\scripts\world\go_scripts.cpp"
                 >
             </File>
+            <File
+                RelativePath="..\scripts\world\guards.cpp"
+                >
+            </File>
             <File
                 RelativePath="..\scripts\world\item_scripts.cpp"
                 >
@@ -2829,6 +2829,18 @@
 				>
 			</File>
 		</Filter>
+        <Filter
+            Name="system"
+            >
+            <File
+                RelativePath="..\system\ScriptLoader.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\system\ScriptLoader.h"
+                >
+            </File>
+        </Filter>
 		<File
 			RelativePath="..\ScriptMgr.cpp"
 			>

src/bindings/scripts/system/ScriptLoader.h

@@ -0,0 +1,10 @@
+/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+* This program is free software licensed under GPL version 2
+* Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef SC_SCRIPTLOADER_H
+#define SC_SCRIPTLOADER_H
+
+void AddScripts();
+
+#endif