Merge [SD2]

r1287 Move all non-instance scripts that are not related to any special continent to new world folder.
sorry about mistake in last sd2 merge. there should be:
r1286 Restructure file layout and move all non-instance source files to a logical continental single folder.

--HG--
branch : trunk

src/bindings/scripts/CMakeLists.txt

@@ -10,12 +10,6 @@ SET(trinityscript_LIB_SRCS
    include/sc_creature.h
    include/sc_gossip.h
    include/sc_instance.h
-   scripts/areatrigger/areatrigger_scripts.cpp
-   scripts/boss/boss_emeriss.cpp
-   scripts/boss/boss_lethon.cpp
-   scripts/boss/boss_taerar.cpp
-   scripts/boss/boss_ysondre.cpp
-   scripts/creature/mob_generic_creature.cpp
    scripts/creature/simple_ai.cpp
    scripts/creature/simple_ai.h
    scripts/eastern_kingdoms/alterac_mountains.cpp
@@ -44,11 +38,9 @@ SET(trinityscript_LIB_SRCS
    scripts/examples/example_escort.cpp
    scripts/examples/example_gossip_codebox.cpp
    scripts/examples/example_misc.cpp
-   scripts/go/go_scripts.cpp
    scripts/guard/guard_ai.cpp
    scripts/guard/guard_ai.h
    scripts/guard/guards.cpp
-   scripts/item/item_scripts.cpp
    scripts/kalimdor/ashenvale.cpp
    scripts/kalimdor/azshara.cpp
    scripts/kalimdor/azuremyst_isle.cpp
@@ -78,10 +70,6 @@ SET(trinityscript_LIB_SRCS
    scripts/northrend/zuldrak.cpp
    scripts/npc/npc_escortAI.cpp
    scripts/npc/npc_escortAI.h
-   scripts/npc/npc_innkeeper.cpp
-   scripts/npc/npc_professions.cpp
-   scripts/npc/npcs_special.cpp
-   scripts/npc/npc_taxi.cpp
    scripts/outland/blades_edge_mountains.cpp
    scripts/outland/boss_doomlord_kazzak.cpp
    scripts/outland/boss_doomwalker.cpp
@@ -508,6 +496,18 @@ SET(trinityscript_LIB_SRCS
    scripts/zone/ulduar/ulduar/boss_yoggsaron.cpp
    scripts/zone/ulduar/ulduar/def_ulduar.h
    scripts/zone/ulduar/ulduar/instance_ulduar.cpp
+   scripts/world/areatrigger_scripts.cpp
+   scripts/world/boss_emeriss.cpp
+   scripts/world/boss_lethon.cpp
+   scripts/world/boss_taerar.cpp
+   scripts/world/boss_ysondre.cpp
+   scripts/world/go_scripts.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.cpp
 )
 

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

@@ -363,41 +363,9 @@
         <Filter
             Name="scripts"
             >
-            <Filter
-                Name="areatrigger"
-                >
-                <File
-                    RelativePath="..\scripts\areatrigger\areatrigger_scripts.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="boss"
-                >
-                <File
-                    RelativePath="..\scripts\boss\boss_emeriss.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\boss\boss_lethon.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\boss\boss_taerar.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\boss\boss_ysondre.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="creature"
                 >
-                <File
-                    RelativePath="..\scripts\creature\mob_generic_creature.cpp"
-                    >
-                </File>
                 <File
                     RelativePath="..\scripts\creature\simple_ai.cpp"
                     >
@@ -519,14 +487,6 @@
                     >
                 </File>
             </Filter>
-            <Filter
-                Name="go"
-                >
-                <File
-                    RelativePath="..\scripts\go\go_scripts.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="guard"
                 >
@@ -543,14 +503,6 @@
                     >
                 </File>
             </Filter>
-            <Filter
-                Name="item"
-                >
-                <File
-                    RelativePath="..\scripts\item\item_scripts.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="kalimdor"
                 >
@@ -677,22 +629,6 @@
                     RelativePath="..\scripts\npc\npc_escortAI.h"
                     >
                 </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_innkeeper.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_professions.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_taxi.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npcs_special.cpp"
-                    >
-                </File>
             </Filter>
             <Filter
                 Name="outland"
@@ -2775,14 +2711,6 @@
                     </Filter>
                 </Filter>
             </Filter>
-            <Filter
-                Name="honor"
-                >
-            </Filter>
-            <Filter
-                Name="servers"
-                >
-            </Filter>
             <Filter
                 Name="custom"
                 >
@@ -2795,6 +2723,58 @@
                     >
                 </File>
             </Filter>
+        </Filter>
+        <Filter
+            Name="world"
+            >
+            <File
+                RelativePath="..\scripts\world\areatrigger_scripts.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_emeriss.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_lethon.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_taerar.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_ysondre.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\go_scripts.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\item_scripts.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\mob_generic_creature.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npc_innkeeper.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npc_professions.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npc_taxi.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npcs_special.cpp"
+                >
+            </File>
         </Filter>
 		<Filter
 			Name="Include"

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

@@ -360,41 +360,9 @@
         <Filter
             Name="scripts"
             >
-            <Filter
-                Name="areatrigger"
-                >
-                <File
-                    RelativePath="..\scripts\areatrigger\areatrigger_scripts.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="boss"
-                >
-                <File
-                    RelativePath="..\scripts\boss\boss_emeriss.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\boss\boss_lethon.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\boss\boss_taerar.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\boss\boss_ysondre.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="creature"
                 >
-                <File
-                    RelativePath="..\scripts\creature\mob_generic_creature.cpp"
-                    >
-                </File>
                 <File
                     RelativePath="..\scripts\creature\simple_ai.cpp"
                     >
@@ -516,14 +484,6 @@
                     >
                 </File>
             </Filter>
-            <Filter
-                Name="go"
-                >
-                <File
-                    RelativePath="..\scripts\go\go_scripts.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="guard"
                 >
@@ -540,14 +500,6 @@
                     >
                 </File>
             </Filter>
-            <Filter
-                Name="item"
-                >
-                <File
-                    RelativePath="..\scripts\item\item_scripts.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="kalimdor"
                 >
@@ -674,22 +626,6 @@
                     RelativePath="..\scripts\npc\npc_escortAI.h"
                     >
                 </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_innkeeper.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_professions.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_taxi.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npcs_special.cpp"
-                    >
-                </File>
             </Filter>
             <Filter
                 Name="outland"
@@ -2772,14 +2708,6 @@
                     </Filter>
                 </Filter>
             </Filter>
-            <Filter
-                Name="honor"
-                >
-            </Filter>
-            <Filter
-                Name="servers"
-                >
-            </Filter>
             <Filter
                 Name="custom"
                 >
@@ -2792,6 +2720,58 @@
                     >
                 </File>
             </Filter>
+        </Filter>
+        <Filter
+            Name="world"
+            >
+            <File
+                RelativePath="..\scripts\world\areatrigger_scripts.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_emeriss.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_lethon.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_taerar.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\boss_ysondre.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\go_scripts.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\item_scripts.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\mob_generic_creature.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npc_innkeeper.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npc_professions.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npc_taxi.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\scripts\world\npcs_special.cpp"
+                >
+            </File>
         </Filter>
 		<Filter
 			Name="Include"

src/bindings/scripts/scripts/item/item_test.cpp

@@ -1,43 +0,0 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* ScriptData
-SDName: Item_Test
-SD%Complete: 100
-SDComment: Used for Testing Item Scripts
-SDCategory: Items
-EndScriptData */
-
-#include "precompiled.h"
-
-extern void LoadDatabase();
-
-bool ItemUse_item_test(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
-{
-    LoadDatabase();
-    return true;
-}
-
-void AddSC_item_test()
-{
-    Script *newscript;
-
-    newscript = new Script;
-    newscript->Name="item_test";
-    newscript->pItemUse = &ItemUse_item_test;
-    newscript->RegisterSelf();
-}
-