[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/traps Bumper.cc,1.18,1.19 Bumper.hh,1
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/traps Bumper.cc,1.18,1.19 Bumper.hh,1.8,1.9 FakeExit.cc,1.18,1.19 FakeExit.hh,1.9,1.10 Guillotine.cc,1.16,1.17 Guillotine.hh,1.10,1.11 LaserExit.cc,1.18,1.19 LaserExit.hh,1.9,1.10 Spike.cc,1.15,1.16 Spike.hh,1.8,1.9 hammer.cc,1.17,1.18 hammer.hh,1.9,1.10 smasher.cc,1.31,1.32 smasher.hh,1.10,1.11 |
Date: |
8 Jun 2002 16:08:18 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/traps
In directory dark:/tmp/cvs-serv13368/traps
Modified Files:
Bumper.cc Bumper.hh FakeExit.cc FakeExit.hh Guillotine.cc
Guillotine.hh LaserExit.cc LaserExit.hh Spike.cc Spike.hh
hammer.cc hammer.hh smasher.cc smasher.hh
Log Message:
replaced boost::shared_ptr<Pingu> with Pingu*
Index: Bumper.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/Bumper.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Bumper.cc 1 Jun 2002 18:05:37 -0000 1.18
+++ Bumper.cc 8 Jun 2002 16:08:16 -0000 1.19
@@ -74,7 +74,7 @@
}
void
-Bumper::catch_pingu(boost::shared_ptr<Pingu> pingu)
+Bumper::catch_pingu(Pingu* pingu)
{
// if (!pingu->is_alive())
// return;
Index: Bumper.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/Bumper.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Bumper.hh 10 Aug 2001 10:56:14 -0000 1.8
+++ Bumper.hh 8 Jun 2002 16:08:16 -0000 1.9
@@ -37,7 +37,7 @@
void draw_offset(int x, int y, float s);
void draw_colmap();
void update(float delta);
- void catch_pingu(boost::shared_ptr<Pingu> pingu);
+ void catch_pingu(Pingu* pingu);
};
#endif
Index: FakeExit.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/FakeExit.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- FakeExit.cc 1 Jun 2002 18:05:37 -0000 1.18
+++ FakeExit.cc 8 Jun 2002 16:08:16 -0000 1.19
@@ -53,7 +53,7 @@
}
void
-FakeExit::catch_pingu(boost::shared_ptr<Pingu> pingu)
+FakeExit::catch_pingu(Pingu* pingu)
{
// if (!pingu->is_alive())
// return false;
Index: FakeExit.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/FakeExit.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FakeExit.hh 7 Jun 2002 20:35:14 -0000 1.9
+++ FakeExit.hh 8 Jun 2002 16:08:16 -0000 1.10
@@ -34,7 +34,7 @@
virtual ~FakeExit();
void update(float delta);
- void catch_pingu(boost::shared_ptr<Pingu>);
+ void catch_pingu(Pingu*);
};
#endif
Index: Guillotine.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/Guillotine.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Guillotine.cc 1 Jun 2002 18:05:37 -0000 1.16
+++ Guillotine.cc 8 Jun 2002 16:08:16 -0000 1.17
@@ -79,7 +79,7 @@
}
void
-Guillotine::catch_pingu(boost::shared_ptr<Pingu> pingu)
+Guillotine::catch_pingu(Pingu* pingu)
{
if (!killing)
{
Index: Guillotine.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/Guillotine.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Guillotine.hh 7 Jun 2002 20:35:14 -0000 1.10
+++ Guillotine.hh 8 Jun 2002 16:08:16 -0000 1.11
@@ -40,7 +40,7 @@
void update(float delta);
void draw_offset(int x, int y, float s);
- void catch_pingu(boost::shared_ptr<Pingu>);
+ void catch_pingu(Pingu*);
};
#endif
Index: LaserExit.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/LaserExit.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- LaserExit.cc 1 Jun 2002 18:05:37 -0000 1.18
+++ LaserExit.cc 8 Jun 2002 16:08:16 -0000 1.19
@@ -63,7 +63,7 @@
}
void
-LaserExit::catch_pingu(boost::shared_ptr<Pingu> pingu)
+LaserExit::catch_pingu(Pingu* pingu)
{
//if (!pingu->is_alive())
//return;
Index: LaserExit.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/LaserExit.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- LaserExit.hh 7 Jun 2002 20:35:14 -0000 1.9
+++ LaserExit.hh 8 Jun 2002 16:08:16 -0000 1.10
@@ -34,7 +34,7 @@
virtual ~LaserExit();
void update(float delta);
- void catch_pingu(boost::shared_ptr<Pingu>);
+ void catch_pingu(Pingu*);
};
Index: Spike.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/Spike.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Spike.cc 1 Jun 2002 18:05:37 -0000 1.15
+++ Spike.cc 8 Jun 2002 16:08:16 -0000 1.16
@@ -70,7 +70,7 @@
}
void
-Spike::catch_pingu(boost::shared_ptr<Pingu> pingu)
+Spike::catch_pingu(Pingu* pingu)
{
if (!killing) {
if (pingu->get_x () > pos.x + 16 - 5 && pingu->get_x () < pos.x + 16 + 5
Index: Spike.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/Spike.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Spike.hh 10 Aug 2001 10:56:14 -0000 1.8
+++ Spike.hh 8 Jun 2002 16:08:16 -0000 1.9
@@ -37,7 +37,7 @@
void draw_offset(int x_of, int y_of, float s = 1.0);
void update(float delta);
- void catch_pingu(boost::shared_ptr<Pingu>);
+ void catch_pingu(Pingu*);
};
#endif
Index: hammer.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/hammer.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- hammer.cc 1 Jun 2002 18:05:37 -0000 1.17
+++ hammer.cc 8 Jun 2002 16:08:16 -0000 1.18
@@ -65,7 +65,7 @@
}
void
-Hammer::catch_pingu(boost::shared_ptr<Pingu> pingu)
+Hammer::catch_pingu(Pingu* pingu)
{
if (counter >= (int)(surface.get_num_frames()) - 3) {
if (pingu->get_x() > pos.x + 55 && pingu->get_x() < pos.x + 77
Index: hammer.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/hammer.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hammer.hh 7 Jun 2002 20:35:14 -0000 1.9
+++ hammer.hh 8 Jun 2002 16:08:16 -0000 1.10
@@ -34,7 +34,7 @@
virtual ~Hammer();
void update(float delta);
- void catch_pingu(boost::shared_ptr<Pingu>);
+ void catch_pingu(Pingu*);
};
#endif
Index: smasher.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/smasher.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- smasher.cc 1 Jun 2002 18:05:37 -0000 1.31
+++ smasher.cc 8 Jun 2002 16:08:16 -0000 1.32
@@ -27,9 +27,9 @@
#include "../particles/ParticleHolder.hh"
#include "../actions/Splashed.hh"
#include "../algo.hh"
-#include "../boost/smart_ptr.hpp"
#include "../GroundpieceData.hh"
#include "smasher.hh"
+#include "../boost/smart_ptr.hpp"
using boost::shared_ptr;
@@ -113,7 +113,7 @@
}
void
-Smasher::catch_pingu(boost::shared_ptr<Pingu> pingu)
+Smasher::catch_pingu(Pingu* pingu)
{
// Activate the smasher if a Pingu is under it
if ((pingu->direction.is_left()
Index: smasher.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/smasher.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smasher.hh 10 Aug 2001 10:56:15 -0000 1.10
+++ smasher.hh 8 Jun 2002 16:08:16 -0000 1.11
@@ -38,7 +38,7 @@
void draw_offset(int x, int y, float s);
void draw_colmap();
void update(float delta);
- void catch_pingu(boost::shared_ptr<Pingu> pingu);
+ void catch_pingu(Pingu* pingu);
};
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/traps Bumper.cc,1.18,1.19 Bumper.hh,1.8,1.9 FakeExit.cc,1.18,1.19 FakeExit.hh,1.9,1.10 Guillotine.cc,1.16,1.17 Guillotine.hh,1.10,1.11 LaserExit.cc,1.18,1.19 LaserExit.hh,1.9,1.10 Spike.cc,1.15,1.16 Spike.hh,1.8,1.9 hammer.cc,1.17,1.18 hammer.hh,1.9,1.10 smasher.cc,1.31,1.32 smasher.hh,1.10,1.11,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus configure.in,1.58,1.59
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.16,1.17 CaptureRectangle.hh,1.12,1.13 Entrance.cc,1.27,1.28 Entrance.hh,1.19,1.20 MultiplayerClientChild.cc,1.10,1.11 PinguHolder.cc,1.17,1.18 PinguHolder.hh,1.14,1.15 PinguInfo.cc,1.10,1.11 PinguInfo.hh,1.5,1.6 Playfield.cc,1.31,1.32 Playfield.hh,1.21,1.22 PlayfieldView.cc,1.6,1.7 PlayfieldView.hh,1.5,1.6 Server.cc,1.25,1.26 SmallMap.cc,1.39,1.40 Trap.hh,1.20,1.21 View.cc,1.16,1.17 View.hh,1.9,1.10 World.cc,1.68,1.69 World.hh,1.33,1.34 WorldObj.cc,1.20,1.21 WorldObj.hh,1.22,1.23
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus configure.in,1.58,1.59
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.16,1.17 CaptureRectangle.hh,1.12,1.13 Entrance.cc,1.27,1.28 Entrance.hh,1.19,1.20 MultiplayerClientChild.cc,1.10,1.11 PinguHolder.cc,1.17,1.18 PinguHolder.hh,1.14,1.15 PinguInfo.cc,1.10,1.11 PinguInfo.hh,1.5,1.6 Playfield.cc,1.31,1.32 Playfield.hh,1.21,1.22 PlayfieldView.cc,1.6,1.7 PlayfieldView.hh,1.5,1.6 Server.cc,1.25,1.26 SmallMap.cc,1.39,1.40 Trap.hh,1.20,1.21 View.cc,1.16,1.17 View.hh,1.9,1.10 World.cc,1.68,1.69 World.hh,1.33,1.34 WorldObj.cc,1.20,1.21 WorldObj.hh,1.22,1.23
- Index(es):