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

Changed staff modes to enum

Browse Source
This commit is contained in:
King_Hual
2014-09-15 21:47:54 +03:00
parent 52232ed819
commit ec9177123c
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/addresses.h
View File

@@ -423,11 +423,7 @@
#define RCT2_ADDRESS_COMMON_FORMAT_ARGS 0x013CE952
#define RCT2_ADDRESS_STAFF_MODE_ARRAY 0x013CA672
#define RCT2_STAFF_MODE_NONE 0
#define RCT2_STAFF_MODE_NORMAL 1
#define RCT2_STAFF_MODE_PATROL 3
#define RCT2_ADDRESS_STAFF_MODE_ARRAY 0x013CA672
static void RCT2_CALLPROC_EBPSAFE(int address)
{

4
src/editor.c
View File

@@ -183,10 +183,10 @@ static void set_all_land_owned()
*/
void sub_6BD3A4() {
for (short i = 0; i < 200; i++) {
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = RCT2_STAFF_MODE_NONE;
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = STAFF_MODE_NONE;
}
for (short i = 200; i < 204; i++) {
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = RCT2_STAFF_MODE_NORMAL;
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = STAFF_MODE_WALK;
}
//RCT2_CALLPROC_EBPSAFE(0x006C0C3F);
sub_6C0C3F();

2
src/staff.c
View File

@@ -222,7 +222,7 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx,
newPeep->staff_id = newStaffId;
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[newStaffId] = RCT2_STAFF_MODE_NORMAL;
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[newStaffId] = STAFF_MODE_WALK;
for (int edi = 0; edi < 0x80; edi++) {
int addr = 0x013B0E72 + (newStaffId << 9) + edi * 4;

6
src/staff.h
View File

@@ -26,6 +26,12 @@
#define STAFF_MAX_COUNT 0xC8
#define STAFF_TYPE_COUNT 0x04
enum STAFF_MODE {
STAFF_MODE_NONE,
STAFF_MODE_WALK,
STAFF_MODE_PATROL = 3
};
enum STAFF_TYPE {
STAFF_TYPE_HANDYMAN,
STAFF_TYPE_MECHANIC,