aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2016-02-19 14:13:21 +0100
committerparamat <mat.gregory@virginmedia.com>2016-02-19 14:52:19 +0000
commit5dbaa689677e89ee10e2c6e3a4e8eb57b79f3140 (patch)
tree4a4a7759f6f39d41842b0c867011794ce0afd43c
parent4827ee1258ac9d68808ca4e2a9cb88bf49473e6b (diff)
downloadminetest-5dbaa689677e89ee10e2c6e3a4e8eb57b79f3140.tar.gz
minetest-5dbaa689677e89ee10e2c6e3a4e8eb57b79f3140.tar.bz2
minetest-5dbaa689677e89ee10e2c6e3a4e8eb57b79f3140.zip
Camera: Don't count camera offset twice for Nametagged CAOs
-rw-r--r--src/camera.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/camera.cpp b/src/camera.cpp
index 8aac32123..0ce6bb345 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -675,8 +675,7 @@ void Camera::drawNametags()
i = m_nametags.begin();
i != m_nametags.end(); ++i) {
Nametag *nametag = *i;
- v3f pos = nametag->parent_node->getPosition() -
- intToFloat(m_camera_offset, BS) + v3f(0.0, 1.1 * BS, 0.0);
+ v3f pos = nametag->parent_node->getPosition() + v3f(0.0, 1.1 * BS, 0.0);
f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f };
trans.multiplyWith1x4Matrix(transformed_pos);
if (transformed_pos[3] > 0) {