diff options
author | Stijn Buys <ingar@osirion.org> | 2013-11-02 21:32:11 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2013-11-02 21:32:11 +0000 |
commit | eeb9eb02113f2c483cce404460b22f11997a5b0c (patch) | |
tree | ef22e65c77014885377fc345cbc7be6a61455224 /src/core | |
parent | 4eedeb0bc1f40f6a67f609514f9732c8ec5a5c6d (diff) |
Copy currently mounted weapons onto wingmen.
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/entity.h | 7 | ||||
-rw-r--r-- | src/core/slots.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index 6878f08..721c329 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -744,11 +744,16 @@ public: /** * @brief returns true if a specified control flag is set * */ - inline bool has_target_controlflag(ControlFlags controlflag) + inline const bool has_target_controlflag(ControlFlags controlflag) const { return ((target_controlflags & controlflag) == controlflag); } + inline const math::Vector3f &aim() const + { + return target_aim; + } + /*----- serializers ----------------------------------------------- */ /// serialize the entity to a stream diff --git a/src/core/slots.h b/src/core/slots.h index 6ac9eb8..2452ccb 100644 --- a/src/core/slots.h +++ b/src/core/slots.h @@ -27,6 +27,8 @@ public: typedef Container::iterator iterator; + typedef Container::const_iterator const_iterator; + /** * @brief initialize slots collection from model properties * */ |