diff options
| author | Foghrye4 <foghrye4@gmail.com> | 2016-10-08 16:51:25 +0400 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-08 14:51:25 +0200 |
| commit | ad163ee5c3f7d6ca31e0add052fb76466a9bfcc8 (patch) | |
| tree | 6eebdb83bb210f4f57caa4a0f57189d95666d9c2 /src/content_sao.h | |
| parent | 9978d0796fa61eabb235d715a56ad6e5396d2e1e (diff) | |
| download | minetest-ad163ee5c3f7d6ca31e0add052fb76466a9bfcc8.tar.gz minetest-ad163ee5c3f7d6ca31e0add052fb76466a9bfcc8.tar.bz2 minetest-ad163ee5c3f7d6ca31e0add052fb76466a9bfcc8.zip | |
Prevent attached models from disappearing during parent reload (#4128)
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index c97db4922..341ebb5da 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -67,7 +67,7 @@ public: void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation); void addAttachmentChild(int child_id); void removeAttachmentChild(int child_id); - std::set<int> getAttachmentChildIds(); + UNORDERED_SET<int> getAttachmentChildIds(); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); /* LuaEntitySAO-specific */ @@ -116,7 +116,7 @@ private: bool m_bone_position_sent; int m_attachment_parent_id; - std::set<int> m_attachment_child_ids; + UNORDERED_SET<int> m_attachment_child_ids; std::string m_attachment_bone; v3f m_attachment_position; v3f m_attachment_rotation; @@ -210,7 +210,7 @@ public: void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation); void addAttachmentChild(int child_id); void removeAttachmentChild(int child_id); - std::set<int> getAttachmentChildIds(); + UNORDERED_SET<int> getAttachmentChildIds(); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); @@ -320,7 +320,7 @@ private: bool m_bone_position_sent; int m_attachment_parent_id; - std::set<int> m_attachment_child_ids; + UNORDERED_SET<int> m_attachment_child_ids; std::string m_attachment_bone; v3f m_attachment_position; v3f m_attachment_rotation; |