Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 19, 2015, 7:55:11 PM (9 years ago)
Author:
muemart
Message:
  • Fixed some suspicious virtual function signatures
  • Fixed some clang warnings (and errors in the last commit, forgot to mention that)
  • Fix compilation without pch
  • Hack "override" keyword support into Tolua++
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc

    r9667 r10818  
    282282    }
    283283
    284     bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     284    bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    285285    {
    286286        if (contactPoint.m_normalWorldOnB.y() > 0.6)
Note: See TracChangeset for help on using the changeset viewer.