diff --git a/sound/83237__mlestn1__pop.ogg b/sound/83237__mlestn1__pop.ogg new file mode 100644 index 0000000..c30f85a Binary files /dev/null and b/sound/83237__mlestn1__pop.ogg differ diff --git a/src/defs.h b/src/defs.h index 7053e21..b447950 100644 --- a/src/defs.h +++ b/src/defs.h @@ -322,6 +322,7 @@ enum SND_ELECTRIC_HIT, SND_ITEM_PAD, SND_POWER_POOL, + SND_POP, SND_MAX }; diff --git a/src/entities/blobs/bob.c b/src/entities/blobs/bob.c index 73a6137..b17ea1d 100644 --- a/src/entities/blobs/bob.c +++ b/src/entities/blobs/bob.c @@ -368,7 +368,14 @@ static void doDying(void) world.state = WS_GAME_OVER; - playSound(SND_SPLAT, world.bob->uniqueId % MAX_SND_CHANNELS); + if (app.config.blood) + { + playSound(SND_SPLAT, world.bob->uniqueId % MAX_SND_CHANNELS); + } + else + { + playSound(SND_POP, world.bob->uniqueId % MAX_SND_CHANNELS); + } game.stats[STAT_DEATHS]++; } diff --git a/src/entities/blobs/bob.h b/src/entities/blobs/bob.h index 0f7e3ed..c0ce690 100644 --- a/src/entities/blobs/bob.h +++ b/src/entities/blobs/bob.h @@ -47,6 +47,7 @@ extern int rrnd(int low, int high); extern void setGameplayMessage(int type, char *format, ...); extern void throwFleshChunks(float x, float y, int amount); +extern App app; extern Dev dev; extern Game game; extern World world; diff --git a/src/entities/evilBlobs/evilBlob.c b/src/entities/evilBlobs/evilBlob.c index 0d177b9..a16689d 100644 --- a/src/entities/evilBlobs/evilBlob.c +++ b/src/entities/evilBlobs/evilBlob.c @@ -94,7 +94,14 @@ static void die2(void) my = (int) (u->y / MAP_TILE_SIZE) + 1; addBloodDecal(mx, my); - playBattleSound(SND_SPLAT, u->uniqueId % MAX_SND_CHANNELS, u->x, u->y); + if (app.config.blood) + { + playBattleSound(SND_SPLAT, world.bob->uniqueId % MAX_SND_CHANNELS, u->x, u->y); + } + else + { + playBattleSound(SND_POP, world.bob->uniqueId % MAX_SND_CHANNELS, u->x, u->y); + } } } diff --git a/src/system/sound.c b/src/system/sound.c index 1ed76f7..10670ee 100644 --- a/src/system/sound.c +++ b/src/system/sound.c @@ -174,6 +174,7 @@ static void loadSounds(void) sounds[SND_ELECTRIC_HIT] = loadSound("sound/46501__phreaksaccount__welder1.ogg"); sounds[SND_ITEM_PAD] = loadSound("sound/319996__kenrt__ratchet.ogg"); sounds[SND_POWER_POOL] = loadSound("sound/235737__copyc4t__tf-power-tools.ogg"); + sounds[SND_POP] = loadSound("sound/83237__mlestn1__pop.ogg"); sounds[SND_MISSION_COMPLETE] = loadSound("sound/113989__kastenfrosch__gewonnen.ogg"); sounds[SND_TROPHY] = loadSound("sound/278142__ricemaster__effect-notify.ogg");