Changeset 11495 for code/trunk/src/modules/hover/Hover.h

Timestamp:

Oct 23, 2017, 12:23:21 AM (7 years ago)

Author:

patricwi

Message:

reverted commit from merge with tgidronFS16 because failed to compile

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/hover/Hover.h (modified) (4 diffs)

code/trunk/src/modules/hover/Hover.h

@@ -24 +24 @@
  *   Co-authors:
  *      Cyrill Burgener
- *      Tomer Gidron
  *
  */
@@ -38 +37 @@
 
 #include "HoverPrereqs.h"
-#include "HoverShip.h"
 
 #include <vector>
@@ -44 +42 @@
 #include "gametypes/Gametype.h"
 #include "HoverOrigin.h"
-#include "pickup/PickupSpawner.h"
 
 namespace orxonox
@@ -58 +55 @@
                 { this->origin_ = origin; }
 
-            void start();
-            void createFlags();
-            void levelUp();
-            void endLevel();
-            void costLife();
-
             inline int getNumberOfFlags() const
                 { return this->numberOfFlags_; }
 
-            virtual Vector3 get3dCoordinates(int x, int y, float heightOffset);
-
-            inline int getTotFlags() const
-                { return this->totFlags; }
-
-            inline int getLives() const
-                { return this->lives; }
-
-            inline int getLevel() const
-                { return this->level; }
-
-            bool bLevelUpgradeHUD;
-
         private:
-
             WeakPtr<HoverOrigin> origin_;
             std::vector<HoverFlag*> flags_;
             int numberOfFlags_;
             bool firstTick_;
-            int level;
-            int lives;
-            int flagsTaken;
-
-            int cellSize;
-            int cellHeight;
-            int numCells;
-
-            int totFlags;
-
-            std::vector<PickupSpawner*> pickupSpawners_;
-
-            void toggleShowLevel(){bLevelUpgradeHUD = !bLevelUpgradeHUD;}
-
-            Timer showLevelTimer;
     };
 }