projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d98fb32
)
converted sounds back to .wav
author
Marek Moeckel
<wansti@gmx.de>
Wed, 20 Jul 2005 08:53:46 +0000
(08:53 +0000)
committer
Marek Moeckel
<wansti@gmx.de>
Wed, 20 Jul 2005 08:53:46 +0000
(08:53 +0000)
SVN-Revision: 2738
76 files changed:
data/sounds/bigjump.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/bigjump.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/brick.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/brick.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/bump-upgrade.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/bump-upgrade.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/coin.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/coin.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/explosion.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/explosion.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/fall.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/fall.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/fire-flower.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/fire-flower.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/fireworks.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/fireworks.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/flame.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/flame.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/grow.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/grow.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/hurt.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/hurt.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/iceblock_bump.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/iceblock_bump.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/invincible.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/invincible.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/jump.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/jump.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/kick.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/kick.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/lava.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/lava.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/lifeup.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/lifeup.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/phone.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/phone.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/rain.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/rain.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/shoot.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/shoot.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/skid.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/skid.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/squish.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/squish.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/stomp.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/stomp.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/upgrade.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/upgrade.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/warp.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/warp.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/waterfall.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/waterfall.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/yeti_gna.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/yeti_gna.wav
[new file with mode: 0644]
patch
|
blob
data/sounds/yeti_roar.ogg
[deleted file]
patch
|
blob
|
history
data/sounds/yeti_roar.wav
[new file with mode: 0644]
patch
|
blob
src/badguy/badguy.cpp
patch
|
blob
|
history
src/badguy/bomb.cpp
patch
|
blob
|
history
src/badguy/flame.cpp
patch
|
blob
|
history
src/badguy/jumpy.cpp
patch
|
blob
|
history
src/badguy/mriceblock.cpp
patch
|
blob
|
history
src/badguy/mrtree.cpp
patch
|
blob
|
history
src/badguy/nolok_01.cpp
patch
|
blob
|
history
src/badguy/rocketexplosion.cpp
patch
|
blob
|
history
src/badguy/yeti.cpp
patch
|
blob
|
history
src/object/ambient_sound.cpp
patch
|
blob
|
history
src/object/block.cpp
patch
|
blob
|
history
src/object/fireworks.cpp
patch
|
blob
|
history
src/object/flower.cpp
patch
|
blob
|
history
src/object/growup.cpp
patch
|
blob
|
history
src/object/invisible_block.cpp
patch
|
blob
|
history
src/object/player.cpp
patch
|
blob
|
history
src/object/powerup.cpp
patch
|
blob
|
history
src/player_status.cpp
patch
|
blob
|
history
src/sector.cpp
patch
|
blob
|
history
src/worldmap.cpp
patch
|
blob
|
history
diff --git
a/data/sounds/bigjump.ogg
b/data/sounds/bigjump.ogg
deleted file mode 100644
(file)
index
eb71e73
..0000000
Binary files a/data/sounds/bigjump.ogg and /dev/null differ
diff --git a/data/sounds/bigjump.wav
b/data/sounds/bigjump.wav
new file mode 100644
(file)
index 0000000..
634d23d
Binary files /dev/null and b/data/sounds/bigjump.wav differ
diff --git
a/data/sounds/brick.ogg
b/data/sounds/brick.ogg
deleted file mode 100644
(file)
index
2c3afec
..0000000
Binary files a/data/sounds/brick.ogg and /dev/null differ
diff --git a/data/sounds/brick.wav
b/data/sounds/brick.wav
new file mode 100644
(file)
index 0000000..
83de10d
Binary files /dev/null and b/data/sounds/brick.wav differ
diff --git
a/data/sounds/bump-upgrade.ogg
b/data/sounds/bump-upgrade.ogg
deleted file mode 100644
(file)
index
415180c
..0000000
Binary files a/data/sounds/bump-upgrade.ogg and /dev/null differ
diff --git a/data/sounds/bump-upgrade.wav
b/data/sounds/bump-upgrade.wav
new file mode 100644
(file)
index 0000000..
524b8e2
Binary files /dev/null and b/data/sounds/bump-upgrade.wav differ
diff --git
a/data/sounds/coin.ogg
b/data/sounds/coin.ogg
deleted file mode 100644
(file)
index
460c6b1
..0000000
Binary files a/data/sounds/coin.ogg and /dev/null differ
diff --git a/data/sounds/coin.wav
b/data/sounds/coin.wav
new file mode 100644
(file)
index 0000000..
40c34d9
Binary files /dev/null and b/data/sounds/coin.wav differ
diff --git
a/data/sounds/explosion.ogg
b/data/sounds/explosion.ogg
deleted file mode 100644
(file)
index
220fb17
..0000000
Binary files a/data/sounds/explosion.ogg and /dev/null differ
diff --git a/data/sounds/explosion.wav
b/data/sounds/explosion.wav
new file mode 100644
(file)
index 0000000..
259ae1e
Binary files /dev/null and b/data/sounds/explosion.wav differ
diff --git
a/data/sounds/fall.ogg
b/data/sounds/fall.ogg
deleted file mode 100644
(file)
index
d0bc808
..0000000
Binary files a/data/sounds/fall.ogg and /dev/null differ
diff --git a/data/sounds/fall.wav
b/data/sounds/fall.wav
new file mode 100644
(file)
index 0000000..
e48c7a5
Binary files /dev/null and b/data/sounds/fall.wav differ
diff --git
a/data/sounds/fire-flower.ogg
b/data/sounds/fire-flower.ogg
deleted file mode 100644
(file)
index
c368a72
..0000000
Binary files a/data/sounds/fire-flower.ogg and /dev/null differ
diff --git a/data/sounds/fire-flower.wav
b/data/sounds/fire-flower.wav
new file mode 100644
(file)
index 0000000..
72c2272
Binary files /dev/null and b/data/sounds/fire-flower.wav differ
diff --git
a/data/sounds/fireworks.ogg
b/data/sounds/fireworks.ogg
deleted file mode 100644
(file)
index
2e02ab7
..0000000
Binary files a/data/sounds/fireworks.ogg and /dev/null differ
diff --git a/data/sounds/fireworks.wav
b/data/sounds/fireworks.wav
new file mode 100644
(file)
index 0000000..
d4ea956
Binary files /dev/null and b/data/sounds/fireworks.wav differ
diff --git
a/data/sounds/flame.ogg
b/data/sounds/flame.ogg
deleted file mode 100644
(file)
index
6d512cc
..0000000
Binary files a/data/sounds/flame.ogg and /dev/null differ
diff --git a/data/sounds/flame.wav
b/data/sounds/flame.wav
new file mode 100644
(file)
index 0000000..
6aeccb1
Binary files /dev/null and b/data/sounds/flame.wav differ
diff --git
a/data/sounds/grow.ogg
b/data/sounds/grow.ogg
deleted file mode 100644
(file)
index
63a1b25
..0000000
Binary files a/data/sounds/grow.ogg and /dev/null differ
diff --git a/data/sounds/grow.wav
b/data/sounds/grow.wav
new file mode 100644
(file)
index 0000000..
7b83dcc
Binary files /dev/null and b/data/sounds/grow.wav differ
diff --git
a/data/sounds/hurt.ogg
b/data/sounds/hurt.ogg
deleted file mode 100644
(file)
index
2a79923
..0000000
Binary files a/data/sounds/hurt.ogg and /dev/null differ
diff --git a/data/sounds/hurt.wav
b/data/sounds/hurt.wav
new file mode 100644
(file)
index 0000000..
20537c3
Binary files /dev/null and b/data/sounds/hurt.wav differ
diff --git
a/data/sounds/iceblock_bump.ogg
b/data/sounds/iceblock_bump.ogg
deleted file mode 100644
(file)
index
9f2abfe
..0000000
Binary files a/data/sounds/iceblock_bump.ogg and /dev/null differ
diff --git a/data/sounds/iceblock_bump.wav
b/data/sounds/iceblock_bump.wav
new file mode 100644
(file)
index 0000000..
016c7bf
Binary files /dev/null and b/data/sounds/iceblock_bump.wav differ
diff --git
a/data/sounds/invincible.ogg
b/data/sounds/invincible.ogg
deleted file mode 100644
(file)
index
72fd94c
..0000000
Binary files a/data/sounds/invincible.ogg and /dev/null differ
diff --git a/data/sounds/invincible.wav
b/data/sounds/invincible.wav
new file mode 100644
(file)
index 0000000..
96f3871
Binary files /dev/null and b/data/sounds/invincible.wav differ
diff --git
a/data/sounds/jump.ogg
b/data/sounds/jump.ogg
deleted file mode 100644
(file)
index
c87d6b3
..0000000
Binary files a/data/sounds/jump.ogg and /dev/null differ
diff --git a/data/sounds/jump.wav
b/data/sounds/jump.wav
new file mode 100644
(file)
index 0000000..
24240ea
Binary files /dev/null and b/data/sounds/jump.wav differ
diff --git
a/data/sounds/kick.ogg
b/data/sounds/kick.ogg
deleted file mode 100644
(file)
index
4062552
..0000000
Binary files a/data/sounds/kick.ogg and /dev/null differ
diff --git a/data/sounds/kick.wav
b/data/sounds/kick.wav
new file mode 100644
(file)
index 0000000..
fa46559
Binary files /dev/null and b/data/sounds/kick.wav differ
diff --git
a/data/sounds/lava.ogg
b/data/sounds/lava.ogg
deleted file mode 100644
(file)
index
8c56745
..0000000
Binary files a/data/sounds/lava.ogg and /dev/null differ
diff --git a/data/sounds/lava.wav
b/data/sounds/lava.wav
new file mode 100644
(file)
index 0000000..
40a24ea
Binary files /dev/null and b/data/sounds/lava.wav differ
diff --git
a/data/sounds/lifeup.ogg
b/data/sounds/lifeup.ogg
deleted file mode 100644
(file)
index
8499210
..0000000
Binary files a/data/sounds/lifeup.ogg and /dev/null differ
diff --git a/data/sounds/lifeup.wav
b/data/sounds/lifeup.wav
new file mode 100644
(file)
index 0000000..
96f221c
Binary files /dev/null and b/data/sounds/lifeup.wav differ
diff --git
a/data/sounds/phone.ogg
b/data/sounds/phone.ogg
deleted file mode 100644
(file)
index
3f6bd1e
..0000000
Binary files a/data/sounds/phone.ogg and /dev/null differ
diff --git a/data/sounds/phone.wav
b/data/sounds/phone.wav
new file mode 100644
(file)
index 0000000..
c2da218
Binary files /dev/null and b/data/sounds/phone.wav differ
diff --git
a/data/sounds/rain.ogg
b/data/sounds/rain.ogg
deleted file mode 100644
(file)
index
e806c25
..0000000
Binary files a/data/sounds/rain.ogg and /dev/null differ
diff --git a/data/sounds/rain.wav
b/data/sounds/rain.wav
new file mode 100644
(file)
index 0000000..
7509a53
Binary files /dev/null and b/data/sounds/rain.wav differ
diff --git
a/data/sounds/shoot.ogg
b/data/sounds/shoot.ogg
deleted file mode 100644
(file)
index
9f026f0
..0000000
Binary files a/data/sounds/shoot.ogg and /dev/null differ
diff --git a/data/sounds/shoot.wav
b/data/sounds/shoot.wav
new file mode 100644
(file)
index 0000000..
c30a649
Binary files /dev/null and b/data/sounds/shoot.wav differ
diff --git
a/data/sounds/skid.ogg
b/data/sounds/skid.ogg
deleted file mode 100644
(file)
index
761a42c
..0000000
Binary files a/data/sounds/skid.ogg and /dev/null differ
diff --git a/data/sounds/skid.wav
b/data/sounds/skid.wav
new file mode 100644
(file)
index 0000000..
8576153
Binary files /dev/null and b/data/sounds/skid.wav differ
diff --git
a/data/sounds/squish.ogg
b/data/sounds/squish.ogg
deleted file mode 100644
(file)
index
7e8c0ad
..0000000
Binary files a/data/sounds/squish.ogg and /dev/null differ
diff --git a/data/sounds/squish.wav
b/data/sounds/squish.wav
new file mode 100644
(file)
index 0000000..
85601db
Binary files /dev/null and b/data/sounds/squish.wav differ
diff --git
a/data/sounds/stomp.ogg
b/data/sounds/stomp.ogg
deleted file mode 100644
(file)
index
afa81d1
..0000000
Binary files a/data/sounds/stomp.ogg and /dev/null differ
diff --git a/data/sounds/stomp.wav
b/data/sounds/stomp.wav
new file mode 100644
(file)
index 0000000..
ace9b96
Binary files /dev/null and b/data/sounds/stomp.wav differ
diff --git
a/data/sounds/upgrade.ogg
b/data/sounds/upgrade.ogg
deleted file mode 100644
(file)
index
b35186d
..0000000
Binary files a/data/sounds/upgrade.ogg and /dev/null differ
diff --git a/data/sounds/upgrade.wav
b/data/sounds/upgrade.wav
new file mode 100644
(file)
index 0000000..
95edf47
Binary files /dev/null and b/data/sounds/upgrade.wav differ
diff --git
a/data/sounds/warp.ogg
b/data/sounds/warp.ogg
deleted file mode 100644
(file)
index
ee2928f
..0000000
Binary files a/data/sounds/warp.ogg and /dev/null differ
diff --git a/data/sounds/warp.wav
b/data/sounds/warp.wav
new file mode 100644
(file)
index 0000000..
438cee5
Binary files /dev/null and b/data/sounds/warp.wav differ
diff --git
a/data/sounds/waterfall.ogg
b/data/sounds/waterfall.ogg
deleted file mode 100644
(file)
index
c5a424e
..0000000
Binary files a/data/sounds/waterfall.ogg and /dev/null differ
diff --git a/data/sounds/waterfall.wav
b/data/sounds/waterfall.wav
new file mode 100644
(file)
index 0000000..
52eb8e7
Binary files /dev/null and b/data/sounds/waterfall.wav differ
diff --git
a/data/sounds/yeti_gna.ogg
b/data/sounds/yeti_gna.ogg
deleted file mode 100644
(file)
index
9c1a2d0
..0000000
Binary files a/data/sounds/yeti_gna.ogg and /dev/null differ
diff --git a/data/sounds/yeti_gna.wav
b/data/sounds/yeti_gna.wav
new file mode 100644
(file)
index 0000000..
423479f
Binary files /dev/null and b/data/sounds/yeti_gna.wav differ
diff --git
a/data/sounds/yeti_roar.ogg
b/data/sounds/yeti_roar.ogg
deleted file mode 100644
(file)
index
b46819b
..0000000
Binary files a/data/sounds/yeti_roar.ogg and /dev/null differ
diff --git a/data/sounds/yeti_roar.wav
b/data/sounds/yeti_roar.wav
new file mode 100644
(file)
index 0000000..
25d1ccb
Binary files /dev/null and b/data/sounds/yeti_roar.wav differ
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
65b2997
..
8af3885
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-181,7
+181,7
@@
BadGuy::collision_squished(Player& )
void
BadGuy::kill_squished(Player& player)
{
void
BadGuy::kill_squished(Player& player)
{
- sound_manager->play("sounds/squish.
ogg
", get_pos());
+ sound_manager->play("sounds/squish.
wav
", get_pos());
physic.enable_gravity(true);
physic.set_velocity_x(0);
physic.set_velocity_y(0);
physic.enable_gravity(true);
physic.set_velocity_x(0);
physic.set_velocity_y(0);
@@
-193,7
+193,7
@@
BadGuy::kill_squished(Player& player)
void
BadGuy::kill_fall()
{
void
BadGuy::kill_fall()
{
- sound_manager->play("sounds/fall.
ogg
", get_pos());
+ sound_manager->play("sounds/fall.
wav
", get_pos());
global_stats.add_points(BADGUYS_KILLED_STAT, 1);
physic.set_velocity_y(0);
physic.enable_gravity(true);
global_stats.add_points(BADGUYS_KILLED_STAT, 1);
physic.set_velocity_y(0);
physic.enable_gravity(true);
diff --git
a/src/badguy/bomb.cpp
b/src/badguy/bomb.cpp
index
451fe00
..
c611337
100644
(file)
--- a/
src/badguy/bomb.cpp
+++ b/
src/badguy/bomb.cpp
@@
-92,7
+92,7
@@
Bomb::explode()
{
state = 1;
sprite->set_action("explosion");
{
state = 1;
sprite->set_action("explosion");
- sound_manager->play("sounds/explosion.
ogg
", get_pos());
+ sound_manager->play("sounds/explosion.
wav
", get_pos());
timer.start(EXPLOSIONTIME);
}
timer.start(EXPLOSIONTIME);
}
diff --git
a/src/badguy/flame.cpp
b/src/badguy/flame.cpp
index
b17cdb5
..
f43b69a
100644
(file)
--- a/
src/badguy/flame.cpp
+++ b/
src/badguy/flame.cpp
@@
-69,7
+69,7
@@
void
Flame::activate()
{
delete source;
Flame::activate()
{
delete source;
- source = sound_manager->create_sound_source("sounds/flame.
ogg
");
+ source = sound_manager->create_sound_source("sounds/flame.
wav
");
if(!source) {
std::cerr << "Couldn't start flame sound.\n";
return;
if(!source) {
std::cerr << "Couldn't start flame sound.\n";
return;
diff --git
a/src/badguy/jumpy.cpp
b/src/badguy/jumpy.cpp
index
9514ed3
..
9b2a6b7
100644
(file)
--- a/
src/badguy/jumpy.cpp
+++ b/
src/badguy/jumpy.cpp
@@
-70,7
+70,7
@@
Jumpy::hit(const CollisionHit& chit)
physic.set_velocity_y(JUMPSPEED);
// TODO create a nice sound for this...
physic.set_velocity_y(JUMPSPEED);
// TODO create a nice sound for this...
- //sound_manager->play("sounds/skid.
ogg
");
+ //sound_manager->play("sounds/skid.
wav
");
} else if(chit.normal.y < .5) { // bumped on roof
physic.set_velocity_y(0);
}
} else if(chit.normal.y < .5) { // bumped on roof
physic.set_velocity_y(0);
}
diff --git
a/src/badguy/mriceblock.cpp
b/src/badguy/mriceblock.cpp
index
67e9ea4
..
0525848
100644
(file)
--- a/
src/badguy/mriceblock.cpp
+++ b/
src/badguy/mriceblock.cpp
@@
-105,7
+105,7
@@
MrIceBlock::collision_solid(GameObject& object, const CollisionHit& hit)
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
physic.set_velocity_x(-physic.get_velocity_x());
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
physic.set_velocity_x(-physic.get_velocity_x());
- sound_manager->play("sounds/iceblock_bump.
ogg
", get_pos());
+ sound_manager->play("sounds/iceblock_bump.
wav
", get_pos());
break;
}
case ICESTATE_FLAT:
break;
}
case ICESTATE_FLAT:
@@
-152,7
+152,7
@@
MrIceBlock::collision_squished(Player& player)
}
// flatten
}
// flatten
- sound_manager->play("sounds/stomp.
ogg
", get_pos());
+ sound_manager->play("sounds/stomp.
wav
", get_pos());
physic.set_velocity_x(0);
physic.set_velocity_y(0);
physic.set_velocity_x(0);
physic.set_velocity_y(0);
@@
-162,7
+162,7
@@
MrIceBlock::collision_squished(Player& player)
break;
case ICESTATE_FLAT:
// kick
break;
case ICESTATE_FLAT:
// kick
- sound_manager->play("sounds/kick.
ogg
", get_pos());
+ sound_manager->play("sounds/kick.
wav
", get_pos());
if(player.get_pos().x < get_pos().x) {
dir = RIGHT;
if(player.get_pos().x < get_pos().x) {
dir = RIGHT;
diff --git
a/src/badguy/mrtree.cpp
b/src/badguy/mrtree.cpp
index
82ec915
..
73e2c63
100644
(file)
--- a/
src/badguy/mrtree.cpp
+++ b/
src/badguy/mrtree.cpp
@@
-64,7
+64,7
@@
MrTree::collision_squished(Player& player)
mystate = STATE_NORMAL;
activate();
mystate = STATE_NORMAL;
activate();
- sound_manager->play("sounds/squish.
ogg
", get_pos());
+ sound_manager->play("sounds/squish.
wav
", get_pos());
player.bounce(*this);
} else {
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
player.bounce(*this);
} else {
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
diff --git
a/src/badguy/nolok_01.cpp
b/src/badguy/nolok_01.cpp
index
96b745f
..
925e4de
100644
(file)
--- a/
src/badguy/nolok_01.cpp
+++ b/
src/badguy/nolok_01.cpp
@@
-147,7
+147,7
@@
Nolok_01::kill_fall()
bullet_hitpoints--;
if (bullet_hitpoints <= 0) {
hitpoints = 0;
bullet_hitpoints--;
if (bullet_hitpoints <= 0) {
hitpoints = 0;
- sound_manager->play("sounds/fall.
ogg
", this,
+ sound_manager->play("sounds/fall.
wav
", this,
Sector::current()->player->get_pos());
physic.set_velocity_y(0);
physic.enable_gravity(true);
Sector::current()->player->get_pos());
physic.set_velocity_y(0);
physic.enable_gravity(true);
diff --git
a/src/badguy/rocketexplosion.cpp
b/src/badguy/rocketexplosion.cpp
index
b90c183
..
e79e847
100644
(file)
--- a/
src/badguy/rocketexplosion.cpp
+++ b/
src/badguy/rocketexplosion.cpp
@@
-76,7
+76,7
@@
void
RocketExplosion::explode()
{
sprite->set_action(dir == LEFT ? "explosion-left" : "explosion-right");
RocketExplosion::explode()
{
sprite->set_action(dir == LEFT ? "explosion-left" : "explosion-right");
- sound_manager->play("sounds/explosion.
ogg
", get_pos());
+ sound_manager->play("sounds/explosion.
wav
", get_pos());
timer.start(EXPLOSIONTIME, true);
}
timer.start(EXPLOSIONTIME, true);
}
diff --git
a/src/badguy/yeti.cpp
b/src/badguy/yeti.cpp
index
7e404a3
..
50aa888
100644
(file)
--- a/
src/badguy/yeti.cpp
+++ b/
src/badguy/yeti.cpp
@@
-89,7
+89,7
@@
Yeti::active_update(float elapsed_time)
case ANGRY_JUMPING:
if(timer.check()) {
// jump
case ANGRY_JUMPING:
if(timer.check()) {
// jump
- sound_manager->play("sounds/yeti_gna.
ogg
");
+ sound_manager->play("sounds/yeti_gna.
wav
");
physic.set_velocity_y(JUMP_VEL1);
}
break;
physic.set_velocity_y(JUMP_VEL1);
}
break;
@@
-141,7
+141,7
@@
Yeti::collision_squished(Player& player)
return true;
player.bounce(*this);
return true;
player.bounce(*this);
- sound_manager->play("sounds/yeti_roar.
ogg
");
+ sound_manager->play("sounds/yeti_roar.
wav
");
hit_points--;
if(hit_points <= 0) {
sprite->set_action("dead");
hit_points--;
if(hit_points <= 0) {
sprite->set_action("dead");
diff --git
a/src/object/ambient_sound.cpp
b/src/object/ambient_sound.cpp
index
61af1aa
..
68253b0
100644
(file)
--- a/
src/object/ambient_sound.cpp
+++ b/
src/object/ambient_sound.cpp
@@
-123,7
+123,7
@@
AmbientSound::start_playing()
try {
std::string filename = "sounds/";
filename += sample;
try {
std::string filename = "sounds/";
filename += sample;
- filename += ".
ogg
";
+ filename += ".
wav
";
sound_source = sound_manager->create_sound_source(filename);
if(!sound_source)
throw std::runtime_error("file not found");
sound_source = sound_manager->create_sound_source(filename);
if(!sound_source)
throw std::runtime_error("file not found");
diff --git
a/src/object/block.cpp
b/src/object/block.cpp
index
dd2e11c
..
d68b02a
100644
(file)
--- a/
src/object/block.cpp
+++ b/
src/object/block.cpp
@@
-203,7
+203,7
@@
void
BonusBlock::try_open()
{
if(sprite->get_action_name() == "empty") {
BonusBlock::try_open()
{
if(sprite->get_action_name() == "empty") {
- sound_manager->play("sounds/brick.
ogg
");
+ sound_manager->play("sounds/brick.
wav
");
return;
}
return;
}
@@
-224,7
+224,7
@@
BonusBlock::try_open()
get_pos(), new Flower(Flower::FIREFLOWER));
sector->add_object(riser);
}
get_pos(), new Flower(Flower::FIREFLOWER));
sector->add_object(riser);
}
- sound_manager->play("sounds/upgrade.
ogg
");
+ sound_manager->play("sounds/upgrade.
wav
");
break;
case CONTENT_ICEGROW:
break;
case CONTENT_ICEGROW:
@@
-236,7
+236,7
@@
BonusBlock::try_open()
get_pos(), new Flower(Flower::ICEFLOWER));
sector->add_object(riser);
}
get_pos(), new Flower(Flower::ICEFLOWER));
sector->add_object(riser);
}
- sound_manager->play("sounds/upgrade.
ogg
");
+ sound_manager->play("sounds/upgrade.
wav
");
break;
case CONTENT_STAR:
break;
case CONTENT_STAR:
@@
-251,7
+251,7
@@
BonusBlock::try_open()
SpecialRiser* riser = new SpecialRiser(get_pos(), object);
object = 0;
sector->add_object(riser);
SpecialRiser* riser = new SpecialRiser(get_pos(), object);
object = 0;
sector->add_object(riser);
- sound_manager->play("sounds/upgrade.
ogg
");
+ sound_manager->play("sounds/upgrade.
wav
");
break;
//default:
break;
//default:
@@
-292,7
+292,7
@@
Brick::try_break(bool playerhit)
if(sprite->get_action_name() == "empty")
return;
if(sprite->get_action_name() == "empty")
return;
- sound_manager->play("sounds/brick.
ogg
");
+ sound_manager->play("sounds/brick.
wav
");
Sector* sector = Sector::current();
Player& player = *(sector->player);
if(coin_counter > 0) {
Sector* sector = Sector::current();
Player& player = *(sector->player);
if(coin_counter > 0) {
diff --git
a/src/object/fireworks.cpp
b/src/object/fireworks.cpp
index
12b79b3
..
62904c5
100644
(file)
--- a/
src/object/fireworks.cpp
+++ b/
src/object/fireworks.cpp
@@
-51,7
+51,7
@@
Fireworks::update(float )
sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
Vector(0, 0), 45, Color(red, green, 0), 3, 1.3,
LAYER_FOREGROUND1+1));
sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
Vector(0, 0), 45, Color(red, green, 0), 3, 1.3,
LAYER_FOREGROUND1+1));
- sound_manager->play("sounds/fireworks.
ogg
");
+ sound_manager->play("sounds/fireworks.
wav
");
timer.start(((float) rand() / RAND_MAX) + .5);
}
}
timer.start(((float) rand() / RAND_MAX) + .5);
}
}
diff --git
a/src/object/flower.cpp
b/src/object/flower.cpp
index
0dbdd38
..
c71ec69
100644
(file)
--- a/
src/object/flower.cpp
+++ b/
src/object/flower.cpp
@@
-67,7
+67,7
@@
Flower::collision(GameObject& other, const CollisionHit& )
else
player->set_bonus(ICE_BONUS, true);
else
player->set_bonus(ICE_BONUS, true);
- sound_manager->play("sounds/fire-flower.
ogg
");
+ sound_manager->play("sounds/fire-flower.
wav
");
remove_me();
return ABORT_MOVE;
}
remove_me();
return ABORT_MOVE;
}
diff --git
a/src/object/growup.cpp
b/src/object/growup.cpp
index
fd33999
..
6f0fe5e
100644
(file)
--- a/
src/object/growup.cpp
+++ b/
src/object/growup.cpp
@@
-64,7
+64,7
@@
GrowUp::collision(GameObject& other, const CollisionHit& hit)
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
player->set_bonus(GROWUP_BONUS, true);
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
player->set_bonus(GROWUP_BONUS, true);
- sound_manager->play("sounds/grow.
ogg
");
+ sound_manager->play("sounds/grow.
wav
");
remove_me();
return ABORT_MOVE;
remove_me();
return ABORT_MOVE;
diff --git
a/src/object/invisible_block.cpp
b/src/object/invisible_block.cpp
index
47f17ea
..
4d28d26
100644
(file)
--- a/
src/object/invisible_block.cpp
+++ b/
src/object/invisible_block.cpp
@@
-49,7
+49,7
@@
InvisibleBlock::hit(Player& )
return;
sprite->set_action("empty");
return;
sprite->set_action("empty");
- sound_manager->play("sounds/brick.
ogg
");
+ sound_manager->play("sounds/brick.
wav
");
start_bounce();
flags |= FLAG_SOLID;
visible = true;
start_bounce();
flags |= FLAG_SOLID;
visible = true;
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
961e7a3
..
b42c547
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-270,7
+270,7
@@
Player::handle_horizontal_input()
// let's skid!
if(fabs(vx)>SKID_XM && !skidding_timer.started()) {
skidding_timer.start(SKID_TIME);
// let's skid!
if(fabs(vx)>SKID_XM && !skidding_timer.started()) {
skidding_timer.start(SKID_TIME);
- sound_manager->play("sounds/skid.
ogg
");
+ sound_manager->play("sounds/skid.
wav
");
// dust some partcles
Sector::current()->add_object(
new Particles(
// dust some partcles
Sector::current()->add_object(
new Particles(
@@
-366,9
+366,9
@@
Player::handle_vertical_input()
can_flap = false;
flaps_nb = 0; // Ricardo's flapping
if (is_big())
can_flap = false;
flaps_nb = 0; // Ricardo's flapping
if (is_big())
- sound_manager->play("sounds/bigjump.
ogg
");
+ sound_manager->play("sounds/bigjump.
wav
");
else
else
- sound_manager->play("sounds/jump.
ogg
");
+ sound_manager->play("sounds/jump.
wav
");
} else if(!controller->hold(Controller::JUMP)) { // Let go of jump key
if (!flapping && !duck && !falling_from_flap && !on_ground()) {
can_flap = true;
} else if(!controller->hold(Controller::JUMP)) { // Let go of jump key
if (!flapping && !duck && !falling_from_flap && !on_ground()) {
can_flap = true;
@@
-790,7
+790,7
@@
Player::collision(GameObject& other, const CollisionHit& hit)
void
Player::make_invincible()
{
void
Player::make_invincible()
{
- sound_manager->play("sounds/invincible.
ogg
");
+ sound_manager->play("sounds/invincible.
wav
");
invincible_timer.start(TUX_INVINCIBLE_TIME);
Sector::current()->play_music(HERRING_MUSIC);
}
invincible_timer.start(TUX_INVINCIBLE_TIME);
Sector::current()->play_music(HERRING_MUSIC);
}
@@
-806,7
+806,7
@@
Player::kill(HurtMode mode)
safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)
return;
safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)
return;
- sound_manager->play("sounds/hurt.
ogg
");
+ sound_manager->play("sounds/hurt.
wav
");
physic.set_velocity_x(0);
physic.set_velocity_x(0);
diff --git
a/src/object/powerup.cpp
b/src/object/powerup.cpp
index
8cc0e7e
..
9d3ff93
100644
(file)
--- a/
src/object/powerup.cpp
+++ b/
src/object/powerup.cpp
@@
-74,10
+74,10
@@
PowerUp::collision(GameObject& other, const CollisionHit& hit)
// some defaults if no script has been set
if (sprite->get_name() == "egg") {
player->set_bonus(GROWUP_BONUS, true);
// some defaults if no script has been set
if (sprite->get_name() == "egg") {
player->set_bonus(GROWUP_BONUS, true);
- sound_manager->play("sounds/grow.
ogg
");
+ sound_manager->play("sounds/grow.
wav
");
} else if (sprite->get_name() == "fireflower") {
player->set_bonus(FIRE_BONUS, true);
} else if (sprite->get_name() == "fireflower") {
player->set_bonus(FIRE_BONUS, true);
- sound_manager->play("sounds/fire-flower.
ogg
");
+ sound_manager->play("sounds/fire-flower.
wav
");
} else if (sprite->get_name() == "star") {
player->make_invincible();
} else if (sprite->get_name() == "1up") {
} else if (sprite->get_name() == "star") {
player->make_invincible();
} else if (sprite->get_name() == "1up") {
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
cb5815e
..
57acb93
100644
(file)
--- a/
src/player_status.cpp
+++ b/
src/player_status.cpp
@@
-55,7
+55,7
@@
PlayerStatus::incLives()
{
if(lives < MAX_LIVES)
++lives;
{
if(lives < MAX_LIVES)
++lives;
- sound_manager->play("sounds/lifeup.
ogg
");
+ sound_manager->play("sounds/lifeup.
wav
");
}
void
}
void
@@
-66,7
+66,7
@@
PlayerStatus::incCoins()
incLives();
coins = 0;
}
incLives();
coins = 0;
}
- sound_manager->play("sounds/coin.
ogg
");
+ sound_manager->play("sounds/coin.
wav
");
}
void
}
void
diff --git
a/src/sector.cpp
b/src/sector.cpp
index
4db083f
..
51b8683
100644
(file)
--- a/
src/sector.cpp
+++ b/
src/sector.cpp
@@
-769,7
+769,7
@@
Sector::add_bullet(const Vector& pos, float xm, Direction dir)
}
add_object(new_bullet);
}
add_object(new_bullet);
- sound_manager->play("sounds/shoot.
ogg
");
+ sound_manager->play("sounds/shoot.
wav
");
return true;
}
return true;
}
diff --git
a/src/worldmap.cpp
b/src/worldmap.cpp
index
c6f9053
..
0123216
100644
(file)
--- a/
src/worldmap.cpp
+++ b/
src/worldmap.cpp
@@
-713,7
+713,7
@@
WorldMap::update(float delta)
if (special_tile->teleport_dest != Vector(-1,-1))
{
// TODO: an animation, camera scrolling or a fading would be a nice touch
if (special_tile->teleport_dest != Vector(-1,-1))
{
// TODO: an animation, camera scrolling or a fading would be a nice touch
- sound_manager->play("sounds/warp.
ogg
");
+ sound_manager->play("sounds/warp.
wav
");
tux->back_direction = D_NONE;
tux->set_tile_pos(special_tile->teleport_dest);
SDL_Delay(1000);
tux->back_direction = D_NONE;
tux->set_tile_pos(special_tile->teleport_dest);
SDL_Delay(1000);