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

Merge pull request #960 from duncanspumpkin/fix_919 

Fix 919 and 909
This commit is contained in:
Ted John 2015-03-25 18:35:01 +00:00
parent 63561f396a b593dfbcd0
commit ee1148eef9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/management/marketing.c
View File

@ -92,8 +92,9 @@ void marketing_update()
// This sets the string parameters for the marketing types that have an argument.
if (campaign == ADVERTISING_CAMPAIGN_RIDE_FREE || campaign == ADVERTISING_CAMPAIGN_RIDE) {
RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x01362942 + 304 * campaignItem, uint16);
RCT2_GLOBAL(0x013CE954, uint32) = RCT2_GLOBAL(0x01362944 + 152 * campaignItem, uint32);
rct_ride* ride = GET_RIDE(campaignItem);
RCT2_GLOBAL(0x013CE952, uint16) = ride->name;
RCT2_GLOBAL(0x013CE954, uint32) = ride->name_arguments;
} else if (campaign == ADVERTISING_CAMPAIGN_FOOD_OR_DRINK_FREE) {
campaignItem += 2016;
if (campaignItem >= 2048)

2
src/windows/new_ride.c
View File

@ -446,7 +446,7 @@ void window_new_ride_focus(ride_list_item rideItem)
ride_list_item *listItem = (ride_list_item*)0x00F43523;
while (listItem->type != RIDE_TYPE_NULL) {
if (listItem->type == rideItem.type && listItem->entry_index == rideItem.type) {
if (listItem->type == rideItem.type && listItem->entry_index == rideItem.entry_index) {
RCT2_GLOBAL(0x00F43825, uint8) = rideItem.type;
RCT2_GLOBAL(0x00F43826, uint8) = rideItem.entry_index;
w->new_ride.highlighted_ride_id = (rideItem.entry_index << 8) | rideItem.type;