Changeset 8952 for code/trunk/src

Timestamp:

Nov 26, 2011, 6:22:13 PM (13 years ago)

Author:

dafrick

Message:

Removing some unused variables and taking care of some other warnings (NULL as argument to non-pointer and depricated use of COUT).

Location:

code/trunk/src

Files:

• libraries/network/MasterServer.cc (modified) (1 diff)
• libraries/network/packet/Gamestate.cc (modified) (3 diffs)
• modules/pong/PongAI.cc (modified) (1 diff)
• modules/questsystem/QuestManager.cc (modified) (2 diffs)
• orxonox/gametypes/TeamBaseMatch.cc (modified) (1 diff)

code/trunk/src/libraries/network/MasterServer.cc

@@ -87 +87 @@
 
     /* force-disconnect the server */  
-    enet_peer_disconnect( shandle.result.peer, NULL );
+    enet_peer_disconnect( shandle.result.peer, 0 );
 
     /* actually remove the entry from the server list by address */

code/trunk/src/libraries/network/packet/Gamestate.cc

@@ -532 +532 @@
     assert(origHeader.getDataSize() < 500);
     
-    bool diffedObject = false;
     if( findObject(baseDataPtr, baseDataEnd, origHeader) )
     {
@@ -543 +542 @@
 //         orxout(verbose, context::packets) << "diffing object in order: " << Synchronisable::getSynchronisable(origHeader.getObjectID())->getIdentifier()->getName() << endl;
         diffObject(destDataPtr, origDataPtr, baseDataPtr, origHeader, sizesIt);
-        diffedObject = true;
       }
       else
@@ -567 +565 @@
 //           orxout(verbose, context::packets) << "diffing object out of order: " << Synchronisable::getSynchronisable(origHeader.getObjectID())->getIdentifier()->getName() << endl;
           diffObject(destDataPtr, origDataPtr, baseDataPtr, origHeader, sizesIt);
-          diffedObject = true;
         }
         else

code/trunk/src/modules/pong/PongAI.cc

@@ -164 +164 @@
             if (!this->bChangedRandomOffset_)
             {
-                float timetohit = (-this->ball_->getPosition().x + this->ball_->getFieldDimension().x / 2 * sgn(this->ball_->getVelocity().x)) / this->ball_->getVelocity().x;
+                float timetohit = (-ballpos.x + this->ball_->getFieldDimension().x / 2 * sgn(ballvel.x)) / ballvel.x;
                 if (timetohit < 0.05)
                 {

code/trunk/src/modules/questsystem/QuestManager.cc

@@ -97 +97 @@
         if(quest == NULL)
         {
-            COUT(1) << "Quest pointer is NULL." << endl;
+            orxout(internal_error, context::quests) << "Quest pointer is NULL." << endl;
             return false;
         }
@@ -139 +139 @@
         if(hint == NULL)
         {
-            COUT(1) << "Hint pointer is NULL." << endl;
+            orxout(internal_error, context::quests) << "Quest pointer is NULL." << endl;
             return false;
         }

code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc

@@ -101 +101 @@
         if (pawn1 && base)
         {
-            std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
             int teamnrbase = -1;
             int teamnrplayer = this->getTeam(pawn1->getPlayer());