Changeset 12337 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

Timestamp:

May 2, 2019, 4:40:50 PM (5 years ago)

Author:

pomselj

Message:

Ball can do bouncy stuff

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified) (3 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

@@ -43 +43 @@
 #include "OrxoBloxCenterpoint.h"
 #include "OrxoBloxWall.h"
+#include "OrxoBloxShip.h"
 
 namespace orxonox
@@ -72 +73 @@
             virtual void end() override; ///!< Ends the OrxoBlox minigame.
 
-            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
-
             OrxoBloxShip* getPlayer();
+            void spawnPlayer(PlayerInfo* Player) override;
 
             void LevelUp();
@@ -97 +97 @@
             WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
             WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
+            unsigned int level_;
             
+            WeakPtr<OrxoBloxShip> playership;
             PlayerInfo* player_;
-            unsigned int level_;
-
             Timer starttimer_; //!< A timer to delay the start of the game.