projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some serialization version stuff
[oweals/minetest.git]
/
src
/
activeobject.h
diff --git
a/src/activeobject.h
b/src/activeobject.h
index 041be0778b8f6d42abeee1d024aeeb9699bf7f26..c46ae61b2a980987a258e45895713f928e2a2bb2 100644
(file)
--- a/
src/activeobject.h
+++ b/
src/activeobject.h
@@
-20,9
+20,12
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef ACTIVEOBJECT_HEADER
#define ACTIVEOBJECT_HEADER
#ifndef ACTIVEOBJECT_HEADER
#define ACTIVEOBJECT_HEADER
-#include "
common_irrlicht
.h"
+#include "
irrlichttypes
.h"
#include <string>
#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_=""):
struct ActiveObjectMessage
{
ActiveObjectMessage(u16 id_, bool reliable_=true, std::string data_=""):
@@
-36,10
+39,6
@@
struct ActiveObjectMessage
std::string datastring;
};
std::string datastring;
};
-#define ACTIVEOBJECT_TYPE_INVALID 0
-#define ACTIVEOBJECT_TYPE_TEST 1
-#define ACTIVEOBJECT_TYPE_ITEM 2
-
/*
Parent class for ServerActiveObject and ClientActiveObject
*/
/*
Parent class for ServerActiveObject and ClientActiveObject
*/