diff --git a/src/config.c b/src/config.c index 2f7fbdc7..9a3dfeb5 100644 --- a/src/config.c +++ b/src/config.c @@ -100,7 +100,6 @@ void config_preset(void) { tconfig.intval[NO_SHADER] = 0; tconfig.intval[NO_AUDIO] = 0; tconfig.intval[NO_MUSIC] = 0; - tconfig.intval[SFX_VOLUME] = 10; tconfig.intval[BGM_VOLUME] = 10; diff --git a/src/main.c b/src/main.c index 2cd8a052..845544ec 100644 --- a/src/main.c +++ b/src/main.c @@ -122,7 +122,7 @@ int main(int argc, char** argv) { MenuData menu; create_main_menu(&menu); - printf("-- menu\n"); + printf("-- menu\n"); set_sfx_volume(tconfig.intval[SFX_VOLUME]); set_bgm_volume(tconfig.intval[BGM_VOLUME]); start_bgm("bgm_menu"); diff --git a/src/resource/bgm.c b/src/resource/bgm.c index 07c4d17d..299dec12 100644 --- a/src/resource/bgm.c +++ b/src/resource/bgm.c @@ -114,7 +114,6 @@ Sound *load_bgm(char *filename, const char *type) { } void start_bgm(char *name) { -printf("::: start_bgm(%s) called.\n", name? name : "NULL"); if(tconfig.intval[NO_MUSIC]) return; if(!name || strcmp(name, "") == 0) @@ -171,7 +170,6 @@ void continue_bgm(void) } void stop_bgm(void) { -printf("::: stop_bgm() called.\n"); if (tconfig.intval[NO_MUSIC] || !current_bgm.name) return; ALint play; diff --git a/src/stage.c b/src/stage.c index 6858978f..99c22907 100644 --- a/src/stage.c +++ b/src/stage.c @@ -295,10 +295,8 @@ void stage_draw(StageInfo *info, StageRule bgdraw, ShaderRule *shaderrules, int page_dialog(&global.dialog); } - if (global.dialog) - { + if(global.dialog) draw_dialog(global.dialog); - } draw_stage_title(info); @@ -566,7 +564,7 @@ void draw_title(int t, StageInfo *info, Alignment al, int x, int y, const char * } draw_text(al, x, y, text, font); - + glColor4f(1,1,1,1); glUseProgram(0); } @@ -576,7 +574,7 @@ void draw_stage_title(StageInfo *info) { draw_title(t, info, AL_Center, VIEWPORT_W/2, VIEWPORT_H/2-40, info->title, _fonts.mainmenu); draw_title(t, info, AL_Center, VIEWPORT_W/2, VIEWPORT_H/2, info->subtitle, _fonts.standard); - + if ((current_bgm.title != NULL) && (current_bgm.started_at >= 0)) { draw_title(t - current_bgm.started_at, info, AL_Right, VIEWPORT_W-15, VIEWPORT_H-35, current_bgm.title, _fonts.standard); diff --git a/src/stages/stage2_events.c b/src/stages/stage2_events.c index 1698c54a..cb73c234 100644 --- a/src/stages/stage2_events.c +++ b/src/stages/stage2_events.c @@ -36,7 +36,7 @@ Dialog *stage2_dialog(void) { Dialog *stage2_post_dialog(void) { Dialog *d = create_dialog(global.plr.cha == Marisa ? "dialog/marisa" : "dialog/youmu", NULL); - + dadd_msg(d, Right, "Well, let's go then."); return d; diff --git a/src/stages/stage3.c b/src/stages/stage3.c index e42e218a..08ccc264 100644 --- a/src/stages/stage3.c +++ b/src/stages/stage3.c @@ -114,7 +114,7 @@ void stage3_start(void) { init_stage3d(&bgcontext); start_bgm("bgm_stage3"); - bgcontext.cx[2] = -10; + bgcontext.cx[2] = -10; bgcontext.crot[0] = -95; bgcontext.cv[1] = 20; diff --git a/src/stages/stage4_events.c b/src/stages/stage4_events.c index 35a7f2e9..36bd8ca6 100644 --- a/src/stages/stage4_events.c +++ b/src/stages/stage4_events.c @@ -30,7 +30,7 @@ Dialog *stage4_dialog(void) { dadd_msg(d, Left, "..."); dadd_msg(d, Right, "So stop asking questions!\nSecrets are secret!\n...\nAnd I will beat you now!"); } - + dadd_msg(d, BGM, "bgm_stage4boss"); return d; } diff --git a/src/stages/stage5_events.c b/src/stages/stage5_events.c index 1b4f4e5c..68ef54be 100644 --- a/src/stages/stage5_events.c +++ b/src/stages/stage5_events.c @@ -26,7 +26,7 @@ Dialog *stage5_boss_dialog(void) { dadd_msg(d, Right, "I don't have time for your suspicions now."); dadd_msg(d, Left, "Sounds very suspicious, actually."); dadd_msg(d, Right, "Ok, let's finish this quickly."); - + dadd_msg(d, BGM, "bgm_stage5boss"); return d; }