Changeset 11052 for code/trunk/src/modules/towerdefense

Timestamp:

Jan 9, 2016, 6:26:20 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseField.cc (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseField.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseTower.cc (modified) (1 diff)

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

@@ -88 +88 @@
             {
                 moveDownPressed_ = false;
-                selectedPos_->Set(selecterPosX, selecterPosY - 1);
+                selectedPos_->Set(selecterPosX, selecterPosY - 1);
                 updatePosition();
             }
@@ -100 +100 @@
             {
                 moveRightPressed_ = false;
-                selectedPos_->Set(selecterPosX + 1, selecterPosY);
+                selectedPos_->Set(selecterPosX + 1, selecterPosY);
                 updatePosition();
             }

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

@@ -61 +61 @@
         {
             upgrade++;
-            float reloadrate = getReloadRate();
-            float reloadwaittime = getReloadWaitTime();
             this->setDamageMultiplier((upgrade+1)*2.0f);
+
             //this->setRotationThrust(2*this->getRotationThrust());
-            reloadrate = 0.5f*reloadrate;
-            reloadwaittime = 0.5f*reloadwaittime;
-            setReloadRate(reloadrate);
-            setReloadWaitTime(reloadwaittime);
             //this->addTemplate("towerturret1");
         }