From d7068b35a85f0c0248a5533240087747d02e1a17 Mon Sep 17 00:00:00 2001
From: "lapayo94@gmail.com"
 <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Sun, 1 Jan 2012 04:55:17 +0000
Subject: - implemented separated inventory for creative mode
 (cSurvivalInventory and cCreativeInventory) (Separation is not perfect yet,
 because maybe there are some mayor changes needed :D) - implemented
 CreativeInventoryAction (was mistakenly called CreateInventoryAction) ->
 Fixed meta data for creative selected blocks ->->Slabs/Steps are now placed
 correctly - slabs can now be build to a double slab - fixed a bug in the
 inventory which put items with different meta values in the same slot

git-svn-id: http://mc-server.googlecode.com/svn/trunk@160 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 VC2010/MCServer.vcxproj         |  8 ++++++--
 VC2010/MCServer.vcxproj.filters | 36 +++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'VC2010')

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index 229310226..1186a6b5c 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -224,6 +224,7 @@
     <ClCompile Include="..\Source\cChunkMap.cpp" />
     <ClCompile Include="..\source\cCow.cpp" />
     <ClCompile Include="..\source\cCraftingWindow.cpp" />
+    <ClCompile Include="..\source\cCreativeInventory.cpp" />
     <ClCompile Include="..\source\cCreeper.cpp" />
     <ClCompile Include="..\source\cCriticalSection.cpp" />
     <ClCompile Include="..\source\cCuboid.cpp" />
@@ -273,6 +274,7 @@
     <ClCompile Include="..\source\cSpider.cpp" />
     <ClCompile Include="..\source\cSquid.cpp" />
     <ClCompile Include="..\source\cStringMap.cpp" />
+    <ClCompile Include="..\source\cSurvivalInventory.cpp" />
     <ClCompile Include="..\Source\cTCPLink.cpp" />
     <ClCompile Include="..\source\cThread.cpp" />
     <ClCompile Include="..\source\cTimer.cpp" />
@@ -318,7 +320,7 @@
     <ClCompile Include="..\source\packets\cPacket_DestroyEntity.cpp" />
     <ClCompile Include="..\source\packets\cPacket_Disconnect.cpp" />
     <ClCompile Include="..\source\packets\cPacket_EntityEquipment.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_CreateInventoryAction.cpp" />
+    <ClCompile Include="..\source\packets\cPacket_CreativeInventoryAction.cpp" />
     <ClCompile Include="..\source\packets\cPacket_Explosion.cpp" />
     <ClCompile Include="..\source\packets\cPacket_ItemData.cpp" />
     <ClCompile Include="..\source\packets\cPacket_NewInvalidState.cpp" />
@@ -373,6 +375,7 @@
     <ClInclude Include="..\Source\cChunkMap.h" />
     <ClInclude Include="..\source\cCow.h" />
     <ClInclude Include="..\source\cCraftingWindow.h" />
+    <ClInclude Include="..\source\cCreativeInventory.h" />
     <ClInclude Include="..\source\cCreeper.h" />
     <ClInclude Include="..\Source\cCriticalSection.h" />
     <ClInclude Include="..\source\cEnderman.h" />
@@ -422,6 +425,7 @@
     <ClInclude Include="..\source\cSquid.h" />
     <ClInclude Include="..\source\cStairs.h" />
     <ClInclude Include="..\source\cStringMap.h" />
+    <ClInclude Include="..\source\cSurvivalInventory.h" />
     <ClInclude Include="..\Source\cTCPLink.h" />
     <ClInclude Include="..\source\cGenSettings.h" />
     <ClInclude Include="..\source\cThread.h" />
@@ -479,7 +483,7 @@
     <ClInclude Include="..\source\packets\cPacket_DestroyEntity.h" />
     <ClInclude Include="..\source\packets\cPacket_Disconnect.h" />
     <ClInclude Include="..\source\packets\cPacket_EntityEquipment.h" />
-    <ClInclude Include="..\source\packets\cPacket_CreateInventoryAction.h" />
+    <ClInclude Include="..\source\packets\cPacket_CreativeInventoryAction.h" />
     <ClInclude Include="..\source\packets\cPacket_Explosion.h" />
     <ClInclude Include="..\source\packets\cPacket_ItemData.h" />
     <ClInclude Include="..\source\packets\cPacket_NewInvalidState.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index 23d9dba63..203933c48 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -283,9 +283,6 @@
     <Filter Include="Packets\cPacket_EntityEquipment">
       <UniqueIdentifier>{0f48e5f8-ea4d-41dc-ab9e-750c5912c778}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_CreateInventoryAction">
-      <UniqueIdentifier>{0c47e5f8-ea4d-40dc-ac8e-740c5512c768}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Packets\cPacket_NewInvalidState">
       <UniqueIdentifier>{0c12e5f5-ea4d-10dc-ac7e-540c5562c767}</UniqueIdentifier>
     </Filter>
@@ -442,6 +439,15 @@
     <Filter Include="Simulator\cSimulator\cSandSimulator">
       <UniqueIdentifier>{c5389fa9-20dd-4c52-ac16-2ef0a1115cf1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Packets\cPacket_CreativeInventoryAction">
+      <UniqueIdentifier>{0c47e5f8-ea4d-40dc-ac8e-740c5512c768}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cInventory\cSurvivalInventory">
+      <UniqueIdentifier>{a471def4-c86d-4cc1-bcbb-1004731690bb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cInventory\cCreativeInventory">
+      <UniqueIdentifier>{69e6a927-8e49-4d39-af88-f587d17bb8a3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\source\cServer.cpp">
@@ -724,9 +730,6 @@
     <ClCompile Include="..\source\packets\cPacket_EntityEquipment.cpp">
       <Filter>Packets\cPacket_EntityEquipment</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_CreateInventoryAction.cpp">
-      <Filter>Packets\cPacket_CreateInventoryAction</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\packets\cPacket_NewInvalidState.cpp">
       <Filter>Packets\cPacket_NewInvalidState</Filter>
     </ClCompile>
@@ -880,6 +883,15 @@
     <ClCompile Include="..\source\cFireSimulator.cpp">
       <Filter>Simulator\cSimulator\cFireSimulator</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\packets\cPacket_CreativeInventoryAction.cpp">
+      <Filter>Packets\cPacket_CreativeInventoryAction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\cCreativeInventory.cpp">
+      <Filter>cInventory\cCreativeInventory</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\cSurvivalInventory.cpp">
+      <Filter>cInventory\cSurvivalInventory</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\source\cServer.h">
@@ -1194,9 +1206,6 @@
     <ClInclude Include="..\source\packets\cPacket_EntityEquipment.h">
       <Filter>Packets\cPacket_EntityEquipment</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_CreateInventoryAction.h">
-      <Filter>Packets\cPacket_CreateInventoryAction</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\packets\cPacket_NewInvalidState.h">
       <Filter>Packets\cPacket_NewInvalidState</Filter>
     </ClInclude>
@@ -1353,6 +1362,15 @@
     <ClInclude Include="..\source\cFireSimulator.h">
       <Filter>Simulator\cSimulator\cFireSimulator</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\packets\cPacket_CreativeInventoryAction.h">
+      <Filter>Packets\cPacket_CreativeInventoryAction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\cCreativeInventory.h">
+      <Filter>cInventory\cCreativeInventory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\cSurvivalInventory.h">
+      <Filter>cInventory\cSurvivalInventory</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\source\AllToLua.pkg">
-- 
cgit v1.2.3