minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Remove legacy content_abm.{cpp,h}

mutilcraft-mt53
Loïc Blot 2017-06-14 16:23:08 +02:00
parent 4783ff956b
commit ddcd026344
6 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/android/jni/Android.mk
View File

@ -124,7 +124,6 @@ LOCAL_SRC_FILES := \
jni/src/clientobject.cpp \ jni/src/clientobject.cpp \
jni/src/clouds.cpp \ jni/src/clouds.cpp \
jni/src/collision.cpp \ jni/src/collision.cpp \
jni/src/content_abm.cpp \
jni/src/content_cao.cpp \ jni/src/content_cao.cpp \
jni/src/content_cso.cpp \ jni/src/content_cso.cpp \
jni/src/content_mapblock.cpp \ jni/src/content_mapblock.cpp \

1
src/CMakeLists.txt
View File

@ -370,7 +370,6 @@ set(common_SRCS
chat.cpp chat.cpp
clientiface.cpp clientiface.cpp
collision.cpp collision.cpp
content_abm.cpp
content_mapnode.cpp content_mapnode.cpp
content_nodemeta.cpp content_nodemeta.cpp
content_sao.cpp content_sao.cpp

34
src/content_abm.cpp
View File

@ -1,34 +0,0 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "content_abm.h"
#include "environment.h"
#include "gamedef.h"
#include "nodedef.h"
#include "content_sao.h"
#include "settings.h"
#include "mapblock.h" // For getNodeBlockPos
#include "map.h"
#include "scripting_server.h"
#include "log.h"
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef)
{
}

32
src/content_abm.h
View File

@ -1,32 +0,0 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef CONTENT_ABM_HEADER
#define CONTENT_ABM_HEADER
class ServerEnvironment;
class INodeDefManager;
/*
Legacy ActiveBlockModifiers
*/
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef);
#endif

1
src/network/serverpackethandler.cpp
View File

@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "server.h" #include "server.h"
#include "log.h" #include "log.h"
#include "content_abm.h"
#include "content_sao.h" #include "content_sao.h"
#include "emerge.h" #include "emerge.h"
#include "mapblock.h" #include "mapblock.h"

4
src/server.cpp
View File

@ -47,7 +47,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mg_biome.h" #include "mg_biome.h"
#include "content_mapnode.h" #include "content_mapnode.h"
#include "content_nodemeta.h" #include "content_nodemeta.h"
#include "content_abm.h"
#include "content_sao.h" #include "content_sao.h"
#include "mods.h" #include "mods.h"
#include "event_manager.h" #include "event_manager.h"
@ -318,9 +317,6 @@ Server::Server(
m_env->loadDefaultMeta(); m_env->loadDefaultMeta();
} }
// Add some test ActiveBlockModifiers to environment
add_legacy_abms(m_env, m_nodedef);
m_liquid_transform_every = g_settings->getFloat("liquid_update"); m_liquid_transform_every = g_settings->getFloat("liquid_update");
m_max_chatmessage_length = g_settings->getU16("chat_message_max_size"); m_max_chatmessage_length = g_settings->getU16("chat_message_max_size");
} }