From: Loïc Blot <loic.blot@unix-experience.fr>
Date: Wed, 14 Jun 2017 14:23:08 +0000 (+0200)
Subject: Remove legacy content_abm.{cpp,h}
X-Git-Tag: 5.0.0~1103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ddcd0263442df2066d7afa0ec1180fe12da99e59;p=oweals%2Fminetest.git

Remove legacy content_abm.{cpp,h}
---

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 8f3b342c5..22ef20906 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -124,7 +124,6 @@ LOCAL_SRC_FILES := \
 		jni/src/clientobject.cpp                  \
 		jni/src/clouds.cpp                        \
 		jni/src/collision.cpp                     \
-		jni/src/content_abm.cpp                   \
 		jni/src/content_cao.cpp                   \
 		jni/src/content_cso.cpp                   \
 		jni/src/content_mapblock.cpp              \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08ea809c7..ad5639a48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -370,7 +370,6 @@ set(common_SRCS
 	chat.cpp
 	clientiface.cpp
 	collision.cpp
-	content_abm.cpp
 	content_mapnode.cpp
 	content_nodemeta.cpp
 	content_sao.cpp
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
deleted file mode 100644
index 162f93364..000000000
--- a/src/content_abm.cpp
+++ /dev/null
@@ -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)
-{
-}
diff --git a/src/content_abm.h b/src/content_abm.h
deleted file mode 100644
index 0fb3a0413..000000000
--- a/src/content_abm.h
+++ /dev/null
@@ -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
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 6c766a37a..da421b36d 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "log.h"
 
-#include "content_abm.h"
 #include "content_sao.h"
 #include "emerge.h"
 #include "mapblock.h"
diff --git a/src/server.cpp b/src/server.cpp
index a6af742a5..b4b6882e5 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -47,7 +47,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mg_biome.h"
 #include "content_mapnode.h"
 #include "content_nodemeta.h"
-#include "content_abm.h"
 #include "content_sao.h"
 #include "mods.h"
 #include "event_manager.h"
@@ -318,9 +317,6 @@ Server::Server(
 		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_max_chatmessage_length = g_settings->getU16("chat_message_max_size");
 }