diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-11-04 17:05:18 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-11-04 17:05:18 +0100 |
| commit | 7deed96d0997b5c4edefce0877a626926f8b29a4 (patch) | |
| tree | 1d59e908f08552ef34c9f0a2bcfd392d3d8f7af2 /source | |
| parent | Changed use of deprecated function. (diff) | |
| download | cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.tar cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.tar.gz cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.tar.bz2 cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.tar.lz cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.tar.xz cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.tar.zst cuberite-7deed96d0997b5c4edefce0877a626926f8b29a4.zip | |
Diffstat (limited to 'source')
| -rw-r--r-- | source/Endianness.h | 11 | ||||
| -rw-r--r-- | source/cRedstone.cpp | 2 |
2 files changed, 6 insertions, 7 deletions
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 )
|