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

Restore globals

Browse Source
This commit is contained in:
medsouz
2015-08-16 18:35:47 -04:00
parent 7071bd9353
commit 02e2ebec9a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/peep/staff.c
View File

@@ -29,6 +29,9 @@
#include "peep.h"
#include "staff.h"
uint32 *gStaffPatrolAreas = (uint32*)0x013B0E72;
uint8 *gStaffModes = (uint8*)0x013CA672;
/**
*
* rct2: 0x006BD3A4
@@ -478,5 +481,5 @@ bool staff_is_patrol_area_set(int staffIndex, int x, int y)
int peepOffset = staffIndex * 128;
int offset = (x | y) >> 5;
int bitIndex = (x | y) & 0x1F;
return RCT2_ADDRESS(RCT2_ADDRESS_STAFF_PATROL_AREAS, uint32)[peepOffset + offset] & (1 << bitIndex);
return gStaffPatrolAreas[peepOffset + offset] & (1 << bitIndex);
}

3
src/peep/staff.h
View File

@@ -49,6 +49,9 @@ enum STAFF_ORDERS{
STAFF_ORDERS_FIX_RIDES = (1 << 1)
};
extern uint32 *gStaffPatrolAreas;
extern uint8 *gStaffModes;
void game_command_update_staff_colour(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
void game_command_hire_new_staff_member(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
void game_command_set_staff_order(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);

2
src/windows/staff_list.c
View File

@@ -347,7 +347,7 @@ static void window_staff_list_tooldown(rct_window *w, int widgetIndex, int x, in
continue;
if (isPatrolAreaSet) {
if (!(RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[peep->staff_id] & 2)) {
if (!(gStaffModes[peep->staff_id] & 2)) {
continue;
}
if (!mechanic_is_location_in_patrol(peep, x, y)) {