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

Name some rct(1)_peep fields

This commit is contained in:
Michael Steenbeek 2018-01-09 09:32:21 +01:00
parent 647f085098
commit 857e64590d
6 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2-ui/windows/Guest.cpp
View File

@ -1431,23 +1431,23 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
window_guest_stats_bars_paint(nausea, x, y, w, dpi, ebp);
// Bathroom
// Toilet
y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_GUEST_STAT_TOILET_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
sint32 bathroom = peep->bathroom - 32;
if (bathroom > 210) bathroom = 210;
sint32 toilet = peep->toilet - 32;
if (toilet > 210) toilet = 210;
bathroom -= 32;
if (bathroom < 0) bathroom = 0;
bathroom *= 45;
bathroom /= 32;
toilet -= 32;
if (toilet < 0) toilet = 0;
toilet *= 45;
toilet /= 32;
ebp = COLOUR_BRIGHT_RED;
if (bathroom > 160){
if (toilet > 160){
ebp |= BAR_BLINK;
}
window_guest_stats_bars_paint(bathroom, x, y, w, dpi, ebp);
window_guest_stats_bars_paint(toilet, x, y, w, dpi, ebp);
// Time in park
y += LIST_ROW_HEIGHT + 1;

2
src/openrct2/Cheats.cpp
View File

@ -313,7 +313,7 @@ static void cheat_set_guest_parameter(sint32 parameter, sint32 value)
peep->nausea_tolerance = value;
break;
case GUEST_PARAMETER_BATHROOM:
peep->bathroom = value;
peep->toilet = value;
break;
case GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY:
peep->intensity = (15 << 4) | value;

62
src/openrct2/peep/Peep.cpp
View File

@ -711,7 +711,7 @@ static void peep_update_hunger(rct_peep * peep)
peep->hunger -= 2;
peep->energy_target = Math::Min(peep->energy_target + 2, PEEP_MAX_ENERGY_TARGET);
peep->bathroom = Math::Min(peep->bathroom + 1, 255);
peep->toilet = Math::Min(peep->toilet + 1, 255);
}
}
@ -1005,8 +1005,8 @@ static void sub_68F41A(rct_peep * peep, sint32 index)
if (peep->peep_flags & PEEP_FLAGS_BATHROOM)
{
if (peep->bathroom <= 180)
peep->bathroom += 50;
if (peep->toilet <= 180)
peep->toilet += 50;
}
if (peep->peep_flags & PEEP_FLAGS_HAPPINESS)
@ -1026,10 +1026,10 @@ static void sub_68F41A(rct_peep * peep, sint32 index)
if (peep->state == PEEP_STATE_WALKING || peep->state == PEEP_STATE_SITTING)
{
peep->var_F2++;
if (peep->var_F2 >= 18)
peep->surroundings_thought_timeout++;
if (peep->surroundings_thought_timeout >= 18)
{
peep->var_F2 = 0;
peep->surroundings_thought_timeout = 0;
if (peep->x != LOCATION_NULL)
{
@ -1132,7 +1132,7 @@ static void sub_68F41A(rct_peep * peep, sint32 index)
possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_THIRSTY;
}
if (peep->bathroom >= 160)
if (peep->toilet >= 160)
{
possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_BATHROOM;
}
@ -1209,7 +1209,7 @@ static void sub_68F41A(rct_peep * peep, sint32 index)
if (peep->thirst >= 5)
{
peep->thirst -= 4;
peep->bathroom = Math::Min(255, peep->bathroom + 3);
peep->toilet = Math::Min(255, peep->toilet + 3);
}
if (peep->nausea_target >= 50)
@ -1302,9 +1302,9 @@ static void sub_68F41A(rct_peep * peep, sint32 index)
peep->thirst = Math::Max(peep->thirst - 1, 0);
}
if (peep->bathroom >= 195)
if (peep->toilet >= 195)
{
peep->bathroom--;
peep->toilet--;
}
if (peep->state == PEEP_STATE_WALKING && peep->nausea_target >= 128)
@ -1343,9 +1343,9 @@ static void sub_68F41A(rct_peep * peep, sint32 index)
}
else
{
peep->hunger = Math::Min(peep->hunger + 7, 255);
peep->thirst = Math::Max(peep->thirst - 3, 0);
peep->bathroom = Math::Min(peep->bathroom + 2, 255);
peep->hunger = Math::Min(peep->hunger + 7, 255);
peep->thirst = Math::Max(peep->thirst - 3, 0);
peep->toilet = Math::Min(peep->toilet + 2, 255);
}
if (peep->var_42 == 0)
@ -1972,7 +1972,7 @@ void peep_update_sprite_type(rct_peep * peep)
return;
}
if (peep->bathroom > 220)
if (peep->toilet > 220)
{
set_sprite_type(peep, PEEP_SPRITE_TYPE_REQUIRE_BATHROOM);
return;
@ -3361,7 +3361,7 @@ static void peep_update_ride_sub_state_5(rct_peep * peep)
vehicle->num_peeps++;
ride->cur_num_customers++;
vehicle->mass += seated_peep->var_41;
vehicle->mass += seated_peep->mass;
invalidate_sprite_2((rct_sprite *)seated_peep);
sprite_move(LOCATION_NULL, 0, 0, (rct_sprite *)seated_peep);
@ -3376,7 +3376,7 @@ static void peep_update_ride_sub_state_5(rct_peep * peep)
vehicle->num_peeps++;
ride->cur_num_customers++;
vehicle->mass += peep->var_41;
vehicle->mass += peep->mass;
invalidate_sprite_2((rct_sprite *)vehicle);
invalidate_sprite_2((rct_sprite *)peep);
@ -3422,7 +3422,7 @@ static void peep_update_ride_sub_state_7(rct_peep * peep)
peep->action_sprite_image_offset = 0;
vehicle->num_peeps--;
vehicle->mass -= peep->var_41;
vehicle->mass -= peep->mass;
invalidate_sprite_2((rct_sprite *)vehicle);
if (ride_station >= MAX_STATIONS)
@ -4457,9 +4457,9 @@ static void peep_update_ride_sub_state_20(rct_peep * peep)
return;
}
if (peep->bathroom != 0)
if (peep->toilet != 0)
{
peep->bathroom--;
peep->toilet--;
return;
}
@ -6539,15 +6539,15 @@ static void peep_update_heading_to_inspect(rct_peep * peep)
if (peep->sub_state == 0)
{
peep->var_74 = 0;
peep->mechanic_time_since_call = 0;
peep_reset_pathfind_goal(peep);
peep->sub_state = 2;
}
if (peep->sub_state <= 3)
{
peep->var_74++;
if (peep->var_74 > 2500)
peep->mechanic_time_since_call++;
if (peep->mechanic_time_since_call > 2500)
{
if (ride->lifecycle_flags & RIDE_LIFECYCLE_DUE_INSPECTION && ride->mechanic_status == RIDE_MECHANIC_STATUS_HEADING)
{
@ -6664,7 +6664,7 @@ static void peep_update_answering(rct_peep * peep)
{
peep->sub_state = 2;
peep_window_state_update(peep);
peep->var_74 = 0;
peep->mechanic_time_since_call = 0;
peep_reset_pathfind_goal(peep);
return;
}
@ -6674,8 +6674,8 @@ static void peep_update_answering(rct_peep * peep)
}
else if (peep->sub_state <= 3)
{
peep->var_74++;
if (peep->var_74 > 2500)
peep->mechanic_time_since_call++;
if (peep->mechanic_time_since_call > 2500)
{
ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
@ -7230,7 +7230,7 @@ static void peep_update_walking(rct_peep * peep)
if (peep->happiness < 120)
return;
if (peep->bathroom > 140)
if (peep->toilet > 140)
return;
uint16 chance = peep_has_food(peep) ? 13107 : 2849;
@ -7943,7 +7943,7 @@ rct_peep * peep_generate(sint32 x, sint32 y, sint32 z)
sprite_move(x, y, z, (rct_sprite *)peep);
invalidate_sprite_2((rct_sprite *)peep);
peep->var_41 = (peep_rand() & 0x1F) + 45;
peep->mass = (peep_rand() & 0x1F) + 45;
peep->var_C4 = 0;
peep->interaction_ride_index = 0xFF;
peep->type = PEEP_TYPE_GUEST;
@ -8013,7 +8013,7 @@ rct_peep * peep_generate(sint32 x, sint32 y, sint32 z)
/* Adjust by the delta, clamping at min=0 and max=255. */
peep->thirst = Math::Clamp(0, peep->thirst + thirst_delta, 0xFF);
peep->bathroom = 0;
peep->toilet = 0;
peep->var_42 = 0;
memset(&peep->rides_been_on, 0, 32);
@ -8062,7 +8062,7 @@ rct_peep * peep_generate(sint32 x, sint32 y, sint32 z)
peep->no_of_food = 0;
peep->no_of_drinks = 0;
peep->no_of_souvenirs = 0;
peep->var_F2 = 0;
peep->surroundings_thought_timeout = 0;
peep->angriness = 0;
peep->var_F4 = 0;
@ -13411,7 +13411,7 @@ static bool peep_should_go_to_shop(rct_peep * peep, sint32 rideIndex, bool peepA
if (ride->type == RIDE_TYPE_TOILETS)
{
if (peep->bathroom < 70)
if (peep->toilet < 70)
{
peep_chose_not_to_go_on_ride(peep, rideIndex, peepAtShop, true);
return false;
@ -13419,7 +13419,7 @@ static bool peep_should_go_to_shop(rct_peep * peep, sint32 rideIndex, bool peepA
// The amount that peeps are willing to pay to use the Toilets scales with their bathroom stat.
// It effectively has a minimum of $0.10 (due to the check above) and a maximum of $0.60.
if (ride->price * 40 > peep->bathroom)
if (ride->price * 40 > peep->toilet)
{
if (peepAtShop)
{

10
src/openrct2/peep/Peep.h
View File

@ -530,8 +530,8 @@ typedef struct rct_peep
uint8 nausea_target; // 0x3D
uint8 hunger; // 0x3E
uint8 thirst; // 0x3F
uint8 bathroom; // 0x40
uint8 var_41;
uint8 toilet; // 0x40
uint8 mass;
uint8 var_42;
uint8 intensity; // 0x43 The max intensity is stored in the first 4 bits, and the min intensity in the second 4 bits
uint8 nausea_tolerance; // 0x44
@ -570,7 +570,7 @@ typedef struct rct_peep
uint8 action_frame; // 0x72
uint8 var_73;
union {
uint16 var_74; // time getting to ride to fix
uint16 mechanic_time_since_call; // time getting to ride to fix
uint16 next_in_queue; // 0x74
};
uint8 var_76;
@ -638,8 +638,8 @@ typedef struct rct_peep
uint8 var_EF;
uint8 voucher_type; // 0xF0
uint8 voucher_arguments; // 0xF1 ride_id or string_offset_id
uint8 var_F2;
uint8 angriness;
uint8 surroundings_thought_timeout; // 0xF2
uint8 angriness; // 0xF3
uint8 var_F4;
uint8 days_in_queue; // 0xF5
uint8 balloon_colour; // 0xF6

10
src/openrct2/rct1.h
View File

@ -415,8 +415,8 @@ typedef struct rct1_peep {
uint8 nausea_target; // 0x3D
uint8 hunger; // 0x3E
uint8 thirst; // 0x3F
uint8 bathroom; // 0x40
uint8 var_41;
uint8 toilet; // 0x40
uint8 mass; // 0x41
uint8 var_42;
uint8 intensity; // 0x43 The max intensity is stored in the first 4 bits, and the min intensity in the second 4 bits
uint8 nausea_tolerance; // 0x44
@ -452,7 +452,7 @@ typedef struct rct1_peep {
uint8 action_frame; // 0x72
uint8 var_73;
union {
uint16 var_74; // time getting to ride to fix
uint16 mechanic_time_since_call; // time getting to ride to fix
uint16 next_in_queue; // 0x74
};
uint8 var_76;
@ -506,8 +506,8 @@ typedef struct rct1_peep {
uint8 var_EF;
uint8 voucher_type; // 0xF0
uint8 voucher_arguments; // 0xF1 ride_id or string_offset_id
uint8 var_F2;
uint8 var_F3;
uint8 surroundings_thought_timeout; // 0xF2
uint8 angriness; // 0xF3
uint8 var_F4;
uint8 days_in_queue; // 0xF5
uint8 balloon_colour; // 0xF6

8
src/openrct2/rct1/S4Importer.cpp
View File

@ -1416,8 +1416,8 @@ private:
dst->nausea_target = src->nausea_target;
dst->hunger = src->hunger;
dst->thirst = src->thirst;
dst->bathroom = src->bathroom;
dst->var_41 = src->var_41;
dst->toilet = src->toilet;
dst->mass = src->mass;
dst->litter_count = src->litter_count;
dst->disgusting_count = src->disgusting_count;
@ -1457,6 +1457,10 @@ private:
dst->voucher_arguments = src->voucher_arguments;
dst->voucher_type = src->voucher_type;
dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->angriness = src->angriness;
dst->var_F4 = src->var_F4;
for (size_t i = 0; i < 32; i++)
{
dst->rides_been_on[i] = src->rides_been_on[i];