Changeset 10629 for code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc

Timestamp:

Oct 10, 2015, 4:34:26 PM (9 years ago)

Author:

fvultier

Message:

Merged towerdefenseFabien branch back to trunk. The towerdefense Minigame is now a plugin.

File:

• code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (4 diffs)

code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -51 +51 @@
         moveLeftPressed_ = false;
         moveRightPressed_ = false;
-        firePressed_ = false;
-        setSelectedPosition(6,6);
-        timerSetFire_=0;
+        boostPressed_ = false;
+        buildTower_ = false;
+        setSelectedPosition(0,0);     
     }
 
@@ -70 +70 @@
         SUPER(TowerDefenseSelecter, tick, dt);
 
+        time_ += dt;
 
-        if (hasLocalController())
-        {
-                timerSetFire_ +=dt;
+        if (hasLocalController() && time_ >= 0.25)
+        {    
+            time_ = 0;
 
-                if(timerSetFire_ >= 0.25)
-                {
-                        timerSetFire_ = 0;
+            int selecterPosX = selectedPos_->GetX();
+            int selecterPosY = selectedPos_->GetY();
 
-                        int selecterPosX = selectedPos_->GetX();
-                                int selecterPosY = selectedPos_->GetY();
-
-                                if (moveUpPressed_ == true)
-                                {
-                                        moveUpPressed_ = false;
-                                        selectedPos_->Set(selecterPosX, selecterPosY + 1);
-                                        updatePosition();
-                                }
-                                if (moveDownPressed_ == true)
-                                {
-                                        moveDownPressed_ = false;
-                                        selectedPos_->Set(selecterPosX, selecterPosY - 1);
-                                        updatePosition();
-                                }
-
-                                if (moveLeftPressed_ == true)
-                                {
-                                        moveLeftPressed_ = false;
-                                        selectedPos_->Set(selecterPosX - 1, selecterPosY);
-                                        updatePosition();
-                                }
-                                if (moveRightPressed_ == true)
-                                {
-                                        moveRightPressed_ = false;
-                                        selectedPos_->Set(selecterPosX + 1, selecterPosY);
-                                        updatePosition();
-                                }
-
-
-                        }
-
-
-
-        }
-     }
+            if (moveUpPressed_ == true)
+            {                
+                moveUpPressed_ = false;
+                selectedPos_->Set(selecterPosX, selecterPosY + 1);
+                updatePosition();
+            }
+            if (moveDownPressed_ == true)
+            {
+                moveDownPressed_ = false;
+                selectedPos_->Set(selecterPosX, selecterPosY - 1);
+                updatePosition();
+            }
+            if (moveLeftPressed_ == true)
+            {
+                moveLeftPressed_ = false;
+                selectedPos_->Set(selecterPosX - 1, selecterPosY);
+                updatePosition();
+            }
+            if (moveRightPressed_ == true)
+            {
+                moveRightPressed_ = false;
+                selectedPos_->Set(selecterPosX + 1, selecterPosY);
+                updatePosition();
+            }
+            if (boostPressed_ == true)
+            {
+                boostPressed_ = false;
+                buildTower_ = true;
+            }
+        }         
+    }
 
 
@@ -157 +152 @@
     }
 
+    void TowerDefenseSelecter::fire(unsigned int firemode)
+    {
+    }
+
+    void TowerDefenseSelecter::fired(unsigned int firemode)
+    {
+        
+    }
 
     void TowerDefenseSelecter::boost(bool bBoost)
     {
-        firePressed_ = true;
-        orxout() << "boost" << endl;
+        if (bBoost == true)
+        {
+            boostPressed_ = true;
+        }
     }
-
 
     void TowerDefenseSelecter::updatePosition()
@@ -180 +184 @@
         setSelectedPosition(new TDCoordinate(x,y));
     }
-
-
 }