[Orxonox-commit 6447] r11103 - in code/trunk/src: libraries/core libraries/network libraries/network/synchronisable modules/pickup modules/weapons/projectiles

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-31 20:43:10 +0100 (Sun, 31 Jan 2016)
New Revision: 11103

Modified:
   code/trunk/src/libraries/core/BaseObject.cc
   code/trunk/src/libraries/network/Server.cc
   code/trunk/src/libraries/network/synchronisable/Synchronisable.cc
   code/trunk/src/modules/pickup/PickupSpawner.cc
   code/trunk/src/modules/weapons/projectiles/GravityBombField.cc
Log:
fixed warnings (release build).
fixed error in GravityBombField

Modified: code/trunk/src/libraries/core/BaseObject.cc
===================================================================
--- code/trunk/src/libraries/core/BaseObject.cc	2016-01-31 13:52:12 UTC (rev 11102)
+++ code/trunk/src/libraries/core/BaseObject.cc	2016-01-31 19:43:10 UTC (rev 11103)
@@ -204,7 +204,7 @@
 
             Template* link;
             assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());
-            link = nullptr;
+            (void)link; // avoid compiler warning
         }
         else
             this->networkTemplateNames_.insert(temp->getName());

Modified: code/trunk/src/libraries/network/Server.cc
===================================================================
--- code/trunk/src/libraries/network/Server.cc	2016-01-31 13:52:12 UTC (rev 11102)
+++ code/trunk/src/libraries/network/Server.cc	2016-01-31 19:43:10 UTC (rev 11103)
@@ -371,6 +371,7 @@
     w->setPeerID(clientID);
     b = w->send( static_cast<Host*>(this) );
     assert(b);
+    (void)b; // avoid compiler warning
 //     packet::Gamestate *g = new packet::Gamestate();
 //     g->setPeerID(clientID);
 //     b = g->collectData(0,packet::GAMESTATE_MODE_SERVER);

Modified: code/trunk/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/trunk/src/libraries/network/synchronisable/Synchronisable.cc	2016-01-31 13:52:12 UTC (rev 11102)
+++ code/trunk/src/libraries/network/synchronisable/Synchronisable.cc	2016-01-31 19:43:10 UTC (rev 11103)
@@ -458,6 +458,7 @@
         ++it;
     }
     assert(unregistered_nonexistent_variable == false);
+    (void)unregistered_nonexistent_variable; // avoid compiler warning
     
     it = stringList_.begin();
     while(it!=stringList_.end())
@@ -471,8 +472,7 @@
       else
         ++it;
     }
-    unregistered_nonexistent_variable = true;
-    assert(unregistered_nonexistent_variable == false); //if we reach this point something went wrong:
+    assert(false); //if we reach this point something went wrong:
     // the variable has not been registered before
   }
 

Modified: code/trunk/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupSpawner.cc	2016-01-31 13:52:12 UTC (rev 11102)
+++ code/trunk/src/modules/pickup/PickupSpawner.cc	2016-01-31 19:43:10 UTC (rev 11103)
@@ -190,7 +190,7 @@
         assert(target);
         bool pickedUp = this->pickup_->pickup(target);
         assert(pickedUp);
-        pickedUp = false; // To avoid compiler warning.
+        (void)pickedUp; // To avoid compiler warning.
 
         this->setPickupable(nullptr);
         this->decrementSpawnsRemaining();

Modified: code/trunk/src/modules/weapons/projectiles/GravityBombField.cc
===================================================================
--- code/trunk/src/modules/weapons/projectiles/GravityBombField.cc	2016-01-31 13:52:12 UTC (rev 11102)
+++ code/trunk/src/modules/weapons/projectiles/GravityBombField.cc	2016-01-31 19:43:10 UTC (rev 11103)
@@ -65,7 +65,7 @@
         Vector3 randomRotation;
         randomRotation.x = rnd();
         randomRotation.y = rnd();
-        randomRotation.y = rnd();
+        randomRotation.z = rnd();
         randomRotation.normalise();
         bombModel_->setAngularAcceleration(randomRotation*(PEAK_ANGULAR_VELOCITY/FORCE_FIELD_LIFETIME));