diff --git a/sound/383779__jay-you__telephone-dialing.ogg b/sound/383779__jay-you__telephone-dialing.ogg new file mode 100644 index 0000000..5c1c9cf Binary files /dev/null and b/sound/383779__jay-you__telephone-dialing.ogg differ diff --git a/sound/46501__phreaksaccount__welder1.ogg b/sound/46501__phreaksaccount__welder1.ogg new file mode 100644 index 0000000..9247f33 Binary files /dev/null and b/sound/46501__phreaksaccount__welder1.ogg differ diff --git a/src/defs.h b/src/defs.h index 5950271..0ca566e 100644 --- a/src/defs.h +++ b/src/defs.h @@ -313,6 +313,8 @@ enum SND_MISSION_COMPLETE, SND_HEART_CELL, SND_TROPHY, + SND_ELECTRIC_HIT, + SND_ITEM_PAD, SND_MAX }; diff --git a/src/entities/structures/itemPad.c b/src/entities/structures/itemPad.c index 618b55d..0c89dd8 100644 --- a/src/entities/structures/itemPad.c +++ b/src/entities/structures/itemPad.c @@ -103,6 +103,8 @@ static void touch(Entity *other) s->spriteFrame = 0; updateObjective(s->name); + + playBattleSound(SND_ITEM_PAD, s->uniqueId % MAX_SND_CHANNELS, s->x, s->y); } else if (!s->bobTouching) { diff --git a/src/entities/structures/itemPad.h b/src/entities/structures/itemPad.h index 46c7749..9a2a0a9 100644 --- a/src/entities/structures/itemPad.h +++ b/src/entities/structures/itemPad.h @@ -27,5 +27,6 @@ extern void updateObjective(char *targetName); extern void setGameplayMessage(int type, char *format, ...); extern void removeItem(char *name); extern Item *getItem(char *name); +extern void playBattleSound(int snd, int ch, int x, int y); extern Entity *self; diff --git a/src/entities/traps/laserTrap.c b/src/entities/traps/laserTrap.c index dd9a688..0cc4c6b 100644 --- a/src/entities/traps/laserTrap.c +++ b/src/entities/traps/laserTrap.c @@ -139,6 +139,8 @@ static void touch(Entity *other) } playBattleSound(SND_FLESH_HIT, other->uniqueId % MAX_SND_CHANNELS, other->x, other->y); + + playBattleSound(SND_ELECTRIC_HIT, self->uniqueId % MAX_SND_CHANNELS, self->x, self->y); } if (other == (Entity*)world.bob && world.bob->stunTimer == 0)