From c6b4ee8c9fb597b6f87f4cb756f43d5548ab2d66 Mon Sep 17 00:00:00 2001
From: "lapayo94@gmail.com"
 <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Wed, 28 Dec 2011 21:00:35 +0000
Subject: - implemented the fire simulation in native c++ (cFireSimulator) -
 Changed the Durationsystem for Items. cPlayer::UseEquippedItem calls
 cItem::DamageItem this function damages the item if it has a duration.
 (needed the duration also in another place so this saves code ;)) - added
 some other burning blocks - the mobtypes for the settings.ini which i must
 have forgotten in the last commit

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

(limited to 'VC2010')

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index 3854a376f..842d9226f 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -230,6 +230,7 @@
     <ClCompile Include="..\source\cEnderman.cpp" />
     <ClCompile Include="..\source\cEvent.cpp" />
     <ClCompile Include="..\source\cFileFormatUpdater.cpp" />
+    <ClCompile Include="..\source\cFireSimulator.cpp" />
     <ClCompile Include="..\source\cFluidSimulator.cpp" />
     <ClCompile Include="..\source\cFurnaceEntity.cpp" />
     <ClCompile Include="..\Source\cFurnaceRecipe.cpp" />
@@ -377,6 +378,7 @@
     <ClInclude Include="..\source\cEnderman.h" />
     <ClInclude Include="..\source\cEvent.h" />
     <ClInclude Include="..\source\cFileFormatUpdater.h" />
+    <ClInclude Include="..\source\cFireSimulator.h" />
     <ClInclude Include="..\source\cFluidSimulator.h" />
     <ClInclude Include="..\source\cFurnaceEntity.h" />
     <ClInclude Include="..\Source\cFurnaceRecipe.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index a2ec4b5e8..2d249551a 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -436,7 +436,10 @@
     <Filter Include="Simulator\cSimulator\cFluidSimulator\cLavaSimulator">
       <UniqueIdentifier>{b0401fd9-4021-4ab7-bf61-c8de112b4196}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Simulator\cSimulator\SandSimulator">
+    <Filter Include="Simulator\cSimulator\cFireSimulator">
+      <UniqueIdentifier>{d788a40d-f6f9-4784-8202-25d38386157a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Simulator\cSimulator\cSandSimulator">
       <UniqueIdentifier>{c5389fa9-20dd-4c52-ac16-2ef0a1115cf1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -872,7 +875,10 @@
       <Filter>Simulator\cSimulator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cSandSimulator.cpp">
-      <Filter>Simulator\cSimulator\SandSimulator</Filter>
+      <Filter>Simulator\cSimulator\cSandSimulator</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\cFireSimulator.cpp">
+      <Filter>Simulator\cSimulator\cFireSimulator</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1342,7 +1348,10 @@
       <Filter>Simulator\cSimulator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cSandSimulator.h">
-      <Filter>Simulator\cSimulator\SandSimulator</Filter>
+      <Filter>Simulator\cSimulator\cSandSimulator</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\cFireSimulator.h">
+      <Filter>Simulator\cSimulator\cFireSimulator</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-- 
cgit v1.2.3