From 96949ec97ca208391f6ef41aeb73503613fc740f Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 21 Mar 2018 07:29:04 +0000 Subject: [PATCH] Play pop sound when no blood option selected. --- sound/83237__mlestn1__pop.ogg | Bin 0 -> 11639 bytes src/defs.h | 1 + src/entities/blobs/bob.c | 9 ++++++++- src/entities/blobs/bob.h | 1 + src/entities/evilBlobs/evilBlob.c | 9 ++++++++- src/system/sound.c | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 sound/83237__mlestn1__pop.ogg diff --git a/sound/83237__mlestn1__pop.ogg b/sound/83237__mlestn1__pop.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c30f85a2381eed9959286e03dd6fd0394ce8a0ce GIT binary patch literal 11639 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 literal 0 HcmV?d00001 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");