From 5d6c0a82204cc3ba04fe7a340260f59d10da29fa Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 11 Nov 2004 23:23:42 +0000 Subject: [PATCH] (svn r543) -Fix: [ 1064742 ] Editor Map-Menu wrong String The fix is a bit ugly, but this is due to limitations in the dropdown menu handling (the strings have to be contiguous) --- lang/english.txt | 2 +- main_gui.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lang/english.txt b/lang/english.txt index 6883ef23a1..91f246f384 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -765,13 +765,13 @@ STR_02DC_DISPLAY_SUBSIDIES :{BLACK}Display subsidies STR_02DD_SUBSIDIES :Subsidies STR_02DE_MAP_OF_WORLD :Map of world STR_EXTRA_VIEW_PORT :Extra viewport +STR_02DF_TOWN_DIRECTORY :Town directory STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA16} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copy to viewport STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copy the location of the global view to this viewport STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Paste from viewport STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Paste the location of this viewport to the global view -STR_02DF_TOWN_DIRECTORY :Town directory STR_02E0_CURRENCY_UNITS :{BLACK}Currency units STR_02E1 :{BLACK}{SKIP}{STRING} STR_02E2_CURRENCY_UNITS_SELECTION :{BLACK}Currency units selection diff --git a/main_gui.c b/main_gui.c index 3f927aa3a9..b53947dfd8 100644 --- a/main_gui.c +++ b/main_gui.c @@ -172,7 +172,8 @@ void MenuClickScenMap(int index) { switch(index) { case 0: ShowSmallMap(); break; - case 1: ShowTownDirectory(); break; + case 1: ShowExtraViewPortWindow(); break; + case 2: ShowTownDirectory(); break; } } @@ -884,7 +885,7 @@ static void ToolbarScenDateForward(Window *w) static void ToolbarScenMapTownDir(Window *w) { - PopupMainToolbMenu(w, 0x16A, 8 | (17<<8), STR_02DE_MAP_OF_WORLD, 2); + PopupMainToolbMenu(w, 0x16A, 8 | (17<<8), STR_02DE_MAP_OF_WORLD, 3); } static void ToolbarScenZoomIn(Window *w)