summaryrefslogtreecommitdiff
path: root/src/remoteplayer.cpp
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2022-01-22 13:37:26 +0100
committerHugues Ross <hugues.ross@gmail.com>2022-01-22 11:18:34 -0500
commitf8cef52ea07de6a6ccaa6f9a853a8e5ccaaff4ce (patch)
tree18c6fd04a6e999a82fdc60c94097df6cb8df6d37 /src/remoteplayer.cpp
parent37d80784ddfc0ff07baee214570c80dc5dd92ca7 (diff)
downloadminetest-f8cef52ea07de6a6ccaa6f9a853a8e5ccaaff4ce.tar.gz
minetest-f8cef52ea07de6a6ccaa6f9a853a8e5ccaaff4ce.tar.bz2
minetest-f8cef52ea07de6a6ccaa6f9a853a8e5ccaaff4ce.zip
Fix consistency of sky sun/moon texture behaviour
Also cleans up related code somewhat.
Diffstat (limited to 'src/remoteplayer.cpp')
-rw-r--r--src/remoteplayer.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index 3f0eae0f0..20be7a8c8 100644
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/*
RemotePlayer
*/
+
// static config cache for remoteplayer
bool RemotePlayer::m_setting_cache_loaded = false;
float RemotePlayer::m_setting_chat_message_limit_per_10sec = 0.0f;
@@ -46,6 +47,7 @@ RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
g_settings->getU16("chat_message_limit_trigger_kick");
RemotePlayer::m_setting_cache_loaded = true;
}
+
movement_acceleration_default = g_settings->getFloat("movement_acceleration_default") * BS;
movement_acceleration_air = g_settings->getFloat("movement_acceleration_air") * BS;
movement_acceleration_fast = g_settings->getFloat("movement_acceleration_fast") * BS;
@@ -59,19 +61,12 @@ RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
movement_liquid_sink = g_settings->getFloat("movement_liquid_sink") * BS;
movement_gravity = g_settings->getFloat("movement_gravity") * BS;
- // copy defaults
- m_cloud_params.density = 0.4f;
- m_cloud_params.color_bright = video::SColor(229, 240, 240, 255);
- m_cloud_params.color_ambient = video::SColor(255, 0, 0, 0);
- m_cloud_params.height = 120.0f;
- m_cloud_params.thickness = 16.0f;
- m_cloud_params.speed = v2f(0.0f, -2.0f);
-
// Skybox defaults:
+ m_cloud_params = SkyboxDefaults::getCloudDefaults();
m_skybox_params = SkyboxDefaults::getSkyDefaults();
- m_sun_params = SkyboxDefaults::getSunDefaults();
- m_moon_params = SkyboxDefaults::getMoonDefaults();
- m_star_params = SkyboxDefaults::getStarDefaults();
+ m_sun_params = SkyboxDefaults::getSunDefaults();
+ m_moon_params = SkyboxDefaults::getMoonDefaults();
+ m_star_params = SkyboxDefaults::getStarDefaults();
}