[Orxonox-commit 5962] r10621 - in code/branches/presentationFS15merge/src/modules: towerdefense weapons/projectiles

[landauf at orxonox.net]

Author: landauf
Date: 2015-10-04 15:30:38 +0200 (Sun, 04 Oct 2015)
New Revision: 10621

Modified:
   code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc
   code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc
   code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc
Log:
don't call srand()! this is already done by Core. also fixed some MSVC-warnings

Modified: code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc	2015-10-04 13:18:10 UTC (rev 10620)
+++ code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc	2015-10-04 13:30:38 UTC (rev 10621)
@@ -430,11 +430,11 @@
 
     	int helpnumber = 40 -(waves_);
     	if(helpnumber <= 0) {helpnumber =1;}
-        float numSpaceships = std::abs((rand() % 100)*5*(helpnumber));
-        float numEggs = std::abs((rand() % 100)*1*(waves_));
-        float numUfos = std::abs((rand() % 100)*1.5*(0.5*(waves_))) ;
+        float numSpaceships = std::abs((rand() % 100)*5.0f*(helpnumber));
+        float numEggs = std::abs((rand() % 100)*1.0f*(waves_));
+        float numUfos = std::abs((rand() % 100)*1.5f*(0.5f*(waves_))) ;
 
-        float totalnumber = (numSpaceships + numEggs + numUfos)*1.3;
+        float totalnumber = (numSpaceships + numEggs + numUfos)*1.3f;
 
         int newspaceships = (int)(maxspaceships* numSpaceships / totalnumber);
         int neweggs = (int)(maxspaceships*numEggs / totalnumber);

Modified: code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc
===================================================================
--- code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc	2015-10-04 13:18:10 UTC (rev 10620)
+++ code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc	2015-10-04 13:30:38 UTC (rev 10621)
@@ -66,7 +66,7 @@
             upgrade++;
             float reloadrate = getReloadRate();
             float reloadwaittime = getReloadWaitTime();
-            this->setDamageMultiplier((upgrade+1)*1.5);
+            this->setDamageMultiplier((upgrade+1)*1.5f);
             this->setRotationThrust(2*this->getRotationThrust());
             reloadrate = 0.7f*reloadrate;
             reloadwaittime = 0.7f*reloadwaittime;

Modified: code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc	2015-10-04 13:18:10 UTC (rev 10620)
+++ code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc	2015-10-04 13:30:38 UTC (rev 10621)
@@ -63,10 +63,9 @@
 
         //Let the Bomb Modell in the centre rotate in a random direction.
         Vector3 randomRotation;
-        srand(time(NULL));
-        randomRotation.x = rand();
-        randomRotation.y = rand();
-        randomRotation.y = rand();
+        randomRotation.x = rnd();
+        randomRotation.y = rnd();
+        randomRotation.y = rnd();
         randomRotation.normalise();
         bombModel_->setAngularAcceleration(randomRotation*(PEAK_ANGULAR_VELOCITY/FORCE_FIELD_LIFETIME));
 
@@ -113,7 +112,7 @@
                 //Add particle effect to visualize explosion
                 explosionCross_ = new ParticleEmitter(this->getContext());
                 explosionCross_->setSource("Orxonox/FieldExplosion");
-                explosionCross_->setOrientation(rand(), rand(), rand(), rand());
+                explosionCross_->setOrientation(rnd(), rnd(), rnd(), rnd());
                 explosionCross_->setScale(0.7);
                 this->attach(explosionCross_);