Changeset 12086 for code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc

Timestamp:

Nov 7, 2018, 11:26:02 AM (5 years ago)

Author:

sastocke

Message:

switching towers

File:

• code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc (modified) (2 diffs)

code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc

@@ -205 +205 @@
     void TixyTaxyTorxy::upgradeTower(int x, int y)
     {    
-        TixyTaxyTorxyCoordinate* coord = new TixyTaxyTorxyCoordinate(x,y);
-        x = coord->GetX();
-        y = coord->GetY();     
-
-        int cost = center_->getTowerCost(fields_[x][y]->getUpgrade() + 1);
-
-        if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
-        {
-            payCredit(cost);
-            fields_[x][y]->upgrade();
-        }
+        // TixyTaxyTorxyCoordinate* coord = new TixyTaxyTorxyCoordinate(x,y);
+        // x = coord->GetX();
+        // y = coord->GetY();     
+
+        // int cost = 100;
+
+        // if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
+        // {
+        //     payCredit(cost);
+        //     fields_[x][y]->upgrade();
+        // }
     }    
 
@@ -234 +234 @@
             selecter->buildTower_ = false;
 
-            if (getField(selecter->selectedPos_)->canUpgrade() == true)
-            {
-                upgradeTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
-            }
-            else
-            {
-                addTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
-            }            
+            // if (getField(selecter->selectedPos_)->canUpgrade() == true)
+            // {
+            //     upgradeTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
+            // }
+            
+            addTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
+                    
         }