Remove remenants of mob code

Since minetest has no mobs within the core anymore, I suppose these
settings and code should go. Any mod that uses `minetest.setting_getbool`
will work with no problem since the default return value is `false`.

diff --git a/minetest.conf.example b/minetest.conf.example
index 3e7689c7655eb5e1ba05d9cfbd8e3e2b2b2375d4..2ceb0a14283f9363b96941d874e5662ad2409c9b 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -283,8 +283,6 @@
 #creative_mode = false
 # Enable players getting damage and dying
 #enable_damage = false
-# Despawn all non-peaceful mobs
-#only_peaceful_mobs = false
 # A chosen map seed for a new map, leave empty for random
 #fixed_map_seed =
 # Gives some stuff to players at the beginning

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index dc4a59be32b6bb05a450f22815736ea9ae648183..2d6851c2c2f2f3f25eeb23665b3229e21ab41cab 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -197,7 +197,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("creative_mode", "false");
        settings->setDefault("enable_damage", "true");
-       settings->setDefault("only_peaceful_mobs", "false");
        settings->setDefault("fixed_map_seed", "");
        settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");

diff --git a/src/environment.cpp b/src/environment.cpp
index 8977ee673db074c8bbb05fbb834fc1fa9e2c32f0..64c998671886609fa4b2061f0b517bf346de5022 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1225,11 +1225,6 @@ void ServerEnvironment::step(float dtime)
                                i != m_active_objects.end(); ++i)
                {
                        ServerActiveObject* obj = i->second;
-                       // Remove non-peaceful mobs on peaceful mode
-                       if(g_settings->getBool("only_peaceful_mobs")){
-                               if(!obj->isPeaceful())
-                                       obj->m_removed = true;
-                       }
                        // Don't step if is to be removed or stored statically
                        if(obj->m_removed || obj->m_pending_deactivation)
                                continue;

diff --git a/src/serverobject.h b/src/serverobject.h
index 13a075a2575b52dd59ce3f99ca9caace8d8c6de8..b57d3a2ba6beb968711b84f75a4bf994ed8cf15d 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -97,8 +97,6 @@ public:
        // If object has moved less than this and data has not changed,
        // saving to disk may be omitted
        virtual float getMinimumSavedMovement();
-       
-       virtual bool isPeaceful(){return true;}
 
        virtual std::string getDescription(){return "SAO";}