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

1 files changed, 52 insertions, 72 deletions

diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index e4a32705566..5518d35f66f 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -364,41 +364,9 @@
             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"
                     >
                 </File>
@@ -520,14 +488,6 @@
                 </File>
             </Filter>
             <Filter
-                Name="go"
-                >
-                <File
-                    RelativePath="..\scripts\go\go_scripts.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
                 Name="guard"
                 >
                 <File
@@ -544,14 +504,6 @@
                 </File>
             </Filter>
             <Filter
-                Name="item"
-                >
-                <File
-                    RelativePath="..\scripts\item\item_scripts.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
                 Name="kalimdor"
                 >
                 <File
@@ -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"
@@ -2776,14 +2712,6 @@
                 </Filter>
             </Filter>
             <Filter
-                Name="honor"
-                >
-            </Filter>
-            <Filter
-                Name="servers"
-                >
-            </Filter>
-            <Filter
                 Name="custom"
                 >
                 <File
@@ -2796,6 +2724,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"
 			>