Changeset 9961

Timestamp:

Jan 3, 2014, 9:20:39 PM (10 years ago)

Author:

landauf

Message:

fixed warnings (msvc)

Location:

code/trunk/src/modules/invader

Files:

• Invader.cc (modified) (2 diffs)
• InvaderEnemy.cc (modified) (1 diff)
• InvaderEnemyShooter.cc (modified) (1 diff)
• InvaderHUDinfo.cc (modified) (1 diff)
• InvaderWeapon.cc (modified) (1 diff)

code/trunk/src/modules/invader/Invader.cc

@@ -88 +88 @@
             {
                 WeakPtr<BigExplosion> chunk = new BigExplosion(this->center_->getContext());
-                chunk->setPosition(Vector3(600, 0, 100 * i - 300));
+                chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
                 chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
                 chunk->setScale(20);
@@ -130 +130 @@
             newPawn->level = level;
             // spawn enemy at random points in front of player.
-            newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
+            newPawn->setPosition(player->getPosition() + Vector3(500.f + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
         }
     }

code/trunk/src/modules/invader/InvaderEnemy.cc

@@ -56 +56 @@
         if (player != NULL)
         {
-            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01, 2) + 1) * (player->getPosition().z - getPosition().z);
-            setVelocity(Vector3(1000 - level * 100 , 0, newZ));
+            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
+            setVelocity(Vector3(1000.f - level * 100 , 0, newZ));
         }
         SUPER(InvaderEnemy, tick, dt);

code/trunk/src/modules/invader/InvaderEnemyShooter.cc

@@ -60 +60 @@
             float distPlayer = player->getPosition().z - getPosition().z;
             // orxout() << "i'm different!" << endl;
-            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01, 2) + 1) * distPlayer;
+            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * distPlayer;
             setVelocity(Vector3(950 - abs(distPlayer), 0, newZ));
         }

code/trunk/src/modules/invader/InvaderHUDinfo.cc

@@ -117 +117 @@
                 this->setCaption(Multiplier);
                 this->setColour(ColourValue(1, 0, 0, clamp(float(mult * 0.1), 0.0f, 1.0f)));
-                this->setTextSize(clamp(float(mult * 0.1), 0.0f, 1.0f) * 0.01 + 0.04);
+                this->setTextSize(clamp(float(mult * 0.1), 0.0f, 1.0f) * 0.01f + 0.04f);
             }
         }

code/trunk/src/modules/invader/InvaderWeapon.cc

@@ -73 +73 @@
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         // only shoot in foreward direction
-        projectile->setOrientation(Quaternion(sqrt(0.5),0,sqrt(0.5),0));
+        projectile->setOrientation(Quaternion(sqrt(0.5f),0,sqrt(0.5f),0));
         projectile->setPosition(this->getMuzzlePosition());
         // only shoot in foreward direction