From 9478bbd584a41256bf20536e16ef950207343051 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Sun, 13 Dec 2009 23:23:21 +0000 Subject: [PATCH] change some LAYER_GUI to LAYER_HUD, update tinygettext, fix a warning in miniswig SVN-Revision: 6208 --- src/supertux/statistics.cpp | 30 +++++++++++++++--------------- src/trigger/climbable.cpp | 2 +- src/trigger/secretarea_trigger.cpp | 2 +- src/video/gl/gl_renderer.cpp | 2 +- tools/miniswig/parser.yy | 1 + 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/supertux/statistics.cpp b/src/supertux/statistics.cpp index 3dea0f62a..270d71bc1 100644 --- a/src/supertux/statistics.cpp +++ b/src/supertux/statistics.cpp @@ -131,7 +131,7 @@ Statistics::draw_worldmap_info(DrawingContext& context) context.draw_text(Resources::small_font, std::string("- ") + _("Best Level Statistics") + " -", Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, WMAP_INFO_TOP_Y1), - ALIGN_CENTER, LAYER_GUI,Statistics::header_color); + ALIGN_CENTER, LAYER_HUD,Statistics::header_color); std::string caption_buf; std::string stat_buf; @@ -160,8 +160,8 @@ Statistics::draw_worldmap_info(DrawingContext& context) break; } - context.draw_text(Resources::small_font, caption_buf, Vector(WMAP_INFO_LEFT_X, posy), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); - context.draw_text(Resources::small_font, stat_buf, Vector(WMAP_INFO_RIGHT_X, posy), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + context.draw_text(Resources::small_font, caption_buf, Vector(WMAP_INFO_LEFT_X, posy), ALIGN_LEFT, LAYER_HUD, Statistics::header_color); + context.draw_text(Resources::small_font, stat_buf, Vector(WMAP_INFO_RIGHT_X, posy), ALIGN_RIGHT, LAYER_HUD, Statistics::header_color); posy += Resources::small_font->get_height() + 2; } @@ -201,28 +201,28 @@ Statistics::draw_endseq_panel(DrawingContext& context, Statistics* best_stats, S context.push_transform(); context.set_alpha(0.5); - context.draw_surface(backdrop, Vector(bd_x, bd_y), LAYER_GUI); + context.draw_surface(backdrop, Vector(bd_x, bd_y), LAYER_HUD); context.pop_transform(); - context.draw_text(Resources::normal_font, _("You"), Vector(col2_x, row1_y), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); - context.draw_text(Resources::normal_font, _("Best"), Vector(col3_x, row1_y), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); + context.draw_text(Resources::normal_font, _("You"), Vector(col2_x, row1_y), ALIGN_LEFT, LAYER_HUD, Statistics::header_color); + context.draw_text(Resources::normal_font, _("Best"), Vector(col3_x, row1_y), ALIGN_LEFT, LAYER_HUD, Statistics::header_color); - context.draw_text(Resources::normal_font, _("Coins"), Vector(col2_x-16, row3_y), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + context.draw_text(Resources::normal_font, _("Coins"), Vector(col2_x-16, row3_y), ALIGN_RIGHT, LAYER_HUD, Statistics::header_color); int coins_best = (best_stats && (best_stats->coins > coins)) ? best_stats->coins : coins; int total_coins_best = (best_stats && (best_stats->total_coins > total_coins)) ? best_stats->total_coins : total_coins; - context.draw_text(Resources::normal_font, coins_to_string(coins, total_coins), Vector(col2_x, row3_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); - context.draw_text(Resources::normal_font, coins_to_string(coins_best, total_coins_best), Vector(col3_x, row3_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + context.draw_text(Resources::normal_font, coins_to_string(coins, total_coins), Vector(col2_x, row3_y), ALIGN_LEFT, LAYER_HUD, Statistics::text_color); + context.draw_text(Resources::normal_font, coins_to_string(coins_best, total_coins_best), Vector(col3_x, row3_y), ALIGN_LEFT, LAYER_HUD, Statistics::text_color); - context.draw_text(Resources::normal_font, _("Secrets"), Vector(col2_x-16, row4_y), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + context.draw_text(Resources::normal_font, _("Secrets"), Vector(col2_x-16, row4_y), ALIGN_RIGHT, LAYER_HUD, Statistics::header_color); int secrets_best = (best_stats && (best_stats->secrets > secrets)) ? best_stats->secrets : secrets; int total_secrets_best = (best_stats && (best_stats->total_secrets > total_secrets)) ? best_stats->total_secrets : total_secrets; - context.draw_text(Resources::normal_font, secrets_to_string(secrets, total_secrets), Vector(col2_x, row4_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); - context.draw_text(Resources::normal_font, secrets_to_string(secrets_best, total_secrets_best), Vector(col3_x, row4_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + context.draw_text(Resources::normal_font, secrets_to_string(secrets, total_secrets), Vector(col2_x, row4_y), ALIGN_LEFT, LAYER_HUD, Statistics::text_color); + context.draw_text(Resources::normal_font, secrets_to_string(secrets_best, total_secrets_best), Vector(col3_x, row4_y), ALIGN_LEFT, LAYER_HUD, Statistics::text_color); - context.draw_text(Resources::normal_font, _("Time"), Vector(col2_x-16, row2_y), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); + context.draw_text(Resources::normal_font, _("Time"), Vector(col2_x-16, row2_y), ALIGN_RIGHT, LAYER_HUD, Statistics::header_color); float time_best = (best_stats && (best_stats->time < time)) ? best_stats->time : time; - context.draw_text(Resources::normal_font, time_to_string(time), Vector(col2_x, row2_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); - context.draw_text(Resources::normal_font, time_to_string(time_best), Vector(col3_x, row2_y), ALIGN_LEFT, LAYER_GUI, Statistics::text_color); + context.draw_text(Resources::normal_font, time_to_string(time), Vector(col2_x, row2_y), ALIGN_LEFT, LAYER_HUD, Statistics::text_color); + context.draw_text(Resources::normal_font, time_to_string(time_best), Vector(col3_x, row2_y), ALIGN_LEFT, LAYER_HUD, Statistics::text_color); } void diff --git a/src/trigger/climbable.cpp b/src/trigger/climbable.cpp index 5153bae37..b06f177cb 100644 --- a/src/trigger/climbable.cpp +++ b/src/trigger/climbable.cpp @@ -75,7 +75,7 @@ Climbable::draw(DrawingContext& context) context.push_transform(); context.set_translation(Vector(0, 0)); Vector pos = Vector(0, SCREEN_HEIGHT/2 - Resources::normal_font->get_height()/2); - context.draw_center_text(Resources::normal_font, _("Up we go..."), pos, LAYER_GUI, Climbable::text_color); + context.draw_center_text(Resources::normal_font, _("Up we go..."), pos, LAYER_HUD, Climbable::text_color); context.pop_transform(); } } diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp index 8effd45a3..d23348816 100644 --- a/src/trigger/secretarea_trigger.cpp +++ b/src/trigger/secretarea_trigger.cpp @@ -64,7 +64,7 @@ SecretAreaTrigger::draw(DrawingContext& context) context.push_transform(); context.set_translation(Vector(0, 0)); Vector pos = Vector(0, SCREEN_HEIGHT/2 - Resources::normal_font->get_height()/2); - context.draw_center_text(Resources::normal_font, _("You found a secret area!"), pos, LAYER_GUI, SecretAreaTrigger::text_color); + context.draw_center_text(Resources::normal_font, _("You found a secret area!"), pos, LAYER_HUD, SecretAreaTrigger::text_color); context.pop_transform(); } if (message_timer.check()) { diff --git a/src/video/gl/gl_renderer.cpp b/src/video/gl/gl_renderer.cpp index 0b539972e..d9ab2e6df 100644 --- a/src/video/gl/gl_renderer.cpp +++ b/src/video/gl/gl_renderer.cpp @@ -520,7 +520,7 @@ GLRenderer::resize(int w, int h) { // This causes the screen to go black, which is annoying, but seems // unavoidable with SDL at the moment - SDL_SetVideoMode(w, h, 0, SDL_OPENGL /*| SDL_RESIZABLE*/); + SDL_SetVideoMode(w, h, 0, SDL_OPENGL | SDL_RESIZABLE); g_config->window_size = Size(w, h); diff --git a/tools/miniswig/parser.yy b/tools/miniswig/parser.yy index a47ffedbf..e6094763f 100644 --- a/tools/miniswig/parser.yy +++ b/tools/miniswig/parser.yy @@ -442,6 +442,7 @@ namespace_refs: %% +__attribute__((noreturn)) void yyerror(const char* error) { throw ParseError(error); -- 2.11.0