[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/actions faller.cxx,1.8,1.9 floater.cx
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions faller.cxx,1.8,1.9 floater.cxx,1.4,1.5 jumper.cxx,1.2,1.3 walker.cxx,1.7,1.8 |
Date: |
26 Jun 2002 17:43:20 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv2878/actions
Modified Files:
faller.cxx floater.cxx jumper.cxx walker.cxx
Log Message:
cleaned up the set_paction/set_action confusing and renamed set_action to
request_set_action (should only be used by the GUI) and set_paction to
set_action (shoud be used by other actions, traps, pingus, etc.)
Index: faller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- faller.cxx 25 Jun 2002 18:15:18 -0000 1.8
+++ faller.cxx 26 Jun 2002 17:43:18 -0000 1.9
@@ -58,7 +58,7 @@
// FIXME: deadly_velocity or something like that
for (unsigned int i=0; i < pingu->persist.size(); ++i) {
if (pingu->persist[i]->get_name() == "Floater") {
- pingu->set_paction("floater");
+ pingu->set_action("floater");
return;
}
}
@@ -66,7 +66,7 @@
// Pingu stands on ground
if (rel_getpixel(0, -1) != GroundpieceData::GP_NOTHING)
{
- pingu->set_paction ("walker");
+ pingu->set_action ("walker");
return;
}
@@ -126,7 +126,7 @@
{
if (rel_getpixel(0, 0) == GroundpieceData::GP_WATER)
{
- pingu->set_paction("drown");
+ pingu->set_action("drown");
return;
}
else
@@ -134,7 +134,7 @@
// Did we stop too fast?
if (fabs(pingu->velocity.y) > deadly_velocity)
{
- pingu->set_paction("splashed");
+ pingu->set_action("splashed");
return;
}
else if (fabs(pingu->velocity.x) > deadly_velocity)
Index: floater.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/floater.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- floater.cxx 26 Jun 2002 16:49:33 -0000 1.4
+++ floater.cxx 26 Jun 2002 17:43:18 -0000 1.5
@@ -46,7 +46,7 @@
step = 0;
}
} else {
- pingu->set_paction ("walker");
+ pingu->set_action ("walker");
}
}
Index: jumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/jumper.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jumper.cxx 25 Jun 2002 14:54:01 -0000 1.2
+++ jumper.cxx 26 Jun 2002 17:43:18 -0000 1.3
@@ -53,7 +53,7 @@
// Move the pingu in the air, so that it can start 'falling'
pingu->pos.y -= 1;
- pingu->set_paction ("faller");
+ pingu->set_action ("faller");
}
/* EOF */
Index: walker.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/walker.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- walker.cxx 25 Jun 2002 18:15:18 -0000 1.7
+++ walker.cxx 26 Jun 2002 17:43:18 -0000 1.8
@@ -65,7 +65,7 @@
if (rel_getpixel(0, -1) == GroundpieceData::GP_WATER)
{
- pingu->set_paction ("drown");
+ pingu->set_action ("drown");
return;
}
@@ -92,7 +92,7 @@
}
else
{
- pingu->set_paction ("faller");
+ pingu->set_action ("faller");
return;
}
}
@@ -153,7 +153,7 @@
// use capitalised names everywhere.
// Do we set any other action here?
- pingu->set_paction("climber");
+ pingu->set_action("climber");
return;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions faller.cxx,1.8,1.9 floater.cxx,1.4,1.5 jumper.cxx,1.2,1.3 walker.cxx,1.7,1.8,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src pingu.cxx,1.13,1.14 pingu.hxx,1.5,1.6 server.cxx,1.4,1.5
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus TODO,1.50,1.51
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src pingu.cxx,1.13,1.14 pingu.hxx,1.5,1.6 server.cxx,1.4,1.5
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus TODO,1.50,1.51
- Index(es):