summaryrefslogtreecommitdiff
path: root/src/content_object.h
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-14 22:43:22 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-14 22:43:28 +0200
commit3560f0de082a8950a84e2e866981f8bdfd05428a (patch)
treedfb765f7e590189f05e7807c80be72e6ecf8cc4d /src/content_object.h
parent5146c826be9386cc2adeb8f678063a2f9cfc1dee (diff)
parent81535f6277b66c869cda7125b2aeaf99e8078b92 (diff)
downloadminetest-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.gz
minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.bz2
minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.zip
Merge branch 'upstream/master'
Conflicts: data/oerkki1.png src/client.cpp
Diffstat (limited to 'src/content_object.h')
-rw-r--r--src/content_object.h29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/content_object.h b/src/content_object.h
new file mode 100644
index 000000000..ecabd8a38
--- /dev/null
+++ b/src/content_object.h
@@ -0,0 +1,29 @@
+/*
+Minetest-c55
+Copyright (C) 2010-2011 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 General Public License as published by
+the Free Software Foundation; either version 2 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 General Public License for more details.
+
+You should have received a copy of the GNU 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
+
+#endif
+