|
From: | torangan |
Subject: | [Pingus-CVS] CVS: Games/Pingus/src collider.cxx,1.1,1.2 collider.hxx,1.1,1.2 mover.cxx,1.1,1.2 mover.hxx,1.1,1.2 |
Date: | 9 Mar 2003 20:41:32 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src In directory dark:/tmp/cvs-serv15233 Modified Files: collider.cxx collider.hxx mover.cxx mover.hxx Log Message: Applied action patches from Gervase Index: collider.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/collider.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- collider.cxx 12 Feb 2003 22:43:38 -0000 1.1 +++ collider.cxx 9 Mar 2003 20:41:30 -0000 1.2 @@ -30,10 +30,17 @@ { } +bool Collider::operator() (World* const world, Vector pos) const +{ + UNUSED_ARG(world); + UNUSED_ARG(pos); + return false; +} + int Collider::getpixel(World* const world, const Vector& pos) const { return world->get_colmap()->getpixel(static_cast<int>(pos.x), - static_cast<int>(pos.y)); + static_cast<int>(pos.y)); } /* EOF */ Index: collider.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/collider.hxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Index: mover.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/mover.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Index: mover.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/mover.hxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2
[Prev in Thread] | Current Thread | [Next in Thread] |