diff options
author | Rogier <rogier777@gmail.com> | 2017-01-10 04:39:45 +0900 |
---|---|---|
committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2017-01-11 15:53:56 +0100 |
commit | 66479394037baa941cb06d75d3afc79ff4c717a2 (patch) | |
tree | ade7d34a6c37987ebbd227df422c5643473194e8 /src/serverobject.h | |
parent | ec30d49e026af2d0cb8329eb66aec48d12e79839 (diff) | |
download | minetest-66479394037baa941cb06d75d3afc79ff4c717a2.tar.gz minetest-66479394037baa941cb06d75d3afc79ff4c717a2.tar.bz2 minetest-66479394037baa941cb06d75d3afc79ff4c717a2.zip |
Performance fix + SAO factorization
Original credits goes to @Rogier-5
* Merge common attributes between LuaEntitySAO & PlayerSAO to UnitSAO
* Make some functions const
* Improve some lists performance by returning const ref
Signed-off-by: Loic Blot <loic.blot@unix-experience.fr>
Diffstat (limited to 'src/serverobject.h')
-rw-r--r-- | src/serverobject.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serverobject.h b/src/serverobject.h index 9884eb0a1..9e8b5a779 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -146,8 +146,8 @@ public: virtual void setArmorGroups(const ItemGroupList &armor_groups) {} - virtual ItemGroupList getArmorGroups() - { return ItemGroupList(); } + virtual const ItemGroupList &getArmorGroups() + { static const ItemGroupList rv; return rv; } virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity) {} virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop) @@ -166,8 +166,8 @@ public: {} virtual void removeAttachmentChild(int child_id) {} - virtual UNORDERED_SET<int> getAttachmentChildIds() - { return UNORDERED_SET<int>(); } + virtual const UNORDERED_SET<int> &getAttachmentChildIds() + { static const UNORDERED_SET<int> rv; return rv; } virtual ObjectProperties* accessObjectProperties() { return NULL; } virtual void notifyObjectPropertiesModified() |