cpp/openttd-patchpack/source Changeset - r11464:d0a348843230

Changeset - r11464:d0a348843230

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

smatz - 15 years ago 2009-03-23 11:48:05
smatz@openttd.org

(svn r15830) -Codechange: don't use fixed size of array in news_gui.cpp and news_func.h

3 files changed with 10 insertions and 6 deletions:

src/news_func.h

src/news_gui.cpp

src/news_type.h

0 comments (0 inline, 0 general)

src/news_func.h

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ void AddNewsItem(StringID string, NewsSu @@
 void NewsLoop();
 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
  * if the news item type is INVALID_STRING_ID all news about the vehicle get
  * deleted
  */

src/news_gui.cpp

➞

Show inline comments

@@ @@ -101,13 +101,13 @@ struct NewsSubtypeData { @@
 	DrawNewsCallbackProc *callback; ///< Call-back function
 };
 /**
  * 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
 	{ NT_ACCIDENT,         NM_THIN,     NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_ACCIDENT_TILE
 	{ NT_ACCIDENT,         NM_THIN,     NF_VIEWPORT|NF_VEHICLE, NULL                    }, ///< NS_ACCIDENT_VEHICLE
 	{ NT_COMPANY_INFO,     NM_NORMAL,   NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_TROUBLE
@@ @@ -124,16 +124,18 @@ static const struct NewsSubtypeData _new @@
 	{ NT_NEW_VEHICLES,     NM_NORMAL,   NF_NONE,                DrawNewsNewVehicleAvail }, ///< NS_NEW_VEHICLES
 	{ NT_ACCEPTANCE,       NM_SMALL,    NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_ACCEPTANCE
 	{ NT_SUBSIDIES,        NM_NORMAL,   NF_TILE|NF_TILE2,       NULL                    }, ///< NS_SUBSIDIES
 	{ 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
 	{ "accident",          90, SND_BEGIN,       ND_FULL },  ///< NT_ACCIDENT
 	{ "company_info",      60, SND_BEGIN,       ND_FULL },  ///< NT_COMPANY_INFO
 	{ "open",              90, SND_BEGIN,       ND_FULL },  ///< NT_INDUSTRY_OPEN
@@ @@ -146,12 +148,14 @@ NewsTypeData _news_type_data[NT_END] = { @@
 	{ "new_vehicles",      30, SND_1E_OOOOH,    ND_FULL },  ///< NT_NEW_VEHICLES
 	{ "acceptance",        90, SND_BEGIN,       ND_FULL },  ///< NT_ACCEPTANCE
 	{ "subsidies",        180, SND_BEGIN,       ND_FULL },  ///< NT_SUBSIDIES
 	{ "general",           60, SND_BEGIN,       ND_FULL },  ///< NT_GENERAL
 };
 assert_compile(lengthof(_news_type_data) == NT_END);
 struct NewsWindow : Window {
 	uint16 chat_height;
 	NewsItem *ni;
 	static uint duration;
 	NewsWindow(const WindowDesc *desc, NewsItem *ni) : Window(desc), ni(ni)

src/news_type.h

➞

Show inline comments

@@ @@ -92,15 +92,15 @@ enum NewsDisplay { @@
 /**
  * Per-NewsType data
  */
 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 {
 	NewsItem *prev;        ///< Previous news item
 	NewsItem *next;        ///< Next news item
 	StringID string_id;    ///< Message text

0 comments (0 inline, 0 general)