Changeset 11342 for code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h

Timestamp:

Dec 14, 2016, 4:05:11 PM (7 years ago)

Author:

maxima

Message:

spacerace branch merged to presentation

Location:

code/branches/Presentation_HS16

Files:

• . (modified) (1 prop)
• src/orxonox/infos/GametypeInfo.h (modified) (2 diffs)

code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h

@@ -83 +83 @@
             inline bool isStartCountdownRunning() const
                 { return this->bStartCountdownRunning_; }
+            
             void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
 
@@ -132 +133 @@
             void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
             void dispatchFadingMessage(const std::string& message) const;
+            void setStartCountdown(float countdown); // Set the start countdown to the input value.
+
 
         protected:
             void start(void); // Inform the GametypeInfo that the game has started.
             void end(void); // Inform the GametypeInfo that the game has ended.
-            void setStartCountdown(float countdown); // Set the start countdown to the input value.
             void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
             void countDown(); // Count down the start countdown counter.