Document zoom_fov in settingtypes.txt and minetest.conf.example

[dragonfireclient.git] / src / localplayer.cpp

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 507f3198010de9a9514cacc9bca86ab038c15d56..732ca8acf6b1312f7426027e862675229c80f2b2 100644 (file)
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -528,18 +528,23 @@ void LocalPlayer::applyControl(float dtime)
                        speedH += move_direction;
                }
        }
-       if(control.down)
-       {
+       if (control.down) {
                speedH -= move_direction;
        }
-       if(control.left)
-       {
+       if (!control.up && !control.down) {
+               speedH -= move_direction *
+                       (control.forw_move_joystick_axis / 32767.f);
+       }
+       if (control.left) {
                speedH += move_direction.crossProduct(v3f(0,1,0));
        }
-       if(control.right)
-       {
+       if (control.right) {
                speedH += move_direction.crossProduct(v3f(0,-1,0));
        }
+       if (!control.left && !control.right) {
+               speedH -= move_direction.crossProduct(v3f(0,1,0)) *
+                       (control.sidew_move_joystick_axis / 32767.f);
+       }
        if(control.jump)
        {
                if (free_move) {