From 50a7722242197f9a3b4300e154c1e66d1177839a Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Thu, 19 Jan 2012 18:12:39 +0000
Subject: Terrain generation is synchronous again, async generation has bugs.
 Made some funky smart pointer things for chunks. Fixed a bug where the client
 would override the player position on the server and back again, resulting in
 sending too many chunks to the client which it doesn't even need. Fixed some
 compiler warnings in cPickup.cpp

git-svn-id: http://mc-server.googlecode.com/svn/trunk@164 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 VC2010/MCServer.vcxproj         | 1 +
 VC2010/MCServer.vcxproj.filters | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'VC2010')

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index 1186a6b5c..4c0a3cca7 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -522,6 +522,7 @@
     <ClInclude Include="..\source\packets\cPacket_WindowClick.h" />
     <ClInclude Include="..\source\packets\cPacket_WindowClose.h" />
     <ClInclude Include="..\source\packets\cPacket_WindowOpen.h" />
+    <ClInclude Include="..\source\ptr_cChunk.h" />
     <ClInclude Include="..\source\SquirrelBindings.h" />
     <ClInclude Include="..\source\Vector3d.h" />
     <ClInclude Include="..\source\Vector3f.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index 203933c48..4ed54000a 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -448,6 +448,9 @@
     <Filter Include="cInventory\cCreativeInventory">
       <UniqueIdentifier>{69e6a927-8e49-4d39-af88-f587d17bb8a3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="!Smart_Pointers">
+      <UniqueIdentifier>{9bd7a65c-b60f-4905-ae2b-7c3c7586eaef}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\source\cServer.cpp">
@@ -1371,6 +1374,9 @@
     <ClInclude Include="..\source\cSurvivalInventory.h">
       <Filter>cInventory\cSurvivalInventory</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\ptr_cChunk.h">
+      <Filter>!Smart_Pointers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\source\AllToLua.pkg">
-- 
cgit v1.2.3