diff options
| author | frosch <frosch@openttd.org> | 2012-05-26 14:15:46 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-05-26 14:15:46 +0000 |
| commit | c796801c4d6c87c554e84312b1c3afd866e0e49c (patch) | |
| tree | 591a8966fdacb5f7025b7fe0fb2f4b7094e30dbe /src/news_gui.cpp | |
| parent | 806e5f33d4daa7d571af580b6f8bf5897e7a5b0b (diff) | |
| download | openttd-c796801c4d6c87c554e84312b1c3afd866e0e49c.tar.xz | |
(svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same.
Diffstat (limited to 'src/news_gui.cpp')
| -rw-r--r-- | src/news_gui.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 4b3bdf175..d7d9fc702 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -218,10 +218,7 @@ static const NewsSubtypeData _news_subtype_data[] = { { NT_ARRIVAL_COMPANY, (NF_NO_TRANSPARENT | NF_SHADE), &_thin_news_desc }, ///< NS_ARRIVAL_COMPANY { NT_ARRIVAL_OTHER, (NF_NO_TRANSPARENT | NF_SHADE), &_thin_news_desc }, ///< NS_ARRIVAL_OTHER { NT_ACCIDENT, (NF_NO_TRANSPARENT | NF_SHADE), &_thin_news_desc }, ///< NS_ACCIDENT - { NT_COMPANY_INFO, NF_NONE, &_company_news_desc }, ///< NS_COMPANY_TROUBLE - { NT_COMPANY_INFO, NF_NONE, &_company_news_desc }, ///< NS_COMPANY_MERGER - { NT_COMPANY_INFO, NF_NONE, &_company_news_desc }, ///< NS_COMPANY_BANKRUPT - { NT_COMPANY_INFO, NF_NONE, &_company_news_desc }, ///< NS_COMPANY_NEW + { NT_COMPANY_INFO, NF_NONE, &_company_news_desc }, ///< NS_COMPANY_INFO { NT_INDUSTRY_OPEN, (NF_NO_TRANSPARENT | NF_SHADE), &_thin_news_desc }, ///< NS_INDUSTRY_OPEN { NT_INDUSTRY_CLOSE, (NF_NO_TRANSPARENT | NF_SHADE), &_thin_news_desc }, ///< NS_INDUSTRY_CLOSE { NT_ECONOMY, NF_NONE, &_normal_news_desc }, ///< NS_ECONOMY @@ -734,10 +731,7 @@ CommandCost CmdCustomNewsItem(TileIndex tile, DoCommandFlag flags, uint32 p1, ui switch (subtype) { /* These sub types require more parameters that are never passed. */ - case NS_COMPANY_TROUBLE: - case NS_COMPANY_MERGER: - case NS_COMPANY_BANKRUPT: - case NS_COMPANY_NEW: + case NS_COMPANY_INFO: return CMD_ERROR; /* This one only accepts engines. */ |