[Pingus-CVS] CVS: Games/Pingus/src collider.cxx,1.2,1.3 collider.hxx,1.2,1.3

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv15321

Modified Files:
        collider.cxx collider.hxx 
Log Message:
applied collison patch from Gervase


Index: collider.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/collider.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- collider.cxx        9 Mar 2003 20:41:30 -0000       1.2
+++ collider.cxx        18 Mar 2003 17:03:01 -0000      1.3
@@ -30,10 +30,13 @@
 {
 }
 
-bool Collider::operator() (World* const world, Vector pos) const
+bool Collider::operator() (World* const world, Vector current_pos,
+                           const Vector& step_vector) const
 {
   UNUSED_ARG(world);
-  UNUSED_ARG(pos);
+  UNUSED_ARG(current_pos);
+  UNUSED_ARG(step_vector);
+
   return false;
 }
 

Index: collider.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/collider.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- collider.hxx        9 Mar 2003 20:41:30 -0000       1.2
+++ collider.hxx        18 Mar 2003 17:03:01 -0000      1.3
@@ -32,9 +32,9 @@
     /** Destructor for abstract class */
     virtual ~Collider() = 0;
 
-    /** Find out if a Pingu at the specified position is colliding with
-        something */
-    virtual bool operator() (World* const world, Vector pos) const = 0;
+    /** Find out if object will collide with something */
+    virtual bool operator() (World* const world, Vector current_pos,
+                             const Vector& step_vector) const = 0;
 
   protected:
     /** Get the Collision Map pixel at the specified position in the specified