[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.126,1.127 pingu_action.
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.126,1.127 pingu_action.cxx,1.22,1.23 pingu_action.hxx,1.24,1.25 pingu_enums.cxx,1.2,1.3 pingu_enums.hxx,1.9,1.10 |
Date: |
12 Feb 2003 22:40:49 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv7035/src
Modified Files:
Makefile.am pingu_action.cxx pingu_action.hxx pingu_enums.cxx
pingu_enums.hxx
Log Message:
applied Gervases patch
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- Makefile.am 28 Dec 2002 16:10:17 -0000 1.126
+++ Makefile.am 12 Feb 2003 22:40:47 -0000 1.127
@@ -27,10 +27,12 @@
SUBDIRS = \
actions \
caimagemanipulation \
+ colliders \
editor \
editorobjs \
gui \
input \
+ movers \
particles \
worldobjs \
worldobjsdata \
@@ -61,6 +63,8 @@
worldobjs/entrances/libpingus_worldobjs_entrances.a \
editorobjs/libpingus_editorobjs.a \
actions/libpingu_actions.a \
+ movers/libpingus_movers.a \
+ colliders/libpingus_colliders.a \
editor/libpingus_editor.a \
particles/libpingus_particle.a \
worldmap/libpingus_worldmap.a \
@@ -185,6 +189,8 @@
math.hxx \
menu_background.cxx \
menu_background.hxx \
+mover.cxx \
+mover.hxx \
multiline_text.cxx \
multiline_text.hxx \
my_gettext.hxx \
@@ -198,6 +204,8 @@
pingu_action.hxx \
pingu_action_factory.cxx \
pingu_action_factory.hxx \
+collider.cxx \
+collider.hxx \
pingu_enums.cxx \
pingu_enums.hxx \
pingu_holder.cxx \
Index: pingu_action.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pingu_action.cxx 29 Dec 2002 23:29:00 -0000 1.22
+++ pingu_action.cxx 12 Feb 2003 22:40:47 -0000 1.23
@@ -26,10 +26,6 @@
#include "pingu_action.hxx"
#include "worldobj.hxx"
-// Initialise class static.
-const int PinguAction::pingu_height = 26;
-const float deadly_velocity = 20.0f;
-
PinguAction::PinguAction (Pingu* p)
: pingu (p)
{
Index: pingu_action.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.hxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pingu_action.hxx 3 Nov 2002 13:29:09 -0000 1.24
+++ pingu_action.hxx 12 Feb 2003 22:40:47 -0000 1.25
@@ -44,9 +44,6 @@
/** A pointer to the pingu, which hold the action. */
Pingu* pingu;
- /// Height of Pingu. Used in head collision.
- static const int pingu_height;
-
public:
PinguAction(Pingu* p);
virtual ~PinguAction();
Index: pingu_enums.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_enums.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingu_enums.cxx 25 Aug 2002 09:08:48 -0000 1.2
+++ pingu_enums.cxx 12 Feb 2003 22:40:47 -0000 1.3
@@ -19,6 +19,10 @@
#include "pingu_enums.hxx"
+// Pingu "globals"
+const int pingu_height = 26;
+const float deadly_velocity = 20.0f;
+
namespace Actions {
std::string action_to_string(ActionName action) {
Index: pingu_enums.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_enums.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pingu_enums.hxx 2 Nov 2002 17:43:10 -0000 1.9
+++ pingu_enums.hxx 12 Feb 2003 22:40:47 -0000 1.10
@@ -68,6 +68,9 @@
} // namespace Actions
+// Pingu "globals"
+extern const int pingu_height;
+extern const float deadly_velocity;
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.126,1.127 pingu_action.cxx,1.22,1.23 pingu_action.hxx,1.24,1.25 pingu_enums.cxx,1.2,1.3 pingu_enums.hxx,1.9,1.10,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/data/images/particles Makefile.am,1.3,1.4
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.26,1.27 faller.cxx,1.34,1.35 faller.hxx,1.17,1.18 floater.cxx,1.21,1.22
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/data/images/particles Makefile.am,1.3,1.4
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions bomber.cxx,1.26,1.27 faller.cxx,1.34,1.35 faller.hxx,1.17,1.18 floater.cxx,1.21,1.22
- Index(es):