2 files changed, 122 insertions, 6 deletions

diff --git a/VC2010/MCServer.sln b/VC2010/MCServer.sln
index 4f9effab0..8433cbc9f 100644
--- a/VC2010/MCServer.sln
+++ b/VC2010/MCServer.sln
@@ -1,6 +1,6 @@
 

 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

+# Visual C++ Express 2010

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCServer", "MCServer.vcxproj", "{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}"

 	ProjectSection(ProjectDependencies) = postProject

 		{4571CE2D-9E18-452F-90D6-94AE8E2406F4} = {4571CE2D-9E18-452F-90D6-94AE8E2406F4}

@@ -22,20 +22,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squirrel_3_0_1_stable", "sq
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug with optimized Noise|Win32 = Debug with optimized Noise|Win32

+		Debug with optimized Noise|x64 = Debug with optimized Noise|x64

 		Debug|Win32 = Debug|Win32

 		Debug|x64 = Debug|x64

 		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug with optimized Noise|Win32.ActiveCfg = Debug with optimized Noise|Win32

+		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug with optimized Noise|Win32.Build.0 = Debug with optimized Noise|Win32

+		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug with optimized Noise|x64.ActiveCfg = Debug with optimized Noise|Win32

 		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug|Win32.Build.0 = Debug|Win32

-		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug|x64.ActiveCfg = Debug|x64

-		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug|x64.Build.0 = Debug|x64

+		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Debug|x64.ActiveCfg = Debug|Win32

 		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Release|Win32.ActiveCfg = Release|Win32

 		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Release|Win32.Build.0 = Release|Win32

-		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Release|x64.ActiveCfg = Release|x64

-		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Release|x64.Build.0 = Release|x64

+		{D8FE2186-4BF0-4B89-913F-6C26818E5AC5}.Release|x64.ActiveCfg = Release|Win32

+		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug with optimized Noise|Win32.ActiveCfg = Debug|Win32

+		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug with optimized Noise|Win32.Build.0 = Debug|Win32

+		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug with optimized Noise|x64.ActiveCfg = Debug|x64

+		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug with optimized Noise|x64.Build.0 = Debug|x64

 		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug|Win32.Build.0 = Debug|Win32

 		{F6F43A78-816D-4C37-A07B-68BED529273A}.Debug|x64.ActiveCfg = Debug|x64

@@ -44,6 +51,10 @@ Global
 		{F6F43A78-816D-4C37-A07B-68BED529273A}.Release|Win32.Build.0 = Release|Win32

 		{F6F43A78-816D-4C37-A07B-68BED529273A}.Release|x64.ActiveCfg = Release|x64

 		{F6F43A78-816D-4C37-A07B-68BED529273A}.Release|x64.Build.0 = Release|x64

+		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug with optimized Noise|Win32.ActiveCfg = Debug|Win32

+		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug with optimized Noise|Win32.Build.0 = Debug|Win32

+		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug with optimized Noise|x64.ActiveCfg = Debug|x64

+		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug with optimized Noise|x64.Build.0 = Debug|x64

 		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug|Win32.Build.0 = Debug|Win32

 		{5E511191-6F1F-4D0D-940A-B850780963D2}.Debug|x64.ActiveCfg = Debug|x64

@@ -52,6 +63,10 @@ Global
 		{5E511191-6F1F-4D0D-940A-B850780963D2}.Release|Win32.Build.0 = Release|Win32

 		{5E511191-6F1F-4D0D-940A-B850780963D2}.Release|x64.ActiveCfg = Release|x64

 		{5E511191-6F1F-4D0D-940A-B850780963D2}.Release|x64.Build.0 = Release|x64

+		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug with optimized Noise|Win32.ActiveCfg = Debug|Win32

+		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug with optimized Noise|Win32.Build.0 = Debug|Win32

+		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug with optimized Noise|x64.ActiveCfg = Debug|x64

+		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug with optimized Noise|x64.Build.0 = Debug|x64

 		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug|Win32.ActiveCfg = Debug|Win32

 		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug|Win32.Build.0 = Debug|Win32

 		{67B50249-6CEC-444E-A87A-D476112590ED}.Debug|x64.ActiveCfg = Debug|x64

@@ -60,6 +75,10 @@ Global
 		{67B50249-6CEC-444E-A87A-D476112590ED}.Release|Win32.Build.0 = Release|Win32

 		{67B50249-6CEC-444E-A87A-D476112590ED}.Release|x64.ActiveCfg = Release|x64

 		{67B50249-6CEC-444E-A87A-D476112590ED}.Release|x64.Build.0 = Release|x64

