Changeset 10621 for code/branches/presentationFS15merge

Timestamp:

Oct 4, 2015, 3:30:38 PM (9 years ago)

Author:

landauf

Message:

don't call srand()! this is already done by Core. also fixed some MSVC-warnings

Location:

code/branches/presentationFS15merge/src/modules

Files:

• towerdefense/TowerDefense.cc (modified) (1 diff)
• towerdefense/TowerDefenseTower.cc (modified) (1 diff)
• weapons/projectiles/GravityBombField.cc (modified) (2 diffs)

code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc

@@ -431 +431 @@
         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 totalnumber = (numSpaceships + numEggs + numUfos)*1.3;
+        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.3f;
 
         int newspaceships = (int)(maxspaceships* numSpaceships / totalnumber);

code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc

@@ -67 +67 @@
             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;

code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc

@@ -64 +64 @@
         //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));
@@ -114 +113 @@
                 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_);