summaryrefslogtreecommitdiffstats
path: root/source/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-24 11:31:57 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-24 11:31:57 +0200
commit21b23ff1e74d6735801f5aaf7ae1659b8c787f7a (patch)
treed5d606cf69a6f3945bbb8e1c8a80821654a86998 /source/Entities
parentMerge pull request #1 from tigerw/bugfixes (diff)
parentRemoved some unneeded includes (diff)
downloadcuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.tar
cuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.tar.gz
cuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.tar.bz2
cuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.tar.lz
cuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.tar.xz
cuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.tar.zst
cuberite-21b23ff1e74d6735801f5aaf7ae1659b8c787f7a.zip
Diffstat (limited to '')
-rw-r--r--source/Entities/Boat.h1
-rw-r--r--source/Entities/Minecart.h1
-rw-r--r--source/Entities/Pickup.cpp4
-rw-r--r--source/Entities/Pickup.h2
4 files changed, 3 insertions, 5 deletions
diff --git a/source/Entities/Boat.h b/source/Entities/Boat.h
index 734ebda83..8c51ab86c 100644
--- a/source/Entities/Boat.h
+++ b/source/Entities/Boat.h
@@ -10,7 +10,6 @@
#pragma once
#include "Entity.h"
-#include "../Item.h"
diff --git a/source/Entities/Minecart.h b/source/Entities/Minecart.h
index 0ca6586db..0152f5dfc 100644
--- a/source/Entities/Minecart.h
+++ b/source/Entities/Minecart.h
@@ -10,7 +10,6 @@
#pragma once
#include "Entity.h"
-#include "../Item.h"
diff --git a/source/Entities/Pickup.cpp b/source/Entities/Pickup.cpp
index db7be8b04..075f93449 100644
--- a/source/Entities/Pickup.cpp
+++ b/source/Entities/Pickup.cpp
@@ -24,8 +24,8 @@
-cPickup::cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */)
- : cEntity(etPickup, (((double)(a_MicroPosX)) / 32) + 0.1 /*Accomodate player vomiting*/, ((double)(a_MicroPosY)) / 32, ((double)(a_MicroPosZ)) / 32, 0.2, 0.2)
+cPickup::cPickup(double a_X, double a_Y, double a_Z, const cItem & a_Item, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */)
+ : cEntity(etPickup, a_X, a_Y, a_Z, 0.2, 0.2)
, m_Timer( 0.f )
, m_Item(a_Item)
, m_bCollected( false )
diff --git a/source/Entities/Pickup.h b/source/Entities/Pickup.h
index af6eaf3bb..e35914684 100644
--- a/source/Entities/Pickup.h
+++ b/source/Entities/Pickup.h
@@ -24,7 +24,7 @@ class cPickup :
public:
CLASS_PROTODEF(cPickup);
- cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); // tolua_export
+ cPickup(double a_MicroPosX, double a_MicroPosY, double a_MicroPosZ, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); // tolua_export
cItem & GetItem(void) {return m_Item; } // tolua_export
const cItem & GetItem(void) const {return m_Item; }