From d2aa39603eb8a26142a0230188d2572fb0398af5 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Wed, 9 Dec 2015 07:47:00 -0500 Subject: [PATCH] dialog clicks --- assets/click.wav | Bin 0 -> 17684 bytes src/gameplay.cpp | 14 +++++++++++++- src/ui.cpp | 9 +++++++++ src/world.cpp | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 assets/click.wav diff --git a/assets/click.wav b/assets/click.wav new file mode 100644 index 0000000000000000000000000000000000000000..976fb42fab64abb528361a39e21193741ab7787f GIT binary patch literal 17684 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 = false; player->loc.x += HLINE * 5; - callee->alive = false; + callee->alive = true; } void CUTSCENEEE2(Mob *callee){ @@ -54,6 +54,18 @@ void story(Mob *callee){ player->vel.x = 0; ui::importantText("It was a dark and stormy night..."); ui::waitForDialog(); + ui::importantText("...and Clyne wanted to hear what the click track sounds like."); + ui::waitForDialog(); + ui::importantText("So Clyne made a really long piece of dialog so that the sound"); + ui::waitForDialog(); + ui::importantText("plays"); + ui::waitForDialog(); + ui::importantText("multiple"); + ui::waitForDialog(); + ui::importantText("times."); + ui::waitForDialog(); + ui::importantText("Clyne is quite satisfied."); + ui::waitForDialog(); callee->alive = false; } diff --git a/src/ui.cpp b/src/ui.cpp index 6fa2770..f843e7d 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -52,6 +52,8 @@ static bool typeOutDone = true; static bool dialogImportant = false; +Mix_Chunk *dialogClick; + extern void mainLoop(void); /* @@ -111,6 +113,8 @@ namespace ui { #ifdef DEBUG DEBUG_printf("Initialized FreeType2.\n",NULL); #endif // DEBUG + dialogClick = Mix_LoadWAV("assets/click.wav"); + Mix_Volume(1,50); } /* @@ -516,6 +520,11 @@ namespace ui { } setFontColor(255,255,255); } + + if(strcmp(rtext,dialogBoxText)){ + Mix_PlayChannel(1,dialogClick,0); + } + }else if(!dialogImportant){ vec2 hub = { diff --git a/src/world.cpp b/src/world.cpp index 2bceba5..f751287 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -299,7 +299,7 @@ static Mix_Music *bgmC; void World::bgmPlay(void){ if(bgmObj && bgmC != bgmObj){ - Mix_VolumeMusic(15); + Mix_VolumeMusic(50); Mix_PlayMusic(bgmObj,-1); // Loop infinitely bgmC = bgmObj; } -- 2.39.5