Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove remenants of mob code

Browse Source 
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`.
This commit is contained in:
Pavel Puchkin 2014-10-23 22:17:47 +03:00 committed by ShadowNinja
parent 737cce5f2b
commit 73bf791fe1
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minetest.conf.example
View File

@ -283,8 +283,6 @@
#creative_mode = false #creative_mode = false
# Enable players getting damage and dying # Enable players getting damage and dying
#enable_damage = false #enable_damage = false
# Despawn all non-peaceful mobs
#only_peaceful_mobs = false
# A chosen map seed for a new map, leave empty for random # A chosen map seed for a new map, leave empty for random
#fixed_map_seed = #fixed_map_seed =
# Gives some stuff to players at the beginning # Gives some stuff to players at the beginning

1
src/defaultsettings.cpp
View File

@ -197,7 +197,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("strict_protocol_version_checking", "false"); settings->setDefault("strict_protocol_version_checking", "false");
settings->setDefault("creative_mode", "false"); settings->setDefault("creative_mode", "false");
settings->setDefault("enable_damage", "true"); settings->setDefault("enable_damage", "true");
settings->setDefault("only_peaceful_mobs", "false");
settings->setDefault("fixed_map_seed", ""); settings->setDefault("fixed_map_seed", "");
settings->setDefault("give_initial_stuff", "false"); settings->setDefault("give_initial_stuff", "false");
settings->setDefault("default_password", ""); settings->setDefault("default_password", "");

5
src/environment.cpp
View File

@ -1225,11 +1225,6 @@ void ServerEnvironment::step(float dtime)
i != m_active_objects.end(); ++i) i != m_active_objects.end(); ++i)
{ {
ServerActiveObject* obj = i->second; 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 // Don't step if is to be removed or stored statically
if(obj->m_removed || obj->m_pending_deactivation) if(obj->m_removed || obj->m_pending_deactivation)
continue; continue;

2
src/serverobject.h
View File

@ -98,8 +98,6 @@ public:
// saving to disk may be omitted // saving to disk may be omitted
virtual float getMinimumSavedMovement(); virtual float getMinimumSavedMovement();
virtual bool isPeaceful(){return true;}
virtual std::string getDescription(){return "SAO";} virtual std::string getDescription(){return "SAO";}
/* /*