Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11103 for code/trunk


Ignore:
Timestamp:
Jan 31, 2016, 8:43:10 PM (8 years ago)
Author:
landauf
Message:

fixed warnings (release build).
fixed error in GravityBombField

Location:
code/trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/core/BaseObject.cc

    r11071 r11103  
    205205            Template* link;
    206206            assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());
    207             link = nullptr;
     207            (void)link; // avoid compiler warning
    208208        }
    209209        else
  • code/trunk/src/libraries/network/Server.cc

    r11071 r11103  
    372372    b = w->send( static_cast<Host*>(this) );
    373373    assert(b);
     374    (void)b; // avoid compiler warning
    374375//     packet::Gamestate *g = new packet::Gamestate();
    375376//     g->setPeerID(clientID);
  • code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

    r11071 r11103  
    459459    }
    460460    assert(unregistered_nonexistent_variable == false);
     461    (void)unregistered_nonexistent_variable; // avoid compiler warning
    461462   
    462463    it = stringList_.begin();
     
    472473        ++it;
    473474    }
    474     unregistered_nonexistent_variable = true;
    475     assert(unregistered_nonexistent_variable == false); //if we reach this point something went wrong:
     475    assert(false); //if we reach this point something went wrong:
    476476    // the variable has not been registered before
    477477  }
  • code/trunk/src/modules/pickup/PickupSpawner.cc

    r11099 r11103  
    191191        bool pickedUp = this->pickup_->pickup(target);
    192192        assert(pickedUp);
    193         pickedUp = false; // To avoid compiler warning.
     193        (void)pickedUp; // To avoid compiler warning.
    194194
    195195        this->setPickupable(nullptr);
  • code/trunk/src/modules/weapons/projectiles/GravityBombField.cc

    r11083 r11103  
    6666        randomRotation.x = rnd();
    6767        randomRotation.y = rnd();
    68         randomRotation.y = rnd();
     68        randomRotation.z = rnd();
    6969        randomRotation.normalise();
    7070        bombModel_->setAngularAcceleration(randomRotation*(PEAK_ANGULAR_VELOCITY/FORCE_FIELD_LIFETIME));
Note: See TracChangeset for help on using the changeset viewer.