@@ -78,20 +78,11 @@ void DrawNewsNewVehicleAvail(Window *w,
void DrawNewsBankrupcy(Window *w, const NewsItem *ni);
static void MoveToNextItem();
StringID GetNewsStringNewVehicleAvail(const NewsItem *ni);
StringID GetNewsStringBankrupcy(const NewsItem *ni);
static DrawNewsCallbackProc * const _draw_news_callback[] = {
DrawNewsNewVehicleAvail, ///< DNC_VEHICLEAVAIL
DrawNewsBankrupcy, ///< DNC_BANKRUPCY
};
extern GetNewsStringCallbackProc * const _get_news_string_callback[];
GetNewsStringCallbackProc * const _get_news_string_callback[] = {
GetNewsStringNewVehicleAvail, ///< DNC_VEHICLEAVAIL
GetNewsStringBankrupcy, ///< DNC_BANKRUPCY
/** Initialize the news-items data structures */
void InitNewsItemStructs()
{
@@ -607,12 +598,8 @@ static void DrawNewsString(int x, int y,
char buffer[512], buffer2[512];
StringID str;
if (ni->display_mode == NM_CALLBACK) {
str = _get_news_string_callback[ni->callback](ni);
} else {
CopyInDParam(0, ni->params, lengthof(ni->params));
str = ni->string_id;
}
GetString(buffer, str, lastof(buffer));
/* Copy the just gotten string to another buffer to remove any formatting