Changeset 11103 for code/trunk

Timestamp:

Jan 31, 2016, 8:43:10 PM (9 years ago)

Author:

landauf

Message:

fixed warnings (release build).
fixed error in GravityBombField

Location:

code/trunk/src

Files:

• libraries/core/BaseObject.cc (modified) (1 diff)
• libraries/network/Server.cc (modified) (1 diff)
• libraries/network/synchronisable/Synchronisable.cc (modified) (2 diffs)
• modules/pickup/PickupSpawner.cc (modified) (1 diff)
• modules/weapons/projectiles/GravityBombField.cc (modified) (1 diff)

code/trunk/src/libraries/core/BaseObject.cc

@@ -205 +205 @@
             Template* link;
             assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());
-            link = nullptr;
+            (void)link; // avoid compiler warning
         }
         else

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

@@ -372 +372 @@
     b = w->send( static_cast<Host*>(this) );
     assert(b);
+    (void)b; // avoid compiler warning
 //     packet::Gamestate *g = new packet::Gamestate();
 //     g->setPeerID(clientID);

code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

@@ -459 +459 @@
     }
     assert(unregistered_nonexistent_variable == false);
+    (void)unregistered_nonexistent_variable; // avoid compiler warning
     
     it = stringList_.begin();
@@ -472 +473 @@
         ++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
   }

code/trunk/src/modules/pickup/PickupSpawner.cc

@@ -191 +191 @@
         bool pickedUp = this->pickup_->pickup(target);
         assert(pickedUp);
-        pickedUp = false; // To avoid compiler warning.
+        (void)pickedUp; // To avoid compiler warning.
 
         this->setPickupable(nullptr);

code/trunk/src/modules/weapons/projectiles/GravityBombField.cc

@@ -66 +66 @@
         randomRotation.x = rnd();
         randomRotation.y = rnd();
-        randomRotation.y = rnd();
+        randomRotation.z = rnd();
         randomRotation.normalise();
         bombModel_->setAngularAcceleration(randomRotation*(PEAK_ANGULAR_VELOCITY/FORCE_FIELD_LIFETIME));