diff options
| author | smatz <smatz@openttd.org> | 2009-03-23 11:48:05 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-03-23 11:48:05 +0000 |
| commit | c299bac5be4e5c1cd00f6218f7507a78479dcecc (patch) | |
| tree | 3a2f4cbf8f42be535eaf63539c41f5958f7bc827 | |
| parent | c91f965f0831867e9b971c119da11aed6c37077e (diff) | |
| download | openttd-c299bac5be4e5c1cd00f6218f7507a78479dcecc.tar.xz | |
(svn r15830) -Codechange: don't use fixed size of array in news_gui.cpp and news_func.h
| -rw-r--r-- | src/news_func.h | 2 | ||||
| -rw-r--r-- | src/news_gui.cpp | 8 | ||||
| -rw-r--r-- | src/news_type.h | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/news_func.h b/src/news_func.h index 40391fdba..64edf636b 100644 --- a/src/news_func.h +++ b/src/news_func.h @@ -16,7 +16,7 @@ void InitNewsItemStructs(); extern NewsItem _statusbar_news_item; extern bool _news_ticker_sound; -extern NewsTypeData _news_type_data[NT_END]; +extern NewsTypeData _news_type_data[]; /** * Delete a news item type about a vehicle diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 32d03f56b..c35c23fde 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -104,7 +104,7 @@ struct NewsSubtypeData { /** * Data common to all news items of a given subtype (actual data) */ -static const struct NewsSubtypeData _news_subtype_data[NS_END] = { +static const NewsSubtypeData _news_subtype_data[] = { /* type, display_mode, flags, callback */ { NT_ARRIVAL_COMPANY, NM_THIN, NF_VIEWPORT|NF_VEHICLE, NULL }, ///< NS_ARRIVAL_COMPANY { NT_ARRIVAL_OTHER, NM_THIN, NF_VIEWPORT|NF_VEHICLE, NULL }, ///< NS_ARRIVAL_OTHER @@ -127,10 +127,12 @@ static const struct NewsSubtypeData _news_subtype_data[NS_END] = { { NT_GENERAL, NM_NORMAL, NF_TILE, NULL }, ///< NS_GENERAL }; +assert_compile(lengthof(_news_subtype_data) == NS_END); + /** * Per-NewsType data */ -NewsTypeData _news_type_data[NT_END] = { +NewsTypeData _news_type_data[] = { /* name, age, sound, display */ { "arrival_player", 60, SND_1D_APPLAUSE, ND_FULL }, ///< NT_ARRIVAL_COMPANY { "arrival_other", 60, SND_1D_APPLAUSE, ND_FULL }, ///< NT_ARRIVAL_OTHER @@ -149,6 +151,8 @@ NewsTypeData _news_type_data[NT_END] = { { "general", 60, SND_BEGIN, ND_FULL }, ///< NT_GENERAL }; +assert_compile(lengthof(_news_type_data) == NT_END); + struct NewsWindow : Window { uint16 chat_height; NewsItem *ni; diff --git a/src/news_type.h b/src/news_type.h index 60c3b58f3..3697a66e9 100644 --- a/src/news_type.h +++ b/src/news_type.h @@ -95,9 +95,9 @@ enum NewsDisplay { */ struct NewsTypeData { const char * const name; ///< Name - const byte age; ///< Maximum age of news items (in days) - const SoundFx sound; ///< Sound - NewsDisplay display; ///< Display mode (off, summary, full) + const byte age; ///< Maximum age of news items (in days) + const SoundFx sound; ///< Sound + NewsDisplay display; ///< Display mode (off, summary, full) }; struct NewsItem { |