Changeset 660 for code/branches/FICN/src/orxonox

Timestamp:

Dec 20, 2007, 4:26:02 PM (17 years ago)

Author:

nicolasc

Message:

• added FIXME-tags - should be selfexplanatory

Location:

code/branches/FICN/src/orxonox

Files:

• hud/HUD.cc (modified) (1 diff)
• objects/Camera.cc (modified) (1 diff)
• objects/Projectile.cc (modified) (1 diff)
• objects/SpaceShip.cc (modified) (1 diff)
• objects/weapon_system/ammunition_dump.cc (modified) (1 diff)

code/branches/FICN/src/orxonox/hud/HUD.cc

@@ -178 +178 @@
     rocketNum4_ = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/RocketNum4");
 
+    // FIXME: unused vars!
     float energyDistrPixelX_ = 100;
     float energyDistrPixelY_ = 86;

code/branches/FICN/src/orxonox/objects/Camera.cc

@@ -62 +62 @@
         sceneNode->attachObject((Ogre::MovableObject*)cam);
 
-
+        // FIXME: unused var
         Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
 

code/branches/FICN/src/orxonox/objects/Projectile.cc

@@ -50 +50 @@
                 if (this->getPosition().squaredDistance(it->getPosition()) <= (radius*radius))
                 {
-                    Explosion* eplosion = new Explosion(this);
+                    Explosion* explosion = new Explosion(this);
                     delete this;
                     return;

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -347 +347 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
+            // FIXME, unused var; try recycling of projectiles
             Projectile* proj = new Projectile(this);
             this->timeToReload_ = this->reloadTime_;

code/branches/FICN/src/orxonox/objects/weapon_system/ammunition_dump.cc

@@ -106 +106 @@
   {
     int id = Orxonox::getSingleton()->getBulletMgr()->getAmmunitionID(name);
-    if (id = -1)
+    // FIXME changed = to ==, check if correct
+    if (id == -1)
       return -1;
     return stock_[id];