From 16b7fdea0cdeff4d61ecf089cd3bcc0b665f421b Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Sun, 13 Feb 2011 18:41:38 +0000 Subject: [PATCH] Remove some dead title screen code. Ivanovic spotted it while evaluting the small gui code. --- data/game_config.cfg | 20 -------------------- src/game_config.cpp | 10 ---------- src/game_config.hpp | 2 -- 3 files changed, 32 deletions(-) diff --git a/data/game_config.cfg b/data/game_config.cfg index 58d4106ffbc..b891df892a0 100644 --- a/data/game_config.cfg +++ b/data/game_config.cfg @@ -25,26 +25,6 @@ default_victory_music="victory.ogg,victory2.ogg" default_defeat_music="defeat.ogg,defeat2.ogg" -#ifdef SMALL_GUI - buttons_x=760 - buttons_y=210 - buttons_padding=20 - logo_x=305 - logo_y=120 - tip_x=30 - tip_width=620 - tip_padding=20 -#else - buttons_x=760 - buttons_y=330 - buttons_padding=20 - logo_x=512 - logo_y=220 - tip_x=100 - tip_width=495 - tip_padding=20 -#endif - lobby_refresh=1000 hp_bar_scaling=0.6 diff --git a/src/game_config.cpp b/src/game_config.cpp index 6f7b1c2f8f5..22aa32aded1 100644 --- a/src/game_config.cpp +++ b/src/game_config.cpp @@ -217,16 +217,6 @@ namespace game_config foot_teleport_enter = v["footprint_teleport_enter"].str(); foot_teleport_exit = v["footprint_teleport_exit"].str(); - title_logo_x = v["logo_x"]; - title_logo_y = v["logo_y"]; - title_buttons_x = v["buttons_x"]; - title_buttons_y = v["buttons_y"]; - title_buttons_padding = v["buttons_padding"]; - - title_tip_x = v["tip_x"].to_int(); - title_tip_width = v["tip_width"].to_int(); - title_tip_padding = v["tip_padding"].to_int(); - shroud_prefix = v["shroud_prefix"].str(); fog_prefix = v["fog_prefix"].str(); diff --git a/src/game_config.hpp b/src/game_config.hpp index 13bcceba626..2b4b8148400 100644 --- a/src/game_config.hpp +++ b/src/game_config.hpp @@ -116,8 +116,6 @@ namespace game_config extern std::vector foot_speed_prefix; extern std::string foot_teleport_enter, foot_teleport_exit; - extern int title_logo_x, title_logo_y, title_buttons_x, title_buttons_y, title_buttons_padding, title_tip_x, title_tip_width, title_tip_padding; - extern std::map team_rgb_range; extern std::map team_rgb_name; extern std::map > team_rgb_colors;