From 7deed96d0997b5c4edefce0877a626926f8b29a4 Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Fri, 4 Nov 2011 16:05:18 +0000
Subject: [PATCH] Added cRedstone to project file Changed
 NetworkToHostFloat4(), maybe it works now on 64bit linux

git-svn-id: http://mc-server.googlecode.com/svn/trunk@54 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 VC2010/MCServer.vcxproj         |  4 +++-
 VC2010/MCServer.vcxproj.filters | 11 ++++++++++-
 source/Endianness.h             | 11 +++++------
 source/cRedstone.cpp            |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index 64a9e3726..c2fb36300 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -254,6 +254,7 @@
     <ClCompile Include="..\source\cPig.cpp" />
     <ClCompile Include="..\Source\cPluginManager.cpp" />
     <ClCompile Include="..\Source\cRecipeChecker.cpp" />
+    <ClCompile Include="..\source\cRedstone.cpp" />
     <ClCompile Include="..\Source\cReferenceManager.cpp" />
     <ClCompile Include="..\Source\cRoot.cpp" />
     <ClCompile Include="..\Source\cSemaphore.cpp" />
@@ -381,6 +382,7 @@
     <ClInclude Include="..\source\cPig.h" />
     <ClInclude Include="..\Source\cPluginManager.h" />
     <ClInclude Include="..\Source\cRecipeChecker.h" />
+    <ClInclude Include="..\source\cRedstone.h" />
     <ClInclude Include="..\Source\cReferenceManager.h" />
     <ClInclude Include="..\Source\cRoot.h" />
     <ClInclude Include="..\Source\cSemaphore.h" />
@@ -522,4 +524,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index cccd8071f..59e2261af 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -376,6 +376,9 @@
     <Filter Include="cFileFormatUpdater">
       <UniqueIdentifier>{c9b053f2-89dd-475e-a889-5c25a20e6eec}</UniqueIdentifier>
     </Filter>
+    <Filter Include="cRedstone">
+      <UniqueIdentifier>{0ee956cb-75b4-4ba5-9d85-f3a3850b8b95}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\source\cServer.cpp">
@@ -754,6 +757,9 @@
     <ClCompile Include="..\source\cItem.cpp">
       <Filter>cItem</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\cRedstone.cpp">
+      <Filter>cRedstone</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\source\cServer.h">
@@ -1167,6 +1173,9 @@
     <ClInclude Include="..\source\cFileFormatUpdater.h">
       <Filter>cFileFormatUpdater</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\cRedstone.h">
+      <Filter>cRedstone</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\source\AllToLua.pkg">
@@ -1177,4 +1186,4 @@
   <ItemGroup>
     <ResourceCompile Include="MCServer.rc" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/source/Endianness.h b/source/Endianness.h
index cf5ed5567..1a16a11cc 100644
--- a/source/Endianness.h
+++ b/source/Endianness.h
@@ -45,10 +45,9 @@ inline long long NetworkToHostLong8( void* a_Value )
 
 inline float NetworkToHostFloat4( void* a_Value )
 {
-	//u_long buf = *(u_long*)a_Value;
-	unsigned long buf = *(unsigned long*)a_Value;
-	buf = ntohl( (unsigned long)buf );
-	(void)printf("",(unsigned long)buf);
-	//(unsigned long)buf;
-	return *(float*)reinterpret_cast<float *>(&buf);
+	u_long buf = *(u_long*)a_Value;
+	buf = ntohl( buf );
+	float x = 0;
+	memcpy( &x, &buf, sizeof(float) );
+	return x;
 }
diff --git a/source/cRedstone.cpp b/source/cRedstone.cpp
index 87f1f23f1..d61d50cbb 100644
--- a/source/cRedstone.cpp
+++ b/source/cRedstone.cpp
@@ -1,7 +1,7 @@
 #include "cRedstone.h"
 #include "cRoot.h"
 #include "cWorld.h"
-
+#include "BlockID.h"
 
 cRedstone::cRedstone( cWorld* a_World )
 	:m_World ( a_World )