From 208f0f047d9ed094196ff8162e2302e25aae4d23 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Sun, 15 Feb 2015 19:21:55 +0000 Subject: [PATCH] Changed peep look at watch to eat food --- src/peep/peep.c | 10 +++++----- src/peep/peep.h | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 2d5f3befae..9cfc5d07de 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -680,8 +680,8 @@ static void peep_update_queuing(rct_peep* peep){ if (peep->action < 0xFE)return; if (peep->sprite_type == 0){ if (peep->var_7A >= 2000 && (0xFFFF & scenario_rand()) <= 119){ - // Look at watch - peep->action = PEEP_ACTION_CHECK_WATCH; + // Eat Food/Look at watch + peep->action = PEEP_ACTION_EAT_FOOD; peep->action_frame = 0; peep->var_70 = 0; sub_693B58(peep); @@ -718,8 +718,8 @@ static void peep_update_queuing(rct_peep* peep){ case 0x2D: case 0x2E: case 0x2F: - // Look at watch - peep->action = PEEP_ACTION_CHECK_WATCH; + // Eat food/Look at watch + peep->action = PEEP_ACTION_EAT_FOOD; peep->action_frame = 0; peep->var_70 = 0; sub_693B58(peep); @@ -1042,7 +1042,7 @@ static void peep_update_watching(rct_peep* peep){ else{ if (peep_has_food(peep)){ if ((scenario_rand() & 0xFFFF) <= 1310){ - peep->action = PEEP_ACTION_CHECK_WATCH; + peep->action = PEEP_ACTION_EAT_FOOD; peep->action_frame = 0; peep->var_70 = 0; sub_693B58(peep); diff --git a/src/peep/peep.h b/src/peep/peep.h index 9bdf564f5a..5549e80a6f 100644 --- a/src/peep/peep.h +++ b/src/peep/peep.h @@ -209,7 +209,8 @@ enum PEEP_STATE { }; enum PEEP_ACTION_EVENTS { - PEEP_ACTION_CHECK_WATCH = 1, + // If no food then check watch + PEEP_ACTION_EAT_FOOD = 1, PEEP_ACTION_SHAKE_HEAD = 2, PEEP_ACTION_EMPTY_POCKETS = 3, PEEP_ACTION_SITTING_EAT_FOOD = 4,