mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-14 19:42:38 +01:00
Code Issues Releases Wiki Activity

Merge pull request #5295 from janisozaur/fix-staff-hiring

Browse Source 
Fix staff hiring check
This commit is contained in:
Ted John
2017-06-06 08:24:41 +01:00
committed by GitHub
parent cd330ede53 12f0c2d660
commit c95dbf4b2f
2 changed files with 124 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/network/network.h
View File

@@ -56,7 +56,7 @@ extern "C" {
// This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "7"
#define NETWORK_STREAM_VERSION "8"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus

3
src/openrct2/peep/staff.c
View File

@@ -214,6 +214,8 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16
return MONEY32_UNDEFINED;
}
if (!(flags & GAME_COMMAND_FLAG_APPLY))
{
sint32 newStaffId = i;
const rct_sprite_bounds *spriteBounds;
rct_peep *newPeep = &(create_sprite(flags)->peep);
@@ -350,6 +352,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16
}
*newPeep_sprite_index = newPeep->sprite_index;
}
return 0;
}