flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added cRedstone to project file

Browse Source 
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
This commit is contained in:
faketruth 2011-11-04 16:05:18 +00:00
parent 2ffedf16ae
commit 7deed96d09
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VC2010/MCServer.vcxproj
View File

@ -254,6 +254,7 @@
<ClCompile Include="..\source\cPig.cpp" /> <ClCompile Include="..\source\cPig.cpp" />
<ClCompile Include="..\Source\cPluginManager.cpp" /> <ClCompile Include="..\Source\cPluginManager.cpp" />
<ClCompile Include="..\Source\cRecipeChecker.cpp" /> <ClCompile Include="..\Source\cRecipeChecker.cpp" />
<ClCompile Include="..\source\cRedstone.cpp" />
<ClCompile Include="..\Source\cReferenceManager.cpp" /> <ClCompile Include="..\Source\cReferenceManager.cpp" />
<ClCompile Include="..\Source\cRoot.cpp" /> <ClCompile Include="..\Source\cRoot.cpp" />
<ClCompile Include="..\Source\cSemaphore.cpp" /> <ClCompile Include="..\Source\cSemaphore.cpp" />
@ -381,6 +382,7 @@
<ClInclude Include="..\source\cPig.h" /> <ClInclude Include="..\source\cPig.h" />
<ClInclude Include="..\Source\cPluginManager.h" /> <ClInclude Include="..\Source\cPluginManager.h" />
<ClInclude Include="..\Source\cRecipeChecker.h" /> <ClInclude Include="..\Source\cRecipeChecker.h" />
<ClInclude Include="..\source\cRedstone.h" />
<ClInclude Include="..\Source\cReferenceManager.h" /> <ClInclude Include="..\Source\cReferenceManager.h" />
<ClInclude Include="..\Source\cRoot.h" /> <ClInclude Include="..\Source\cRoot.h" />
<ClInclude Include="..\Source\cSemaphore.h" /> <ClInclude Include="..\Source\cSemaphore.h" />
@ -522,4 +524,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

11
VC2010/MCServer.vcxproj.filters
View File

@ -376,6 +376,9 @@
<Filter Include="cFileFormatUpdater"> <Filter Include="cFileFormatUpdater">
<UniqueIdentifier>{c9b053f2-89dd-475e-a889-5c25a20e6eec}</UniqueIdentifier> <UniqueIdentifier>{c9b053f2-89dd-475e-a889-5c25a20e6eec}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="cRedstone">
<UniqueIdentifier>{0ee956cb-75b4-4ba5-9d85-f3a3850b8b95}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\source\cServer.cpp"> <ClCompile Include="..\source\cServer.cpp">
@ -754,6 +757,9 @@
<ClCompile Include="..\source\cItem.cpp"> <ClCompile Include="..\source\cItem.cpp">
<Filter>cItem</Filter> <Filter>cItem</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\source\cRedstone.cpp">
<Filter>cRedstone</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\source\cServer.h"> <ClInclude Include="..\source\cServer.h">
@ -1167,6 +1173,9 @@
<ClInclude Include="..\source\cFileFormatUpdater.h"> <ClInclude Include="..\source\cFileFormatUpdater.h">
<Filter>cFileFormatUpdater</Filter> <Filter>cFileFormatUpdater</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\source\cRedstone.h">
<Filter>cRedstone</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\source\AllToLua.pkg"> <None Include="..\source\AllToLua.pkg">
@ -1177,4 +1186,4 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="MCServer.rc" /> <ResourceCompile Include="MCServer.rc" />
</ItemGroup> </ItemGroup>
</Project> </Project>

11
source/Endianness.h
View File

@ -45,10 +45,9 @@ inline long long NetworkToHostLong8( void* a_Value )
inline float NetworkToHostFloat4( void* a_Value ) inline float NetworkToHostFloat4( void* a_Value )
{ {
//u_long buf = *(u_long*)a_Value; u_long buf = *(u_long*)a_Value;
unsigned long buf = *(unsigned long*)a_Value; buf = ntohl( buf );
buf = ntohl( (unsigned long)buf ); float x = 0;
(void)printf("",(unsigned long)buf); memcpy( &x, &buf, sizeof(float) );
//(unsigned long)buf; return x;
return *(float*)reinterpret_cast<float *>(&buf);
} }

2
source/cRedstone.cpp
View File

@ -1,7 +1,7 @@
#include "cRedstone.h" #include "cRedstone.h"
#include "cRoot.h" #include "cRoot.h"
#include "cWorld.h" #include "cWorld.h"
#include "BlockID.h"
cRedstone::cRedstone( cWorld* a_World ) cRedstone::cRedstone( cWorld* a_World )
:m_World ( a_World ) :m_World ( a_World )