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

Started peep find bench

Browse Source
This commit is contained in:
Duncan Frost
2015-01-02 11:31:12 +00:00
parent d55815eec4
commit e11bf44048
1 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/peep/peep.c
View File

@@ -34,6 +34,8 @@
static void peep_update(rct_peep *peep); static void peep_update(rct_peep *peep);
static int peep_has_empty_container(rct_peep* peep); static int peep_has_empty_container(rct_peep* peep);
static int peep_has_food_standard_flag(rct_peep* peep);
static int peep_has_food_extra_flag(rct_peep* peep);
const char *gPeepEasterEggNames[] = { const char *gPeepEasterEggNames[] = {
"MICHAEL SCHUMACHER", "MICHAEL SCHUMACHER",
@@ -1230,6 +1232,22 @@ static void peep_update_walking(rct_peep* peep){
sub_69C308(peep); sub_69C308(peep);
sub_69C26B(peep); sub_69C26B(peep);
sub_69C2D0(peep); sub_69C2D0(peep);
if (!(peep->flags & PEEP_FLAGS_LEAVING_PARK)){
if (peep_has_food(peep)){
if (peep->hunger < 128 || peep->happiness < 128){
//6905C3
}
}
if (peep->nausea > 170 || peep->energy <= 50){
//6905C3
}
//6905c3
if (!(peep->next_var_29 & 0x1C)){
// Find bench??
}
}
//690582 //690582
RCT2_CALLPROC_X(0x0069030A, 0, 0, 0, 0, (int)peep, 0, 0); RCT2_CALLPROC_X(0x0069030A, 0, 0, 0, 0, (int)peep, 0, 0);
} }
@@ -1993,11 +2011,8 @@ int peep_is_mechanic(rct_peep *peep)
); );
} }
/* To simplify check of 0x36BA3E0 and 0x11FF78 static int peep_has_food_standard_flag(rct_peep* peep){
* returns 0 on no food. return peep->item_standard_flags &(
*/
int peep_has_food(rct_peep* peep){
return (peep->item_standard_flags &(
PEEP_ITEM_DRINK | PEEP_ITEM_DRINK |
PEEP_ITEM_BURGER | PEEP_ITEM_BURGER |
PEEP_ITEM_FRIES | PEEP_ITEM_FRIES |
@@ -2011,8 +2026,11 @@ int peep_has_food(rct_peep* peep){
PEEP_ITEM_DONUT | PEEP_ITEM_DONUT |
PEEP_ITEM_COFFEE | PEEP_ITEM_COFFEE |
PEEP_ITEM_CHICKEN | PEEP_ITEM_CHICKEN |
PEEP_ITEM_LEMONADE)) || PEEP_ITEM_LEMONADE);
(peep->item_extra_flags &( }
static int peep_has_food_extra_flag(rct_peep* peep){
return peep->item_extra_flags &(
PEEP_ITEM_PRETZEL | PEEP_ITEM_PRETZEL |
PEEP_ITEM_CHOCOLATE | PEEP_ITEM_CHOCOLATE |
PEEP_ITEM_ICED_TEA | PEEP_ITEM_ICED_TEA |
@@ -2027,7 +2045,15 @@ int peep_has_food(rct_peep* peep){
PEEP_ITEM_SUB_SANDWICH | PEEP_ITEM_SUB_SANDWICH |
PEEP_ITEM_COOKIE | PEEP_ITEM_COOKIE |
PEEP_ITEM_ROAST_SAUSAGE PEEP_ITEM_ROAST_SAUSAGE
)); );
}
/* To simplify check of 0x36BA3E0 and 0x11FF78
* returns 0 on no food.
*/
int peep_has_food(rct_peep* peep){
return peep_has_food_standard_flag(peep) ||
peep_has_food_extra_flag(peep);
} }
static int peep_has_empty_container(rct_peep* peep){ static int peep_has_empty_container(rct_peep* peep){
@@ -2047,6 +2073,25 @@ static int peep_has_empty_container(rct_peep* peep){
)); ));
} }
/* Simplifies 0x690582. Returns 1 if should find bench*/
static int peep_should_find_bench(rct_peep* peep){
if (!(peep->flags & PEEP_FLAGS_LEAVING_PARK)){
if (peep_has_food(peep)){
if (peep->hunger > 128 && peep->happiness > 128){
return 0;
}
}
if (peep->nausea <= 170 || peep->energy > 50){
return 0;
}
if (!(peep->next_var_29 & 0x1C)){
return 1;
}
}
return 0;
}
/** /**
* rct2: 0x699F5A * rct2: 0x699F5A
* al:thought_type * al:thought_type