diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-22 12:05:27 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-22 12:05:27 +0200 |
| commit | 3ff3103e98b350712543f926c429ab339700e252 (patch) | |
| tree | 61827d6b7dcb51c38f17f068c8b498c16a0db1c3 /src/client/camera.cpp | |
| parent | 350b6d175c406fbbc002237f37db4cf88d6d3d19 (diff) | |
| parent | 9f338f5a56e5adee3d11d59827f7e2b8a714e6c2 (diff) | |
| download | dragonfireclient-3ff3103e98b350712543f926c429ab339700e252.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/client/camera.cpp')
| -rw-r--r-- | src/client/camera.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/client/camera.cpp b/src/client/camera.cpp index 0c387262e..164db8761 100644 --- a/src/client/camera.cpp +++ b/src/client/camera.cpp @@ -48,7 +48,8 @@ with this program; if not, write to the Free Software Foundation, Inc., Camera::Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine): m_draw_control(draw_control), - m_client(client) + m_client(client), + m_player_light_color(0xFFFFFFFF) { auto smgr = rendering_engine->get_scene_manager(); // note: making the camera node a child of the player node @@ -154,8 +155,10 @@ void Camera::step(f32 dtime) bool was_under_zero = m_wield_change_timer < 0; m_wield_change_timer = MYMIN(m_wield_change_timer + dtime, 0.125); - if (m_wield_change_timer >= 0 && was_under_zero) + if (m_wield_change_timer >= 0 && was_under_zero) { m_wieldnode->setItem(m_wield_item_next, m_client); + m_wieldnode->setNodeLightColor(m_player_light_color); + } if (m_view_bobbing_state != 0) { @@ -556,7 +559,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio) m_wieldnode->setPosition(wield_position); m_wieldnode->setRotation(wield_rotation); - m_wieldnode->setNodeLightColor(player->light_color); + m_player_light_color = player->light_color; + m_wieldnode->setNodeLightColor(m_player_light_color); // Set render distance updateViewingRange(); |