From f8d5af753617d502920556cff88f451ef670c210 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 16 Feb 2015 17:42:13 +0100 Subject: 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 --- src/content_object.h | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 src/content_object.h (limited to 'src/content_object.h') 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 - -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 - -- cgit v1.2.3