From d0c79e1164b912644bc0260910bffd88cf2d0cf5 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 13 May 2008 10:17:04 +0000 Subject: (svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan. --- src/news_type.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/news_type.h') diff --git a/src/news_type.h b/src/news_type.h index aa220a83f..cc25835c7 100644 --- a/src/news_type.h +++ b/src/news_type.h @@ -97,7 +97,7 @@ struct NewsTypeData { }; struct NewsItem { - StringID string_id; ///< Message text (sometimes also used for storing other info) + StringID string_id; ///< Message text uint16 duration; ///< Remaining time for showing this news message Date date; ///< Date of the news NewsFlag flags; ///< NewsFlags bits @see NewsFlag @@ -105,14 +105,13 @@ struct NewsItem { NewsType type; ///< News category @see NewsType NewsCallback callback; ///< Call-back function - uint data_a; ///< Reference to tile or vehicle - uint data_b; ///< Reference to second tile or vehicle + uint data_a; ///< Custom data 1 (usually tile or vehicle) + uint data_b; ///< Custom data 2 uint64 params[10]; }; typedef bool ValidationProc(uint data_a, uint data_b); typedef void DrawNewsCallbackProc(Window *w, const NewsItem *ni); -typedef StringID GetNewsStringCallbackProc(const NewsItem *ni); #endif /* NEWS_TYPE_H */ -- cgit v1.2.3-54-g00ecf