From 76eb50d92c492cdf72a4dadd9d1d5b79543e10f3 Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 29 Nov 2015 12:55:36 +0000 Subject: [PATCH] Added radio sound. --- ...06__bruce965__walkie-talkie-roger-beep.ogg | Bin 0 -> 7192 bytes src/battle/messageBox.c | 21 ++++++++++++------ src/battle/messageBox.h | 1 + src/defs.h | 1 + src/system/sound.c | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 sound/321906__bruce965__walkie-talkie-roger-beep.ogg diff --git a/sound/321906__bruce965__walkie-talkie-roger-beep.ogg b/sound/321906__bruce965__walkie-talkie-roger-beep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..933b4b7b8285ed5ef6283c9b4bf92e328b597131 GIT binary patch literal 7192 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 literal 0 HcmV?d00001 diff --git a/src/battle/messageBox.c b/src/battle/messageBox.c index 3a9d830..c6f93d5 100644 --- a/src/battle/messageBox.c +++ b/src/battle/messageBox.c @@ -34,6 +34,11 @@ void addMessageBox(char *title, char *body) MessageBox *msg; float time; + if (tail == &head) + { + playSound(SND_RADIO); + } + msg = malloc(sizeof(MessageBox)); memset(msg, 0, sizeof(MessageBox)); tail->next = msg; @@ -49,10 +54,9 @@ void addMessageBox(char *title, char *body) void doMessageBox(void) { - MessageBox *msg, *prev; + MessageBox *msg; msg = head.next; - prev = &head; if (msg) { @@ -60,15 +64,18 @@ void doMessageBox(void) { if (msg == tail) { - tail = prev; + tail = &head; } - prev->next = msg->next; + head.next = msg->next; free(msg); - msg = prev; + msg = &head; + + if (head.next) + { + playSound(SND_RADIO); + } } - - prev = msg; } } diff --git a/src/battle/messageBox.h b/src/battle/messageBox.h index c8066e2..9bcd593 100644 --- a/src/battle/messageBox.h +++ b/src/battle/messageBox.h @@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); extern void limitTextWidth(int width); +extern void playSound(int sound); extern App app; extern Colors colors; diff --git a/src/defs.h b/src/defs.h index 36bccaa..83a620f 100644 --- a/src/defs.h +++ b/src/defs.h @@ -167,6 +167,7 @@ enum SND_MISSILE, SND_INCOMING, SND_BOOST, + SND_RADIO, SND_GUI_CLICK, SND_GUI_SELECT, SND_GUI_CLOSE, diff --git a/src/system/sound.c b/src/system/sound.c index 75e6993..d52f9cf 100644 --- a/src/system/sound.c +++ b/src/system/sound.c @@ -101,6 +101,7 @@ static void loadSounds(void) sounds[SND_MISSILE] = Mix_LoadWAV("sound/65787__iwilldstroyu__laserrocket.ogg"); sounds[SND_BOOST] = Mix_LoadWAV("sound/18380__inferno__hvrl.ogg"); /*sounds[SND_ECM] = Mix_LoadWAV("sound/18380__inferno__hvrl.ogg");*/ + sounds[SND_RADIO] = Mix_LoadWAV("sound/321906__bruce965__walkie-talkie-roger-beep.ogg"); sounds[SND_INCOMING] = Mix_LoadWAV("sound/242856__plasterbrain__nuclear-alarm.ogg"); sounds[SND_GET_ITEM] = Mix_LoadWAV("sound/88275__s-dij__gbc-reload-06.ogg"); sounds[SND_EXPLOSION_1] = Mix_LoadWAV("sound/162265__qubodup__explosive.ogg");