diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-17 11:37:55 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-17 11:37:55 +0100 |
| commit | c58d49977da5aab88f5a9d5b540c6237ca5cdcb5 (patch) | |
| tree | a5bc0c0987b57cbee1052c0289c19cbf5274fcb3 /src/environment.cpp | |
| parent | f8d5af753617d502920556cff88f451ef670c210 (diff) | |
| download | minetest-c58d49977da5aab88f5a9d5b540c6237ca5cdcb5.tar.gz minetest-c58d49977da5aab88f5a9d5b540c6237ca5cdcb5.tar.bz2 minetest-c58d49977da5aab88f5a9d5b540c6237ca5cdcb5.zip | |
SAO: re-add old ActiveObjectTypes for a future migration layer
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index e1f79803b..166523a4f 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1700,7 +1700,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s) StaticObject &s_obj = *i; // Create an active object from the data ServerActiveObject *obj = ServerActiveObject::create - (s_obj.type, this, 0, s_obj.pos, s_obj.data); + ((ActiveObjectType) s_obj.type, this, 0, s_obj.pos, s_obj.data); // If couldn't create object, store static data back. if(obj==NULL) { @@ -2488,7 +2488,7 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type, const std::string &init_data) { ClientActiveObject* obj = - ClientActiveObject::create(type, m_gamedef, this); + ClientActiveObject::create((ActiveObjectType) type, m_gamedef, this); if(obj == NULL) { infostream<<"ClientEnvironment::addActiveObject(): " |