[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx,1.26,1.27 exiter.c
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx,1.26,1.27 exiter.cxx,1.16,1.17 exiter.hxx,1.11,1.12 |
Date: |
5 Mar 2003 17:31:32 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv9860/actions
Modified Files:
basher.cxx exiter.cxx exiter.hxx
Log Message:
- fixed sound for exiters
- added little delay on level startup to the entrances, so that there is place
for a 'lets go' like sound
Index: basher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- basher.cxx 19 Feb 2003 09:50:36 -0000 1.26
+++ basher.cxx 5 Mar 2003 17:31:29 -0000 1.27
@@ -16,6 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include "../sound/sound.hxx"
#include "../col_map.hxx"
#include "../debug.hxx"
#include "../globals.hxx"
@@ -86,6 +87,7 @@
|| rel_getpixel(0, pingu_height) == Groundtype::GP_SOLID)
{
// Change direction and let walk code walk forward/up to get out.
+ PingusSound::play_sound("chink");
pingu->direction.change();
pingu->set_action(Actions::Walker);
}
Index: exiter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/exiter.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- exiter.cxx 4 Mar 2003 13:59:44 -0000 1.16
+++ exiter.cxx 5 Mar 2003 17:31:29 -0000 1.17
@@ -27,7 +27,8 @@
Exiter::Exiter (Pingu* p)
: PinguAction(p),
- sprite(Sprite("Pingus/exit0", "pingus", 15.0f, Sprite::NONE, Sprite::ONCE))
+ sprite(Sprite("Pingus/exit0", "pingus", 15.0f, Sprite::NONE,
Sprite::ONCE)),
+ sound_played(false)
{
sprite.set_align_center_bottom();
}
@@ -37,11 +38,16 @@
{
sprite.update();
+ if (!sound_played)
+ {
+ sound_played = true;
+ PingusSound::play_sound("yipee");
+ }
+
if (sprite.finished())
{
if (pingu->get_status() != PS_EXITED)
{
- PingusSound::play_sound("yipee");
pingu->set_status(PS_EXITED);
}
}
Index: exiter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/exiter.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- exiter.hxx 13 Oct 2002 16:40:01 -0000 1.11
+++ exiter.hxx 5 Mar 2003 17:31:29 -0000 1.12
@@ -29,6 +29,7 @@
{
private:
Sprite sprite;
+ bool sound_played;
public:
Exiter(Pingu*);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx,1.26,1.27 exiter.cxx,1.16,1.17 exiter.hxx,1.11,1.12,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs entrance.cxx,1.10,1.11
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/data/levels/playable hellmouth13-grumbel.xml,1.3,1.4 miner-tutorial2-grumbel.xml,1.2,1.3 snow14-grumbel.xml,1.3,1.4 snow15-grumbel.xml,1.3,1.4 snow16-grumbel.xml,1.2,1.3 snow17-grumbel.xml,1.2,1.3 snow9-grumbel.xml,1.4,1.5
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs entrance.cxx,1.10,1.11
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/data/levels/playable hellmouth13-grumbel.xml,1.3,1.4 miner-tutorial2-grumbel.xml,1.2,1.3 snow14-grumbel.xml,1.3,1.4 snow15-grumbel.xml,1.3,1.4 snow16-grumbel.xml,1.2,1.3 snow17-grumbel.xml,1.2,1.3 snow9-grumbel.xml,1.4,1.5
- Index(es):