aboutsummaryrefslogtreecommitdiff
path: root/src/camera.h
diff options
context:
space:
mode:
authorTeTpaAka <TeTpaAka@users.noreply.github.com>2017-07-29 19:24:10 +0200
committerSmallJoker <SmallJoker@users.noreply.github.com>2017-07-29 19:24:10 +0200
commitd504831ee2adf59421e82202e350f82701bd3cd0 (patch)
tree60995a1066acd095d386add25362b2a1c660fde8 /src/camera.h
parent765fd9a0bc0bb9f08d12713dc586e7f4c59c421d (diff)
downloaddragonfireclient-d504831ee2adf59421e82202e350f82701bd3cd0.tar.xz
Move the nametag back to the top of the player (#6179)
read the actual height of the collisionbox
Diffstat (limited to 'src/camera.h')
-rw-r--r--src/camera.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/camera.h b/src/camera.h
index 620e316de..052284cac 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -39,15 +39,18 @@ class WieldMeshSceneNode;
struct Nametag {
Nametag(scene::ISceneNode *a_parent_node,
const std::string &a_nametag_text,
- const video::SColor &a_nametag_color):
+ const video::SColor &a_nametag_color,
+ const v3f a_nametag_pos):
parent_node(a_parent_node),
nametag_text(a_nametag_text),
- nametag_color(a_nametag_color)
+ nametag_color(a_nametag_color),
+ nametag_pos(a_nametag_pos)
{
}
scene::ISceneNode *parent_node;
std::string nametag_text;
video::SColor nametag_color;
+ v3f nametag_pos;
};
enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
@@ -157,7 +160,8 @@ public:
}
Nametag *addNametag(scene::ISceneNode *parent_node,
- std::string nametag_text, video::SColor nametag_color);
+ const std::string &nametag_text, video::SColor nametag_color,
+ const v3f &pos);
void removeNametag(Nametag *nametag);