Changeset 11163 for code/branches/tgidronFS16/src/modules

Timestamp:

Apr 14, 2016, 1:00:08 PM (9 years ago)

Author:

tgidron

Message:

Pickup Development

Location:

code/branches/tgidronFS16/src/modules/hover

Files:

• FlagHUD.cc (modified) (1 diff)
• Hover.cc (modified) (5 diffs)
• Hover.h (modified) (3 diffs)

code/branches/tgidronFS16/src/modules/hover/FlagHUD.cc

@@ -54 +54 @@
         this->overlay_->add2D(this->panel_);
 
-        this->flagCount_ = 1;
-        setFlagCount(1);
+        this->flagCount_ = 5;
+        setFlagCount(5);
     }
 

code/branches/tgidronFS16/src/modules/hover/Hover.cc

@@ -41 +41 @@
 #include "gamestates/GSLevel.h"
 
+#include "pickup/PickupSpawner.h"
+#include "pickup/Pickup.h"
+
 namespace orxonox
 {
@@ -61 +64 @@
         this->setHUDTemplate("HoverHUD");
 
-        
     }
 
@@ -89 +91 @@
             }
 
+
+
             //Generate inner Walls according to levelcode
             for(int y=0; y<numCells; y++){
@@ -103 +107 @@
 
             //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 1; i++ )
+            for ( int i = 0; i < 5; i++ )
             {
                 HoverFlag* flag = new HoverFlag(origin_->getContext());
                 flag->init(rand()%numCells, rand()%numCells, cellSize);
                 flags_.push_back(flag);
+            }
+            
+
+            //Generate 10 Pickups randomly
+            for (int i = 0; i<10; i++)
+            {
+                PickupSpawner* pickup = new PickupSpawner(origin_->getContext());
+                //PickupSpawner(this->getContext());
+                //pickup->createDroppedPickup(this->getContext(), pickup , this, 10);
+                pickups_.push_back(pickup);
             }
 
@@ -117 +131 @@
     void Hover::startLevel(){
         //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 1; i++ )
+            for ( int i = 0; i < 5; i++ )
             {
                 HoverFlag* flag = new HoverFlag(origin_->getContext());

code/branches/tgidronFS16/src/modules/hover/Hover.h

@@ -42 +42 @@
 #include "gametypes/Gametype.h"
 #include "HoverOrigin.h"
+#include "pickup/PickupSpawner.h"
 
 namespace orxonox
@@ -61 +62 @@
 
 
+
             inline int getNumberOfFlags() const
                 { return this->numberOfFlags_; }
@@ -76 +78 @@
             int cellHeight;
             int numCells;
+
+            std::vector<PickupSpawner*> pickups_;
     };
 }