[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/actions Faller.cc,1.13,1.14 Walker.cc
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions Faller.cc,1.13,1.14 Walker.cc,1.14,1.15 |
Date: |
9 Jun 2002 00:56:28 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv27823/actions
Modified Files:
Faller.cc Walker.cc
Log Message:
- replaced shared_ptr<PinguAction> with PinguAction*
- this commit is incomplete, it compiles, but segfault at level startup, will
fix that tomorrow if I find the bug
Index: Faller.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/Faller.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Faller.cc 8 Jun 2002 20:19:54 -0000 1.13
+++ Faller.cc 9 Jun 2002 00:56:26 -0000 1.14
@@ -33,6 +33,8 @@
void
Faller::init(void)
{
+ std::cout << "Faller::init(void)" << std::endl;
+
faller = Sprite("Pingus/faller" + to_string(pingu->owner_id), "pingus");
faller.set_align_center_bottom ();
Index: Walker.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/Walker.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Walker.cc 8 Jun 2002 20:19:54 -0000 1.14
+++ Walker.cc 9 Jun 2002 00:56:26 -0000 1.15
@@ -31,6 +31,7 @@
void
Walker::init(void)
{
+ std::cout << "Walker::init(void)" << std::endl;
walker = Sprite ("Pingus/walker" + to_string(pingu->owner_id), "pingus");
walker.set_align_center_bottom ();
}
@@ -69,7 +70,7 @@
{
if (pingu->persist[i]->get_type() & (ActionType)WALL)
{
- if (pingu->action.get() && pingu->persist[i]->get_name() ==
pingu->action->get_name())
+ if (pingu->action && pingu->persist[i]->get_name() ==
pingu->action->get_name())
{
if (pingus_debug_flags & PINGUS_DEBUG_ACTIONS)
std::cout << "Pingu: Not using action, we already did."
<< std::endl;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions Faller.cc,1.13,1.14 Walker.cc,1.14,1.15,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/traps FakeExit.cc,1.19,1.20 LaserExit.cc,1.19,1.20 hammer.cc,1.18,1.19 smasher.cc,1.33,1.34
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src ActionHolder.cc,1.33,1.34 ActionHolder.hh,1.15,1.16 CaptureRectangle.cc,1.19,1.20 CaptureRectangle.hh,1.16,1.17 Entrance.cc,1.28,1.29 Pingu.cc,1.74,1.75 Pingu.hh,1.41,1.42 PinguAction.cc,1.24,1.25 PinguActionFactory.cc,1.4,1.5 PinguActionFactory.hh,1.3,1.4 PinguHolder.cc,1.19,1.20 PinguInfo.cc,1.11,1.12 PingusMain.cc,1.61,1.62 Server.cc,1.29,1.30
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/traps FakeExit.cc,1.19,1.20 LaserExit.cc,1.19,1.20 hammer.cc,1.18,1.19 smasher.cc,1.33,1.34
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src ActionHolder.cc,1.33,1.34 ActionHolder.hh,1.15,1.16 CaptureRectangle.cc,1.19,1.20 CaptureRectangle.hh,1.16,1.17 Entrance.cc,1.28,1.29 Pingu.cc,1.74,1.75 Pingu.hh,1.41,1.42 PinguAction.cc,1.24,1.25 PinguActionFactory.cc,1.4,1.5 PinguActionFactory.hh,1.3,1.4 PinguHolder.cc,1.19,1.20 PinguInfo.cc,1.11,1.12 PingusMain.cc,1.61,1.62 Server.cc,1.29,1.30
- Index(es):