Changeset 660 for code/branches

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

Files:

• audio/AudioBuffer.cc (modified) (1 diff)
• loader/LevelLoader.cc (modified) (2 diffs)
• loader/LevelLoader.h (modified) (2 diffs)
• network/Server.cc (modified) (9 diffs)
• network/dummyclient2.cc (modified) (1 diff)
• orxonox/hud/HUD.cc (modified) (1 diff)
• orxonox/objects/Camera.cc (modified) (1 diff)
• orxonox/objects/Projectile.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• orxonox/objects/weapon_system/ammunition_dump.cc (modified) (1 diff)
• tinyxml/tinystr.cc (modified) (2 diffs)

code/branches/FICN/src/audio/AudioBuffer.cc

@@ -38 +38 @@
                         loaded=AL_FALSE;
 
+    //FIXME deprecated
                 alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
                 alBufferData(buffer, format, data, size, freq);
+    //FIXME deprecated
                 alutUnloadWAV(format, data, size, freq);
 

code/branches/FICN/src/loader/LevelLoader.cc

@@ -108 +108 @@
 
                         Ogre::OverlayManager& omgr = Ogre::OverlayManager::getSingleton();
-                        Ogre::Overlay* mLoadOverlay;
+                        Ogre::Overlay* mLoadOverlay; // FIXME: mey be uninitialized
 
                         // Set loading screen
@@ -152 +152 @@
                                 {
                                         tNode = 0;
-          //FIXME something is worng, probably ==
+          //FIXME something is wrong, probably missing ==
                                         while( tNode = audioElem->IterateChildren( tNode ) )
                                         {

code/branches/FICN/src/loader/LevelLoader.h

@@ -37 +37 @@
     inline string image() {return image_; };
   private:
-    // Level information
+    //! Level information
     std::string name_;
     std::string description_;
@@ -49 +49 @@
     std::string loadingBarHeight_;
 
-    // Set to true if it was possible to load the level file
+    //! Set to true if it was possible to load the level file
     bool valid_;
 

code/branches/FICN/src/network/Server.cc

@@ -50 +50 @@
     gamestates = new GameStateManager(clients);
   }
-  
+
   /**
    * This function opens the server by creating the listener thread
@@ -58 +58 @@
     return;
   }
-  
+
   /**
    * This function closes the server
@@ -66 +66 @@
     return;
   }
-  
+
   /**
    * This function sends out a message to all clients
@@ -95 +95 @@
     return false;
   }
-  
+
   /**
    * Run this function once every tick
@@ -106 +106 @@
     return;
   }
-  
+
   /**
    * processes all the packets waiting in the queue
@@ -119 +119 @@
     }
   }
-  
+
   /**
    * takes a new snapshot of the gamestate and sends it to the clients
@@ -129 +129 @@
     //std::cout << "sent gamestate" << std::endl;
   }
-  
+
   /**
    * sends the gamestate
@@ -151 +151 @@
       int cid = temp->getID();
       std::cout << "server, got acked ID: " << gid << std::endl;
-      GameStateCompressed *gs = &(gamestates->popGameState(cid));
+      GameStateCompressed *gs = &(gamestates->popGameState(cid)); // FIXME: taking address of temporary, check if correct
       //std::cout << "adding gamestate" << std::endl;
       connection->addPacket(packet_gen.gstate(gs), cid);
@@ -163 +163 @@
     //return true;
   }
-  
+
   void Server::processAck( ack *data, int clientID){
     clients->findClient(clientID)->setGamestateID(data->a);
   }
-  
+
 }

code/branches/FICN/src/network/dummyclient2.cc

@@ -65 +65 @@
     std::cout << "Connection failed" << std::endl;
 
-  ENetPacket *packet;
+  ENetPacket *packet;  //FIXME: unused var!
   ENetEvent event;
 

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];

code/branches/FICN/src/tinyxml/tinystr.cc

@@ -24 +24 @@
 
 /*
- * THIS FILE WAS ALTERED BY Tyge Løvset, 7. April 2005.
+ * THIS FILE WAS ALTERED BY Tyge L�vset, 7. April 2005.
  */
 
@@ -36 +36 @@
 
 // Null rep.
+//FIXME: missing braces around initializer for ‘char [1]’
 TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, '\0' };