mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Result NewsItem when adding to queue.

This commit is contained in:
Matt 2019-01-02 05:03:42 +01:00
parent f868c23077
commit fafd2081e3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/management/NewsItem.cpp
View File

@ -279,17 +279,17 @@ void news_item_get_subject_location(int32_t type, int32_t subject, int32_t* x, i
*
* rct2: 0x0066DF55
*/
void news_item_add_to_queue(uint8_t type, rct_string_id string_id, uint32_t assoc)
NewsItem* news_item_add_to_queue(uint8_t type, rct_string_id string_id, uint32_t assoc)
{
utf8 buffer[256];
void* args = gCommonFormatArgs;
// overflows possible?
format_string(buffer, 256, string_id, args);
news_item_add_to_queue_raw(type, buffer, assoc);
return news_item_add_to_queue_raw(type, buffer, assoc);
}
void news_item_add_to_queue_raw(uint8_t type, const utf8* text, uint32_t assoc)
NewsItem* news_item_add_to_queue_raw(uint8_t type, const utf8* text, uint32_t assoc)
{
NewsItem* newsItem = gNewsItems;
@ -311,10 +311,14 @@ void news_item_add_to_queue_raw(uint8_t type, const utf8* text, uint32_t assoc)
newsItem->Day = ((days_in_month[date_get_month(newsItem->MonthYear)] * gDateMonthTicks) >> 16) + 1;
safe_strcpy(newsItem->Text, text, sizeof(newsItem->Text));
NewsItem* res = newsItem;
// Blatant disregard for what happens on the last element.
// TODO: Change this when we implement the queue ourselves.
newsItem++;
newsItem->Type = NEWS_ITEM_NULL;
return res;
}
/**

4
src/openrct2/management/NewsItem.h
View File

@ -63,8 +63,8 @@ void news_item_close_current();
void news_item_get_subject_location(int32_t type, int32_t subject, int32_t* x, int32_t* y, int32_t* z);
void news_item_add_to_queue(uint8_t type, rct_string_id string_id, uint32_t assoc);
void news_item_add_to_queue_raw(uint8_t type, const utf8* text, uint32_t assoc);
NewsItem* news_item_add_to_queue(uint8_t type, rct_string_id string_id, uint32_t assoc);
NewsItem* news_item_add_to_queue_raw(uint8_t type, const utf8* text, uint32_t assoc);
void news_item_open_subject(int32_t type, int32_t subject);