From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 15 Feb 2013 21:18:19 +0000 (+0200)
Subject: Some kind of middleway values for player acceleration for now
X-Git-Tag: 0.4.5~7^2~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c88d89d26edb0d7864feb1b8b1d8e79c765ae0ef;p=oweals%2Fminetest.git

Some kind of middleway values for player acceleration for now
---

diff --git a/minetest.conf.example b/minetest.conf.example
index 5afe6c5e2..30d0dbd5c 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -251,9 +251,9 @@
 #remote_media =
 
 # Physics stuff
-#movement_acceleration_default = 2
-#movement_acceleration_air = 0.5
-#movement_acceleration_fast = 4
+#movement_acceleration_default = 3
+#movement_acceleration_air = 2
+#movement_acceleration_fast = 10
 #movement_speed_walk = 4
 #movement_speed_crouch = 1.35
 #movement_speed_fast = 20
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 5786858fc..e3c6b2f7d 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -180,9 +180,9 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("remote_media", "");
 
 	// physics stuff
-	settings->setDefault("movement_acceleration_default", "4");
-	settings->setDefault("movement_acceleration_air", "4");
-	settings->setDefault("movement_acceleration_fast", "4");
+	settings->setDefault("movement_acceleration_default", "3");
+	settings->setDefault("movement_acceleration_air", "2");
+	settings->setDefault("movement_acceleration_fast", "10");
 	settings->setDefault("movement_speed_walk", "4");
 	settings->setDefault("movement_speed_crouch", "1.35");
 	settings->setDefault("movement_speed_fast", "20");
diff --git a/src/player.cpp b/src/player.cpp
index 90aa4fe05..86d3ae184 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -59,9 +59,9 @@ Player::Player(IGameDef *gamedef):
 		"list[current_player;craftpreview;7,1;1,1;]";
 
 	// Initialize movement settings at default values, so movement can work if the server fails to send them
-	movement_acceleration_default = 4 * BS;
-	movement_acceleration_air = 4 * BS;
-	movement_acceleration_fast = 4 * BS;
+	movement_acceleration_default = 3 * BS;
+	movement_acceleration_air = 2 * BS;
+	movement_acceleration_fast = 10 * BS;
 	movement_speed_walk = 4 * BS;
 	movement_speed_crouch = 1.35 * BS;
 	movement_speed_fast = 20 * BS;