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

Merge branch 'master' of https://github.com/ZedThree/OpenRCT2 into ZedThree-master

This commit is contained in:
IntelOrca 2014-04-27 20:09:35 +01:00
parent edba77dd9d 746000f0cd
commit cdd65dbcee
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/news_item.c
View File

@ -165,7 +165,9 @@ static int news_item_get_new_history_slot()
}
/**
*
* Get the (x,y,z) coordinates of the subject of a news item.
* If the new item is no longer valid, return 0x8000 in the x-coordinate
*
* rct2: 0x0066BA74
*/
void news_item_get_subject_location(int type, int subject, int *x, int *y, int *z)

2
src/news_item.h
View File

@ -56,5 +56,5 @@ typedef struct {
void news_item_init_queue();
void news_item_update_current();
void news_item_close_current();
void news_item_get_subject_location(int type, int subject, int *x, int *y, int *z);
#endif

23
src/window_game_bottom_toolbar.c
View File

@ -179,15 +179,16 @@ static void window_game_bottom_toolbar_mouseup()
break;
{
uint32 eax, ebx, ecx, edx, esi, edi, ebp;
ecx = newsItem->assoc;
edx = newsItem->type;
RCT2_CALLFUNC_X(0x0066BA74, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
if ((eax & 0xFFFF) == 0x8000)
int x, y, z;
int subject = newsItem->assoc;
news_item_get_subject_location(newsItem->type, subject, &x, &y, &z);
if (x == 0x8000)
break;
if ((mainWindow = window_get_main()) != NULL)
window_scroll_to_location(mainWindow, eax & 0xFFFF, ecx & 0xFFFF, edx & 0xFFFF);
window_scroll_to_location(mainWindow, x, y, z);
}
break;
case WIDX_RIGHT_OUTSET:
@ -278,12 +279,12 @@ static void window_game_bottom_toolbar_invalidate()
w->disabled_widgets &= ~(1 << WIDX_NEWS_SUBJECT);
w->disabled_widgets &= ~(1 << WIDX_NEWS_LOCATE);
int eax, ebx, ecx, edx, esi, edi, ebp;
ecx = newsItem->assoc;
edx = newsItem->type;
RCT2_CALLFUNC_X(0x0066BA74, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
// Find out if the news item is no longer valid
int x, y, z;
int subject = newsItem->assoc;
news_item_get_subject_location(newsItem->type, subject, &x, &y, &z);
if ((eax & 0xFFFF) == 0x8000)
if (x == 0x8000)
w->disabled_widgets |= (1 << WIDX_NEWS_LOCATE);
if (!(((char*)0x0097BE7C)[newsItem->type] & 2)) {