diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 15:48:56 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 15:48:56 +0300 |
| commit | 91cfbe2891a3fbec2aac019ccfba74b667d94fc4 (patch) | |
| tree | 21ab12f020d71dc7c1534e16d2b295bdd322969e /src/activeobject.h | |
| parent | 3b098fd5dc1a3e05d671b3ec1a9acb20a036b88f (diff) | |
| download | minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.tar.gz minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.tar.bz2 minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.zip | |
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
Diffstat (limited to 'src/activeobject.h')
| -rw-r--r-- | src/activeobject.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/activeobject.h b/src/activeobject.h index 382f7f798..09ee23a14 100644 --- a/src/activeobject.h +++ b/src/activeobject.h @@ -23,6 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include <string> +#define ACTIVEOBJECT_TYPE_INVALID 0 +// Other types are defined in content_object.h + struct ActiveObjectMessage { ActiveObjectMessage(u16 id_, bool reliable_=true, std::string data_=""): @@ -36,12 +39,6 @@ struct ActiveObjectMessage std::string datastring; }; -#define ACTIVEOBJECT_TYPE_INVALID 0 -#define ACTIVEOBJECT_TYPE_TEST 1 -#define ACTIVEOBJECT_TYPE_ITEM 2 -#define ACTIVEOBJECT_TYPE_RAT 3 -#define ACTIVEOBJECT_TYPE_OERKKI1 4 - /* Parent class for ServerActiveObject and ClientActiveObject */ |