Enable multiline signs

[dragonfireclient.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index ca2a6eb53db8365a503aeb495b12ad7884225bb1..33e85d06926e9568c4e02de64723e01cf23ba517 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -233,9 +233,12 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
        m_playernode->setRotation(v3f(0, -1 * player->getYaw(), 0));
        m_playernode->updateAbsolutePosition();
 
+       //Get camera tilt timer (hurt animation)
+       float cameratilt = fabs(fabs(player->hurt_tilt_timer-0.75)-0.75);
+
        // Set head node transformation
-       m_headnode->setPosition(player->getEyeOffset());
-       m_headnode->setRotation(v3f(player->getPitch(), 0, 0));
+       m_headnode->setPosition(player->getEyeOffset()+v3f(0,cameratilt*-player->hurt_tilt_strength,0));
+       m_headnode->setRotation(v3f(player->getPitch(), 0, cameratilt*player->hurt_tilt_strength));
        m_headnode->updateAbsolutePosition();
 
        // Compute relative camera position and target
@@ -544,7 +547,7 @@ void Camera::wield(const ItemStack &item)
 void Camera::drawWieldedTool()
 {
        // Set vertex colors of wield mesh according to light level
-       u8 li = decode_light(m_wieldlight);
+       u8 li = m_wieldlight;
        video::SColor color(255,li,li,li);
        setMeshColor(m_wieldnode->getMesh(), color);