[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/colliders Makefile.am,1.2,1.3 pingu_c
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/colliders Makefile.am,1.2,1.3 pingu_collider.cxx,1.1,1.2 pingu_collider.hxx,1.1,1.2 |
Date: |
9 Mar 2003 20:41:32 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/colliders
In directory dark:/tmp/cvs-serv15233/colliders
Modified Files:
Makefile.am pingu_collider.cxx pingu_collider.hxx
Log Message:
Applied action patches from Gervase
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/colliders/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am 16 Feb 2003 18:40:47 -0000 1.2
+++ Makefile.am 9 Mar 2003 20:41:30 -0000 1.3
@@ -17,7 +17,7 @@
libdir=$(prefix)/share/games/@PACKAGE@/libs
-# EXTRA_DIST = README
+EXTRA_DIST = README
# -- Dynamic Libs --
#lib_LTLIBRARIES = libpingu_colliders.la
Index: pingu_collider.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/colliders/pingu_collider.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingu_collider.cxx 12 Feb 2003 22:43:38 -0000 1.1
+++ pingu_collider.cxx 9 Mar 2003 20:41:30 -0000 1.2
@@ -24,8 +24,8 @@
namespace Colliders {
-PinguCollider::PinguCollider(const bool falling_arg, const int height_arg)
- : falling(falling_arg),
+PinguCollider::PinguCollider(const Vector& direction, const int height_arg)
+ : falling(direction.y > 0.0f),
height(height_arg)
{
}
Index: pingu_collider.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/colliders/pingu_collider.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingu_collider.hxx 12 Feb 2003 22:43:38 -0000 1.1
+++ pingu_collider.hxx 9 Mar 2003 20:41:30 -0000 1.2
@@ -27,10 +27,10 @@
class PinguCollider : public Collider
{
public:
- /** Constructor for abstract class */
- PinguCollider(const bool falling_arg, const int height_arg);
+ /** Constructor */
+ PinguCollider(const Vector& direction, const int height_arg);
- /** Destructor for abstract class */
+ /** Destructor */
~PinguCollider();
/** Find out if a Pingu at the specified position is colliding with
@@ -41,7 +41,7 @@
/** Indicates whether a Pingu is falling or not */
bool falling;
- /** Pingu could be on its belly. Therefore, this is the current height of
+ /** Pingu could by on its belly. Therefore, this is the current height of
the Pingu. */
int height;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/colliders Makefile.am,1.2,1.3 pingu_collider.cxx,1.1,1.2 pingu_collider.hxx,1.1,1.2,
torangan <=
- Prev by Date:
[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
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.30,1.31 digger.cxx,1.22,1.23 faller.cxx,1.36,1.37
- Previous by thread:
[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
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.30,1.31 digger.cxx,1.22,1.23 faller.cxx,1.36,1.37
- Index(es):