diff options
| author | madmaxoft <github@xoft.cz> | 2014-03-12 14:42:04 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-03-12 14:42:04 +0100 |
| commit | f2df33f746936e8dd0dba69e7d77723df8c71472 (patch) | |
| tree | 9a2a49460ed9cf57f69a2e9b0e07cf9a6086a02a /src/Entities | |
| parent | Fixed Lua string return values. (diff) | |
| parent | Vector3: Length() should always return a float (diff) | |
| download | cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.tar cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.tar.gz cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.tar.bz2 cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.tar.lz cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.tar.xz cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.tar.zst cuberite-f2df33f746936e8dd0dba69e7d77723df8c71472.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Entity.h | 4 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 96e8c15a5..0750ae05e 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -4,7 +4,7 @@ #include "../World.h" #include "../Server.h" #include "../Root.h" -#include "../Matrix4f.h" +#include "../Matrix4.h" #include "../ClientHandle.h" #include "../Chunk.h" #include "../Simulator/FluidSimulator.h" diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index b3b1cef83..a73565de7 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -2,9 +2,7 @@ #pragma once #include "../Item.h" -#include "../Vector3d.h" -#include "../Vector3f.h" -#include "../Vector3i.h" +#include "../Vector3.h" diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index ccdd151f3..440d30595 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -14,6 +14,7 @@ #include "../OSSupport/Timer.h" #include "../Chunk.h" #include "../Items/ItemHandler.h" +#include "../Vector3.h" #include "inifile/iniFile.h" #include "json/json.h" |