[Orxonox-commit 4281] r8952 - in code/trunk/src: libraries/network libraries/network/packet modules/pong modules/questsystem orxonox/gametypes

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-11-26 18:22:13 +0100 (Sat, 26 Nov 2011)
New Revision: 8952

Modified:
   code/trunk/src/libraries/network/MasterServer.cc
   code/trunk/src/libraries/network/packet/Gamestate.cc
   code/trunk/src/modules/pong/PongAI.cc
   code/trunk/src/modules/questsystem/QuestManager.cc
   code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc
Log:
Removing some unused variables and taking care of some other warnings (NULL as argument to non-pointer and depricated use of COUT).


Modified: code/trunk/src/libraries/network/MasterServer.cc
===================================================================
--- code/trunk/src/libraries/network/MasterServer.cc	2011-11-26 09:06:08 UTC (rev 8951)
+++ code/trunk/src/libraries/network/MasterServer.cc	2011-11-26 17:22:13 UTC (rev 8952)
@@ -86,7 +86,7 @@
     }
 
     /* 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 */
     MasterServer::getInstance()->mainlist.delServerByAddress( todeladdr);

Modified: code/trunk/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/trunk/src/libraries/network/packet/Gamestate.cc	2011-11-26 09:06:08 UTC (rev 8951)
+++ code/trunk/src/libraries/network/packet/Gamestate.cc	2011-11-26 17:22:13 UTC (rev 8952)
@@ -531,7 +531,6 @@
     assert(ClassByID(origHeader.getClassID()));
     assert(origHeader.getDataSize() < 500);
     
-    bool diffedObject = false;
     if( findObject(baseDataPtr, baseDataEnd, origHeader) )
     {
       SynchronisableHeader baseHeader(baseDataPtr);
@@ -542,7 +541,6 @@
       {
 //         orxout(verbose, context::packets) << "diffing object in order: " << Synchronisable::getSynchronisable(origHeader.getObjectID())->getIdentifier()->getName() << endl;
         diffObject(destDataPtr, origDataPtr, baseDataPtr, origHeader, sizesIt);
-        diffedObject = true;
       }
       else
       {
@@ -566,7 +564,6 @@
         {
 //           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
         {

Modified: code/trunk/src/modules/pong/PongAI.cc
===================================================================
--- code/trunk/src/modules/pong/PongAI.cc	2011-11-26 09:06:08 UTC (rev 8951)
+++ code/trunk/src/modules/pong/PongAI.cc	2011-11-26 17:22:13 UTC (rev 8952)
@@ -163,7 +163,7 @@
             // If the ball is close enough, calculate another random offset to accelerate the ball
             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)
                 {
                     this->bChangedRandomOffset_ = true;

Modified: code/trunk/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/trunk/src/modules/questsystem/QuestManager.cc	2011-11-26 09:06:08 UTC (rev 8951)
+++ code/trunk/src/modules/questsystem/QuestManager.cc	2011-11-26 17:22:13 UTC (rev 8952)
@@ -96,7 +96,7 @@
     {
         if(quest == NULL)
         {
-            COUT(1) << "Quest pointer is NULL." << endl;
+            orxout(internal_error, context::quests) << "Quest pointer is NULL." << endl;
             return false;
         }
 
@@ -138,7 +138,7 @@
     {
         if(hint == NULL)
         {
-            COUT(1) << "Hint pointer is NULL." << endl;
+            orxout(internal_error, context::quests) << "Quest pointer is NULL." << endl;
             return false;
         }
 

Modified: code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc	2011-11-26 09:06:08 UTC (rev 8951)
+++ code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc	2011-11-26 17:22:13 UTC (rev 8952)
@@ -100,7 +100,6 @@
     {
         if (pawn1 && base)
         {
-            std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
             int teamnrbase = -1;
             int teamnrplayer = this->getTeam(pawn1->getPlayer());