[Orxonox-commit 7194] r11811 - in code/branches/cegui0.8_ogre1.9/src: libraries/network orxonox/controllers orxonox/overlays

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-24 18:09:45 +0100 (Sat, 24 Feb 2018)
New Revision: 11811

Modified:
   code/branches/cegui0.8_ogre1.9/src/libraries/network/TrafficControl.cc
   code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/AIController.cc
   code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc
Log:
fixed some warnings with gcc 7

Modified: code/branches/cegui0.8_ogre1.9/src/libraries/network/TrafficControl.cc
===================================================================
--- code/branches/cegui0.8_ogre1.9/src/libraries/network/TrafficControl.cc	2018-02-24 16:51:59 UTC (rev 11810)
+++ code/branches/cegui0.8_ogre1.9/src/libraries/network/TrafficControl.cc	2018-02-24 17:09:45 UTC (rev 11811)
@@ -139,7 +139,7 @@
     {
     if ( !this->bActive_ )
       return;
-      std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
+    std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
 
     //assertions to make sure the maps already exist
     assert(clientListTemp_.find(clientID) != clientListTemp_.end() );

Modified: code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/AIController.cc	2018-02-24 16:51:59 UTC (rev 11810)
+++ code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/AIController.cc	2018-02-24 17:09:45 UTC (rev 11811)
@@ -226,7 +226,7 @@
                 if (this->bHasTargetPosition_)
                     this->moveToTargetPosition();
 
-                    this->doFire();
+                this->doFire();
             }
         }
         else if (this->mode_ == ROCKET)//Rockets do not belong to a group of bots -> bot states are not relevant.

Modified: code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc	2018-02-24 16:51:59 UTC (rev 11810)
+++ code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc	2018-02-24 17:09:45 UTC (rev 11811)
@@ -71,7 +71,7 @@
 namespace orxonox
 {
     const int LINES = 30;
-    const float CHAR_WIDTH = 8.0f; // fix this please - determine the char-width dynamically
+    const float HARDCODED_CHAR_WIDTH = 8.0f; // fix this please - determine the char-width dynamically
 
     SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole);
     SetConsoleCommand("InGameConsole", "closeConsole", &InGameConsole::closeConsole);
@@ -447,7 +447,7 @@
         this->desiredTextWidth_ = static_cast<int>(this->windowW_ * this->relativeWidth) - 24;
 
         if (LINES > 0)
-            this->maxCharsPerLine_ = std::max(10U, static_cast<unsigned int>(static_cast<float>(this->desiredTextWidth_) / CHAR_WIDTH));
+            this->maxCharsPerLine_ = std::max(10U, static_cast<unsigned int>(static_cast<float>(this->desiredTextWidth_) / HARDCODED_CHAR_WIDTH));
         else
             this->maxCharsPerLine_ = 10;