Footsteps without view bobbing #5645
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
desttinghim
force-pushed
the
view_bobbing
branch
from
3c5602c
to
796020b
Compare
|
Newest commit (796020b) adds documentation |
paramat
reviewed
Apr 23, 2017
src/camera.cpp
Outdated
| @@ -280,7 +279,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, | |||
| v3f rel_cam_target = v3f(0,0,1); | |||
| v3f rel_cam_up = v3f(0,1,0); | |||
|
|
|||
| if (m_view_bobbing_anim != 0 && m_camera_mode < CAMERA_MODE_THIRD) | |||
| if (m_cache_view_bobbing_amount != 0 && m_view_bobbing_anim != 0 && m_camera_mode < CAMERA_MODE_THIRD) | |||
There was a problem hiding this comment.
Because '_amount' is a float maybe it should be '!= 0.0f'? Not sure.
There was a problem hiding this comment.
Probably a good idea. I'll change it.
|
Thanks for updating the settings translation file, there's no need to update all the translations files as those are updated only every 1-2 months or so, but thanks anyway. |
desttinghim
force-pushed
the
view_bobbing
branch
from
796020b
to
c813113
Compare
|
Changed to using 0.0f for comparison instead of an int. |
paramat
reviewed
Apr 23, 2017
src/camera.cpp
Outdated
| @@ -280,7 +279,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, | |||
| v3f rel_cam_target = v3f(0,0,1); | |||
| v3f rel_cam_up = v3f(0,1,0); | |||
|
|
|||
| if (m_view_bobbing_anim != 0 && m_camera_mode < CAMERA_MODE_THIRD) | |||
| if (m_cache_view_bobbing_amount != 0.0f && m_view_bobbing_anim != 0.0f && m_camera_mode < CAMERA_MODE_THIRD) | |||
There was a problem hiding this comment.
please split the line at 80 columns (with tab size 4)
|
+1 once long line is split. |
Also fixes bug where disabling view_bobbing disables footstep sounds.
desttinghim
force-pushed
the
view_bobbing
branch
from
c813113
to
c5042f2
Compare
|
Long line has been split. |
sfan5
approved these changes
Apr 23, 2017
|
👍 |
nerzhul
requested changes
Apr 25, 2017
src/camera.cpp
Outdated
| @@ -280,7 +279,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, | |||
| v3f rel_cam_target = v3f(0,0,1); | |||
| v3f rel_cam_up = v3f(0,1,0); | |||
|
|
|||
| if (m_view_bobbing_anim != 0 && m_camera_mode < CAMERA_MODE_THIRD) | |||
| if (m_cache_view_bobbing_amount != 0.0f && m_view_bobbing_anim != 0.0f && | |||
| m_camera_mode < CAMERA_MODE_THIRD) | |||
| { | |||
src/camera.cpp
Outdated
| @@ -467,7 +467,6 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, | |||
| const bool swimming = (movement_XZ || player->swimming_vertical) && player->in_liquid; | |||
| const bool climbing = movement_Y && player->is_climbing; | |||
| if ((walking || swimming || climbing) && | |||
| m_cache_view_bobbing && | |||
| (!g_settings->getBool("free_move") || !m_client->checkLocalPrivilege("fly"))) | |||
| { | |||
Setting view_bobbing amount to 0 is now the only way to turn view_bobbing on and off. Also fixed a bug where footstep sounds would not play when view_bobbing was disabled.
|
Moved braces 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR allows the footstep sounds to play without the view bobbing at the same time, as per bug #5602. It also removes the redundant view_bobbing setting from minetest.conf files.