Fix incorrect scaling of customized hud item selection marker

[dragonfireclient.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index 4b84257742c34bd7e92e8db911640ff311ed24e3..fa7ce2ae57f5e27d505342239d34479bd0e84429 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -314,7 +314,6 @@ ServerEnvironment::ServerEnvironment(ServerMap *map,
        m_map(map),
        m_script(scriptIface),
        m_gamedef(gamedef),
-       m_random_spawn_timer(3),
        m_send_recommended_timer(0),
        m_active_block_interval_overload_skip(0),
        m_game_time(0),
@@ -322,7 +321,6 @@ ServerEnvironment::ServerEnvironment(ServerMap *map,
        m_recommended_send_interval(0.1),
        m_max_lag_estimate(0.1)
 {
-       m_use_weather = g_settings->getBool("weather");
 }
 
 ServerEnvironment::~ServerEnvironment()
@@ -795,8 +793,7 @@ class ABMHandler
                                // Call all the trigger variations
                                i->abm->trigger(m_env, p, n);
                                i->abm->trigger(m_env, p, n,
-                                               active_object_count,
-                                               active_object_count_wider + active_object_count);
+                                               active_object_count, active_object_count_wider);
 
                                // Count surrounding objects again if the abms added any
                                if(m_env->m_added_objects > 0) {
@@ -1098,7 +1095,7 @@ void ServerEnvironment::step(float dtime)
                                continue;
                        
                        // Move
-                       player->move(dtime, *m_map, 100*BS);
+                       player->move(dtime, this, 100*BS);
                }
        }
 
@@ -2396,7 +2393,7 @@ void ClientEnvironment::step(float dtime)
                if(player->isLocal() == false)
                {
                        // Move
-                       player->move(dtime, *m_map, 100*BS);
+                       player->move(dtime, this, 100*BS);
 
                }