Changeset 6417 for code/trunk/src/libraries/core/BaseObject.h

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/BaseObject.h (modified) (3 diffs)

code/trunk/src/libraries/core/BaseObject.h

@@ -157 +157 @@
             void removeEventSource(BaseObject* source);
             BaseObject* getEventSource(unsigned int index, const std::string& state) const;
-            
+
             void addEventListener(BaseObject* listener);
             BaseObject* getEventListener(unsigned int index) const;
@@ -172 +172 @@
             /** @brief Returns the indentation of the debug output in the Loader. @return The indentation */
             inline const std::string& getLoaderIndentation() const { return this->loaderIndentation_; }
-            
+
             static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
 
@@ -210 +210 @@
             Gametype*              oldGametype_;
             std::set<Template*>    templates_;
-            
+
             std::map<BaseObject*, std::string>  eventSources_;           //!< List of objects which send events to this object, mapped to the state which they affect
             std::set<BaseObject*>               eventListeners_;         //!< List of objects which listen to the events of this object