summaryrefslogtreecommitdiff
path: root/src/content_object.h
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-02-16 17:42:13 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-02-17 09:09:50 +0100
commitf8d5af753617d502920556cff88f451ef670c210 (patch)
tree885cb89cd4671e9a55a4d5e7246801748f2f848b /src/content_object.h
parent98d80e2012ab4856b8b443ef498297e3d3eadbaa (diff)
downloadminetest-f8d5af753617d502920556cff88f451ef670c210.tar.gz
minetest-f8d5af753617d502920556cff88f451ef670c210.tar.bz2
minetest-f8d5af753617d502920556cff88f451ef670c210.zip
SAO work: ActiveObject types & SAO cleanup * Replace u8 types with ActiveObjectType. * Merge content_object.h into activeobject.h * Remove DummyLoadSAO, it's now unused. * Remove ItemSAO, it's also unused
Diffstat (limited to 'src/content_object.h')
-rw-r--r--src/content_object.h39
1 files changed, 0 insertions, 39 deletions
diff --git a/src/content_object.h b/src/content_object.h
deleted file mode 100644
index 65a829773..000000000
--- a/src/content_object.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Minetest
-Copyright (C) 2010-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_OBJECT_HEADER
-#define CONTENT_OBJECT_HEADER
-
-#define ACTIVEOBJECT_TYPE_TEST 1
-#define ACTIVEOBJECT_TYPE_ITEM 2
-#define ACTIVEOBJECT_TYPE_RAT 3
-#define ACTIVEOBJECT_TYPE_OERKKI1 4
-#define ACTIVEOBJECT_TYPE_FIREFLY 5
-#define ACTIVEOBJECT_TYPE_MOBV2 6
-
-#define ACTIVEOBJECT_TYPE_LUAENTITY 7
-
-// Special type, not stored as a static object
-#define ACTIVEOBJECT_TYPE_PLAYER 100
-
-// Special type, only exists as CAO
-#define ACTIVEOBJECT_TYPE_GENERIC 101
-
-#endif
-