Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1273 for code/branches/merge


Ignore:
Timestamp:
May 14, 2008, 1:01:11 PM (17 years ago)
Author:
rgrieder
Message:
  • fixed the visual problem with overlays: They're now correctly displayed (Problem was RTT Mode in ogre.cfg which I have changed half a year ago. hope it does't cause any segfaults now…)
  • removed false debug output in InputManager
  • removed 2 gcc warnings
Location:
code/branches/merge
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/merge/bin/ogre.cfg-init

    r790 r1273  
    44FSAA=0
    55Full Screen=No
    6 RTT Preferred Mode=PBuffer
     6RTT Preferred Mode=FBO
    77Video Mode=1024 x 768

  • code/branches/merge/src/core/InputManager.cc

    r1272 r1273  
    275275  void InputManager::_destroy()
    276276  {
    277     CCOUT(ORX_DEBUG) << "Destroying ..." << std::endl;
    278 
    279277    if (state_ != IS_UNINIT)
    280278    {
     279      CCOUT(ORX_DEBUG) << "Destroying ..." << std::endl;
     280
    281281      if (keyHandlers_.find("buffer") != keyHandlers_.end())
    282282        delete keyHandlers_["buffer"];
    … …  
    298298
    299299      state_ = IS_UNINIT;
    300     }
    301     else
    302       CCOUT(ORX_WARNING) << "Warning: Cannot be destroyed, since not initialised." << std::endl;
    303 
    304     CCOUT(ORX_DEBUG) << "Destroying done." << std::endl;
     300      CCOUT(ORX_DEBUG) << "Destroying done." << std::endl;
     301    }
    305302  }
    306303

  • code/branches/merge/src/orxonox/objects/Explosion.cc

    r1263 r1273  
    4646
    4747    Explosion::Explosion(WorldEntity* owner) :
    48       particle_(0),
    49       lifetime_(0.4)
     48      lifetime_(0.4),
     49      particle_(0)
    5050    {
    5151        RegisterObject(Explosion);

  • code/branches/merge/src/orxonox/objects/SpaceShip.cc

    r1272 r1273  
    7474      camName_("CamNode"),
    7575      tt_(0),
     76      redNode_(0),
    7677      greenNode_(0),
    77       redNode_(0),
    7878      blinkTime_(0.0f),
    7979      chNearNode_(0),
Note: See TracChangeset for help on using the changeset viewer.