+		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug with optimized Noise|Win32.ActiveCfg = Debug|Win32

+		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug with optimized Noise|Win32.Build.0 = Debug|Win32

+		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug with optimized Noise|x64.ActiveCfg = Debug|x64

+		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug with optimized Noise|x64.Build.0 = Debug|x64

 		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug|Win32.Build.0 = Debug|Win32

 		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Debug|x64.ActiveCfg = Debug|x64

@@ -68,12 +87,18 @@ Global
 		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Release|Win32.Build.0 = Release|Win32

 		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Release|x64.ActiveCfg = Release|x64

 		{2B4BD5C6-91C0-4A74-939F-B28737FB0DC6}.Release|x64.Build.0 = Release|x64

+		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Debug with optimized Noise|Win32.ActiveCfg = Debug|Win32

+		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Debug with optimized Noise|Win32.Build.0 = Debug|Win32

+		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Debug with optimized Noise|x64.ActiveCfg = Debug|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Debug|Win32.ActiveCfg = Debug|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Debug|Win32.Build.0 = Debug|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Debug|x64.ActiveCfg = Debug|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Release|Win32.ActiveCfg = Release|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Release|Win32.Build.0 = Release|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Release|x64.ActiveCfg = Release|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug with optimized Noise|Win32.ActiveCfg = Debug|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug with optimized Noise|Win32.Build.0 = Debug|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug with optimized Noise|x64.ActiveCfg = Debug|Win32

 		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug|Win32.ActiveCfg = Debug|Win32

 		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug|Win32.Build.0 = Debug|Win32

 		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug|x64.ActiveCfg = Debug|Win32

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index bcd67a077..561827d31 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug with optimized Noise|Win32">

+      <Configuration>Debug with optimized Noise</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Debug|Win32">

       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

@@ -37,10 +41,17 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>Application</ConfigurationType>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

     <ConfigurationType>Application</ConfigurationType>

     <CharacterSet>NotSet</CharacterSet>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+  </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

@@ -53,18 +64,30 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">$(SolutionDir)..\</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|x64'">$(SolutionDir)..\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">$(Configuration)\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|x64'">$(Configuration)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">true</LinkIncremental>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|x64'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>

@@ -102,6 +125,35 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.5;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>Sync</ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalOptions>/IGNORE:4078 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>winmm.lib;ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>../$(ProjectName)_debug.exe</OutputFile>

+      <AdditionalLibraryDirectories>VLD;./Debug/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <GenerateMapFile>false</GenerateMapFile>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <AdditionalOptions>/ZI /D_DEBUG %(AdditionalOptions)</AdditionalOptions>

@@ -134,6 +186,38 @@
       </DataExecutionPrevention>

     </Link>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|x64'">

+    <ClCompile>

+      <AdditionalOptions>/ZI /D_DEBUG %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.5;..\mysql-connector\include;..\source\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <ExceptionHandling>Sync</ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalOptions>/IGNORE:4078 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>winmm.lib;ws2_32.lib;Psapi.lib;ZLib_d.lib;tolua++-1.0.93_d.lib;lua-5.1.4_d.lib;WebServer_d.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>../$(ProjectName)_debug.exe</OutputFile>

+      <AdditionalLibraryDirectories>VLD;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <GenerateMapFile>false</GenerateMapFile>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+  </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

@@ -248,7 +332,14 @@
     <ClCompile Include="..\source\cMCLogger.cpp" />

     <ClCompile Include="..\Source\cMonster.cpp" />

     <ClCompile Include="..\source\cMonsterConfig.cpp" />

-    <ClCompile Include="..\source\cNoise.cpp" />

+    <ClCompile Include="..\source\cNoise.cpp">

+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">ProgramDatabase</DebugInformationFormat>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">MaxSpeed</Optimization>

+      <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">true</IntrinsicFunctions>

+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">Speed</FavorSizeOrSpeed>

+      <OmitFramePointers Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">true</OmitFramePointers>

+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">Default</BasicRuntimeChecks>

+    </ClCompile>

     <ClCompile Include="..\source\cPassiveAggressiveMonster.cpp" />

     <ClCompile Include="..\source\cPassiveMonster.cpp" />

     <ClCompile Include="..\Source\cPawn.cpp" />