From 1e9d9c1887e73025c1aec9f2c42d4f471a7fd42f Mon Sep 17 00:00:00 2001 From: ZedThree Date: Thu, 1 May 2014 13:23:18 +0200 Subject: [PATCH] Change peep news item enum names --- src/news_item.c | 4 ++-- src/news_item.h | 4 ++-- src/window_game_bottom_toolbar.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/news_item.c b/src/news_item.c index f23bdf7408..bbb0be3386 100644 --- a/src/news_item.c +++ b/src/news_item.c @@ -195,7 +195,7 @@ void news_item_get_subject_location(int type, int subject, int *x, int *y, int * *z = edx; } break; - case NEWS_ITEM_PEEP_1: + case NEWS_ITEM_PEEP_ON_RIDE: sprite = &(RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite)[subject]); *x = sprite->unknown.x; *y = sprite->unknown.y; @@ -225,7 +225,7 @@ void news_item_get_subject_location(int type, int subject, int *x, int *y, int * *y = sprite_2->unknown.y; *z = sprite_2->unknown.z; break; - case NEWS_ITEM_PEEP_2: + case NEWS_ITEM_PEEP: sprite = &(RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite)[subject]); *x = sprite->unknown.x; *y = sprite->unknown.y; diff --git a/src/news_item.h b/src/news_item.h index 547b85e293..be8dd55e42 100644 --- a/src/news_item.h +++ b/src/news_item.h @@ -26,8 +26,8 @@ enum { NEWS_ITEM_NULL, NEWS_ITEM_RIDE, - NEWS_ITEM_PEEP_1, - NEWS_ITEM_PEEP_2, + NEWS_ITEM_PEEP_ON_RIDE, + NEWS_ITEM_PEEP, NEWS_ITEM_MONEY, NEWS_ITEM_BLANK, NEWS_ITEM_SCENERY, diff --git a/src/window_game_bottom_toolbar.c b/src/window_game_bottom_toolbar.c index 721b189ee6..2df493d1da 100644 --- a/src/window_game_bottom_toolbar.c +++ b/src/window_game_bottom_toolbar.c @@ -533,8 +533,8 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rc case NEWS_ITEM_RIDE: gfx_draw_sprite(dpi, SPR_RIDE, x, y); break; - case NEWS_ITEM_PEEP_1: - case NEWS_ITEM_PEEP_2: + case NEWS_ITEM_PEEP_ON_RIDE: + case NEWS_ITEM_PEEP: if (newsItem->flags & 1) break;