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

Forgot to save before merge..

This commit is contained in:
Maciek Baron 2014-06-14 15:57:05 +01:00
parent 8a39d9d026
commit 455a1e7b06
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/park.c
View File

@ -544,7 +544,6 @@ void park_update()
park_generate_new_guests();
}
<<<<<<< HEAD
static uint8 calculate_guest_initial_happiness(uint8 percentage) {
if (percentage < 15) {
// There is a minimum of 15% happiness
@ -567,7 +566,8 @@ static uint8 calculate_guest_initial_happiness(uint8 percentage) {
}
}
return 40; // This is the lowest possible value
=======
}
/**
*
* rct2: 0x0066A231
@ -575,5 +575,4 @@ static uint8 calculate_guest_initial_happiness(uint8 percentage) {
void park_update_histories()
{
RCT2_CALLPROC_EBPSAFE(0x0066A231);
>>>>>>> upstream/master
}