Changeset 11071 for code/trunk/src/orxonox/Scene.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/Scene.h
r10624 r11071 40 40 #include "util/OgreForwardRefs.h" 41 41 #include "core/BaseObject.h" 42 #include "core/object/Context.h" 42 43 #include "network/synchronisable/Synchronisable.h" 43 44 #include "tools/interfaces/Tickable.h" … … 51 52 virtual ~Scene(); 52 53 53 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;54 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 54 55 void registerVariables(); 55 56 … … 79 80 { return this->radar_; } 80 81 81 inline virtual uint32_t getSceneID() const{ return this->getObjectID(); }82 virtual inline uint32_t getSceneID() const override { return this->getObjectID(); } 82 83 83 virtual void tick(float dt) ;84 virtual void tick(float dt) override; 84 85 85 86 private: … … 111 112 public: 112 113 inline bool hasPhysics() const 113 { return this->physicalWorld_ != 0; }114 { return this->physicalWorld_ != nullptr; } 114 115 void setPhysicalWorld(bool wantsPhysics); 115 116
Note: See TracChangeset
for help on using the changeset viewer.