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

Timestamp:

Oct 31, 2015, 11:06:37 AM (9 years ago)

Author:

landauf

Message:

fixed warnings with MSVC14

Location:

code/trunk/src/modules/towerdefense

Files:

• TowerDefense.cc (modified) (1 diff)
• TowerDefenseTower.cc (modified) (1 diff)

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

@@ -331 +331 @@
             timeSinceLastSpawn_ = 0.0;
 
-            timeUntilNextWave_ = waveNumber_+20;
+            timeUntilNextWave_ = waveNumber_+20.0f;
             waveSize_ = waveNumber_+5;
         }

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

@@ -63 +63 @@
             float reloadrate = getReloadRate();
             float reloadwaittime = getReloadWaitTime();
-            this->setDamageMultiplier((upgrade+1)*2);
+            this->setDamageMultiplier((upgrade+1)*2.0f);
             //this->setRotationThrust(2*this->getRotationThrust());
             reloadrate = 0.5f*reloadrate;