From 95f6378e62cc6a7f25305d6f2317ad25d459f9c0 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Sun, 27 Nov 2016 17:13:13 -0500 Subject: [PATCH] dialog clicks are back baybee --- assets/sounds/click.wav | Bin 17684 -> 17684 bytes include/events.hpp | 2 +- include/ui.hpp | 1 + src/config.cpp | 5 ++--- src/engine.cpp | 1 + src/ui.cpp | 11 +++++++---- src/window.cpp | 4 ++-- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/assets/sounds/click.wav b/assets/sounds/click.wav index 976fb42fab64abb528361a39e21193741ab7787f..bdcedba45654eb216689c515bff83339e1e8e602 100644 GIT binary patch literal 17684 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 CN(evz literal 17684 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 * (VOLUME_MASTER / 100))); + Mix_VolumeMusic(static_cast(VOLUME_MUSIC * (VOLUME_MASTER / 100))); } void save(void) { diff --git a/src/engine.cpp b/src/engine.cpp index 5e8b3e5..8db4689 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -32,6 +32,7 @@ void Engine::init(void) { systems.configure(); + ui::initSounds(); game::config::update(); getSystem()->create(); } diff --git a/src/ui.cpp b/src/ui.cpp index 9439e30..ac7a400 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -204,12 +204,14 @@ namespace ui { #ifdef DEBUG DEBUG_printf("Initialized FreeType2.\n",NULL); #endif // DEBUG + + fontSize = 0; + } + + void initSounds(void) { dialogClick = Mix_LoadWAV("assets/sounds/click.wav"); battleStart = Mix_LoadWAV("assets/sounds/frig.wav"); sanic = Mix_LoadWAV("assets/sounds/sanic.wav"); - //Mix_Volume(1,50); - - fontSize = 0; } void destroyFonts(void) { @@ -937,7 +939,8 @@ namespace ui { static unsigned int rtext_oldsize = 0; if (rtext_oldsize != rtext.size()) { if (!isspace(rtext[(rtext_oldsize = rtext.size()) - 1])) - Mix_PlayChannel(1, dialogClick, 0); + Mix_PlayChannel(0, dialogClick, 0); + } } else { diff --git a/src/window.cpp b/src/window.cpp index f878ec3..29bd7c7 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -74,10 +74,10 @@ void WindowSystem::receive(const WindowResizeEvent &wre) { game::SCREEN_WIDTH = wre.x; game::SCREEN_HEIGHT = wre.y; - + glViewport(0, 0, wre.x, wre.y); SDL_SetWindowSize(window, wre.x, wre.y); -} +} #include -- 2.39.5