summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-05 22:34:05 +0200
committermadmaxoft <github@xoft.cz>2014-04-05 22:34:05 +0200
commit143a5e61fc8e704f3df776d089217f031bc47779 (patch)
treea5edd697f377f44aa469b2d81a19b9cd90187d9b
parentFixed double projectile spawning. (diff)
downloadcuberite-143a5e61fc8e704f3df776d089217f031bc47779.tar
cuberite-143a5e61fc8e704f3df776d089217f031bc47779.tar.gz
cuberite-143a5e61fc8e704f3df776d089217f031bc47779.tar.bz2
cuberite-143a5e61fc8e704f3df776d089217f031bc47779.tar.lz
cuberite-143a5e61fc8e704f3df776d089217f031bc47779.tar.xz
cuberite-143a5e61fc8e704f3df776d089217f031bc47779.tar.zst
cuberite-143a5e61fc8e704f3df776d089217f031bc47779.zip
-rw-r--r--src/Endianness.h4
-rw-r--r--src/Entities/Entity.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Endianness.h b/src/Endianness.h
index 6a2593077..78f9a5d99 100644
--- a/src/Endianness.h
+++ b/src/Endianness.h
@@ -49,7 +49,7 @@ inline double NetworkToHostDouble8(const void * a_Value)
inline Int64 NetworkToHostLong8(const void * a_Value)
{
UInt64 buf;
- memcpy(&buf, &a_Value, 8);
+ memcpy(&buf, a_Value, 8);
buf = ntohll(buf);
return *reinterpret_cast<Int64 *>(&buf);
}
@@ -62,7 +62,7 @@ inline float NetworkToHostFloat4(const void * a_Value)
{
UInt32 buf;
float x;
- memcpy(&buf, &a_Value, 4);
+ memcpy(&buf, a_Value, 4);
buf = ntohl(buf);
memcpy(&x, &buf, sizeof(float));
return x;
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 221cbbea7..8ef45f1a5 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1469,7 +1469,7 @@ void cEntity::SteerVehicle(float a_Forward, float a_Sideways)
Vector3d cEntity::GetLookVector(void) const
{
Matrix4d m;
- m.Init(Vector3f(), 0, m_Rot.x, -m_Rot.y);
+ m.Init(Vector3d(), 0, m_Rot.x, -m_Rot.y);
Vector3d Look = m.Transform(Vector3d(0, 0, 1));
return Look;
}