From 0fa9c232257c2c786779e0840b28adebfccff4cd Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 16 Apr 2005 18:09:24 +0000 Subject: [PATCH] (svn r2209) - CodeChange: [ 1184348 ] Remove unused _newspaper_flag that was supposed to be some ugly hack for chatting (gonewacko) --- gui.h | 1 - lang/english.txt | 1 - main_gui.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gui.h b/gui.h index 03655a5ace..f3f19b613d 100644 --- a/gui.h +++ b/gui.h @@ -142,7 +142,6 @@ void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, void ShowMusicWindow(void); /* main_gui.c */ -VARDEF byte _newspaper_flag; VARDEF byte _construct_mode; VARDEF byte _station_show_coverage; VARDEF PlaceProc *_place_proc; diff --git a/lang/english.txt b/lang/english.txt index 32ee022ba8..6078908f05 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -551,7 +551,6 @@ STR_01FF :{TINYFONT}{BLAC STR_0200_LAST_MESSAGE_NEWS_REPORT :Last message/news report STR_0201_MESSAGE_SETTINGS :Message settings STR_MESSAGE_HISTORY_MENU :Message History -STR_0202_SEND_MESSAGE :Send message STR_0203_SHOW_LAST_MESSAGE_NEWS :{BLACK}Show last message/news report, show message options STR_0204_MESSAGE_OPTIONS :{WHITE}Message Options STR_0205_MESSAGE_TYPES :{BLACK}Message types:- diff --git a/main_gui.c b/main_gui.c index 65def85a86..99864a5fbd 100644 --- a/main_gui.c +++ b/main_gui.c @@ -436,7 +436,6 @@ static void MenuClickNewspaper(int index) case 0: ShowLastNewsMessage(); break; case 1: ShowMessageOptions(); break; case 2: ShowMessageHistory(); break; - case 3: ; /* XXX: chat not done */ } } @@ -976,7 +975,7 @@ static void ToolbarMusicClick(Window *w) static void ToolbarNewspaperClick(Window *w) { - PopupMainToolbMenu(w, 0x1E0, 25, STR_0200_LAST_MESSAGE_NEWS_REPORT, _newspaper_flag != 2 ? 3 : 4); + PopupMainToolbMenu(w, 0x1E0, 25, STR_0200_LAST_MESSAGE_NEWS_REPORT, 3); } static void ToolbarHelpClick(Window *w)