mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ride-window

Browse Source
This commit is contained in:
IntelOrca
2014-09-04 23:27:29 +01:00
parent 914ff60680 2bb4274f05
commit f7a5e82ebb
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ride.c
View File

@@ -448,7 +448,6 @@ void ride_construct_new(int list_item)
//Looks like edi became the ride index after the command.
eax = edi;
rct_window *w;
short widgetIndex;
//TODO: replace with window_ride_main_open(eax)
// window_ride_main_open(eax);

6
src/sprite.c
View File

@@ -114,7 +114,7 @@ rct_sprite *create_sprite(uint8 bl)
{
int ecx = 0xA;
if ((bl & 2 != 0))
if ((bl & 2) != 0)
{
// 69EC96;
uint16 cx = 0x12C - RCT2_GLOBAL(0x13573CE, uint16);
@@ -130,7 +130,7 @@ rct_sprite *create_sprite(uint8 bl)
return NULL;
}
rct_unk_sprite *sprite = &g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)];
rct_unk_sprite *sprite = &(g_sprite_list[RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_NEXT_INDEX, uint16)]).unknown;
RCT2_CALLPROC_X(0x0069ED0B, 0, 0, ecx, 0, (int)sprite, 0, 0);
@@ -147,5 +147,5 @@ rct_sprite *create_sprite(uint8 bl)
sprite->var_02 = RCT2_GLOBAL(0xF3EF60, uint16);
RCT2_GLOBAL(0xF3EF60, uint16) = sprite->sprite_index;
return sprite;
return (rct_sprite*)sprite;
}

4
src/staff.c
View File

@@ -111,10 +111,10 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx,
int newStaffId = i;
int _eax, _ebx, _ecx = _cx, _edx, _edi, _ebp;
int _eax, _ebx, _ecx = _cx, _edx;
_ebx = _bl;
rct_peep* newPeep = create_sprite(_bl);
rct_peep* newPeep = &(create_sprite(_bl)->peep);
if (newPeep == NULL)
{