Merge branch 'master' of git://github.com/mangos/mangos

Archives · Dec 11, 2010 · 30adc69 · 30adc69
2 parents d4c764e + 62ecfd3
commit 30adc69
Show file tree

Hide file tree

Showing 69 changed files with 3,019 additions and 1,760 deletions.
diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
@@ -22,7 +22,7 @@ ADD_DEFINITIONS("-ggdb")
 ADD_DEFINITIONS("-O3")
 
 include_directories(../../src/shared)
-include_directories(../../src/shared/vmap/)
+include_directories(../../src/game/vmap/)
 include_directories(../../dep/include/g3dlite/)
 include_directories(../../dep/ACE_wrappers/)
 include_directories(../../objdir/dep/ACE_wrappers)
@@ -69,12 +69,12 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
 	)
 
 add_library(vmap
-	../../src/shared/vmap/BIH.cpp
-	../../src/shared/vmap/VMapManager2.cpp
-	../../src/shared/vmap/MapTree.cpp
-	../../src/shared/vmap/TileAssembler.cpp
-	../../src/shared/vmap/WorldModel.cpp
-	../../src/shared/vmap/ModelInstance.cpp
+	../../src/game/vmap/BIH.cpp
+	../../src/game/vmap/VMapManager2.cpp
+	../../src/game/vmap/MapTree.cpp
+	../../src/game/vmap/TileAssembler.cpp
+	../../src/game/vmap/WorldModel.cpp
+	../../src/game/vmap/ModelInstance.cpp
 	)
 
 target_link_libraries(vmap g3dlite z)

diff --git a/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj b/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -110,7 +110,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -137,7 +137,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -182,21 +182,21 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\vmap_assembler.cpp" />
-    <ClCompile Include="..\..\..\src\shared\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\..\src\shared\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\..\src\shared\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\..\src\shared\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\..\src\shared\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\..\src\shared\vmap\WorldModel.cpp" />
+    <ClCompile Include="..\..\..\src\game\vmap\BIH.cpp" />
+    <ClCompile Include="..\..\..\src\game\vmap\MapTree.cpp" />
+    <ClCompile Include="..\..\..\src\game\vmap\ModelInstance.cpp" />
+    <ClCompile Include="..\..\..\src\game\vmap\TileAssembler.cpp" />
+    <ClCompile Include="..\..\..\src\game\vmap\VMapManager2.cpp" />
+    <ClCompile Include="..\..\..\src\game\vmap\WorldModel.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\shared\vmap\BIH.h" />
-    <ClInclude Include="..\..\..\src\shared\vmap\MapTree.h" />
-    <ClInclude Include="..\..\..\src\shared\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\..\src\shared\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\..\src\shared\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\..\src\shared\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\..\src\shared\vmap\WorldModel.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\BIH.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\MapTree.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\ModelInstance.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\TileAssembler.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\VMapManager2.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\VMapTools.h" />
+    <ClInclude Include="..\..\..\src\game\vmap\WorldModel.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\win\VC100\g3dlite.vcxproj">

diff --git a/contrib/vmap_assembler/VC80/vmap_assembler.vcproj b/contrib/vmap_assembler/VC80/vmap_assembler.vcproj
@@ -40,8 +40,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,8 +119,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
@@ -190,55 +190,55 @@
 			Name="vmaplib"
 			>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BIH.cpp"
+				RelativePath="..\..\..\src\game\vmap\BIH.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BIH.h"
+				RelativePath="..\..\..\src\game\vmap\BIH.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\MapTree.cpp"
+				RelativePath="..\..\..\src\game\vmap\MapTree.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\MapTree.h"
+				RelativePath="..\..\..\src\game\vmap\MapTree.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp"
+				RelativePath="..\..\..\src\game\vmap\ModelInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelInstance.h"
+				RelativePath="..\..\..\src\game\vmap\ModelInstance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp"
+				RelativePath="..\..\..\src\game\vmap\TileAssembler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TileAssembler.h"
+				RelativePath="..\..\..\src\game\vmap\TileAssembler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp"
+				RelativePath="..\..\..\src\game\vmap\VMapManager2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapManager2.h"
+				RelativePath="..\..\..\src\game\vmap\VMapManager2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapTools.h"
+				RelativePath="..\..\..\src\game\vmap\VMapTools.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp"
+				RelativePath="..\..\..\src\game\vmap\WorldModel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\WorldModel.h"
+				RelativePath="..\..\..\src\game\vmap\WorldModel.h"
 				>
 			</File>
 		</Filter>

diff --git a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj b/contrib/vmap_assembler/VC90/vmap_assembler.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
@@ -191,55 +191,55 @@
 			Name="vmaplib"
 			>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BIH.cpp"
+				RelativePath="..\..\..\src\game\vmap\BIH.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BIH.h"
+				RelativePath="..\..\..\src\game\vmap\BIH.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\MapTree.cpp"
+				RelativePath="..\..\..\src\game\vmap\MapTree.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\MapTree.h"
+				RelativePath="..\..\..\src\game\vmap\MapTree.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp"
+				RelativePath="..\..\..\src\game\vmap\ModelInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelInstance.h"
+				RelativePath="..\..\..\src\game\vmap\ModelInstance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp"
+				RelativePath="..\..\..\src\game\vmap\TileAssembler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TileAssembler.h"
+				RelativePath="..\..\..\src\game\vmap\TileAssembler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp"
+				RelativePath="..\..\..\src\game\vmap\VMapManager2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapManager2.h"
+				RelativePath="..\..\..\src\game\vmap\VMapManager2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapTools.h"
+				RelativePath="..\..\..\src\game\vmap\VMapTools.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp"
+				RelativePath="..\..\..\src\game\vmap\WorldModel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\WorldModel.h"
+				RelativePath="..\..\..\src\game\vmap\WorldModel.h"
 				>
 			</File>
 		</Filter>