From 59ef4ac0e38d6780bfab9495659240fd166ce35c Mon Sep 17 00:00:00 2001
From: Duncan Frost <duncans_pumpkin@hotmail.co.uk>
Date: Wed, 12 Nov 2014 19:09:17 +0000
Subject: [PATCH] Added peep_actions set var_71 to these values

---
 src/peep/peep.c | 24 ++++++++++++------------
 src/peep/peep.h | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index 563726de22..8bb9b1847a 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -169,7 +169,7 @@ int sub_6939EB(sint16* x, sint16* y, rct_peep* peep){
 		return 1;
 	}
 	peep->var_70 = ebx;
-	if (peep->var_71 != 8 || peep->var_72 != 15){
+	if (peep->var_71 != PEEP_ACTION_THROW_UP || peep->var_72 != 15){
 		invalidate_sprite((rct_sprite*)peep);
 		*x = peep->x;
 		*y = peep->y;
@@ -264,12 +264,12 @@ void peep_remove(rct_peep* peep){
  * Falling and its subset drowning
  */
 void peep_update_falling(rct_peep* peep){
-	if (peep->var_71 == 11){
+	if (peep->var_71 == PEEP_ACTION_DROWNING){
 		// Check to see if we are ready to drown.
 		sint16 x, y;
 		sub_6939EB(&x, &y, peep);
 		//RCT2_CALLPROC_X(0x6939EB, 0, 0, 0, 0, (int)peep, 0, 0);
-		if (peep->var_71 == 11) return;
+		if (peep->var_71 == PEEP_ACTION_DROWNING) return;
 		if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & 0x80000)){
 			RCT2_GLOBAL(0x13CE952, uint16) = peep->name_string_idx;
 			RCT2_GLOBAL(0x13CE954, uint32) = peep->id;
@@ -325,7 +325,7 @@ void peep_update_falling(rct_peep* peep){
 
 					peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_DROWNING, -1);
 
-					peep->var_71 = 11;
+					peep->var_71 = PEEP_ACTION_DROWNING;
 					peep->var_72 = 0;
 					peep->var_70 = 0;
 
@@ -462,7 +462,7 @@ void peep_update_sitting(rct_peep* peep){
 				peep_try_get_up_from_sitting(peep);
 				return;
 			}
-			peep->var_71 = 4;
+			peep->var_71 = PEEP_ACTION_SITTING_EAT_FOOD;
 			peep->var_72 = 0;
 			peep->var_70 = 0;
 			RCT2_CALLPROC_X(0x693B58, 0, 0, 0, 0, (int)peep, 0, 0);
@@ -480,13 +480,13 @@ void peep_update_sitting(rct_peep* peep){
 			return;
 		}
 
-		peep->var_71 = 5;
+		peep->var_71 = PEEP_ACTION_SITTING_LOOK_AROUND_LEFT;
 		if (rand & 0x80000000){
-			peep->var_71 = 6;
+			peep->var_71 = PEEP_ACTION_SITTING_LOOK_AROUND_RIGHT;
 		}
 
 		if (rand & 0x40000000){
-			peep->var_71 = 4;
+			peep->var_71 = PEEP_ACTION_SITTING_CHECK_WATCH;
 		}
 		peep->var_72 = 0;
 		peep->var_70 = 0;
@@ -537,7 +537,7 @@ void peep_update_queuing(rct_peep* peep){
 	if (peep->sprite_type == 0){
 		if (peep->var_7A >= 2000 && (0xFFFF & scenario_rand()) <= 119){
 			// Look at watch
-			peep->var_71 = 1;
+			peep->var_71 = PEEP_ACTION_CHECK_WATCH;
 			peep->var_72 = 0;
 			peep->var_70 = 0;
 			RCT2_CALLPROC_X(0x693B58, 0, 0, 0, 0, (int)peep, 0, 0);
@@ -575,7 +575,7 @@ void peep_update_queuing(rct_peep* peep){
 			case 0x2E:
 			case 0x2F:
 				// Look at watch
-				peep->var_71 = 1;
+				peep->var_71 = PEEP_ACTION_CHECK_WATCH;
 				peep->var_72 = 0;
 				peep->var_70 = 0;
 				RCT2_CALLPROC_X(0x693B58, 0, 0, 0, 0, (int)peep, 0, 0);
@@ -1044,7 +1044,7 @@ void peep_applause()
 
 		// Clap
 		if ((peep->state == PEEP_STATE_WALKING || peep->state == PEEP_STATE_QUEUING) && peep->var_71 >= 254) {
-			peep->var_71 = 26;
+			peep->var_71 = PEEP_ACTION_CLAP;
 			peep->var_72 = 0;
 			peep->var_70 = 0;
 			RCT2_CALLPROC_X(0x00693B58, 0, 0, 0, 0, (int)peep, 0, 0);
@@ -1082,7 +1082,7 @@ void get_arguments_from_action(rct_peep* peep, uint32 *argument_1, uint32* argum
 
 	switch (peep->state){
 	case PEEP_STATE_FALLING:
-		*argument_1 = peep->var_71 == 0xB ? STR_DROWNING : STR_WALKING;
+		*argument_1 = peep->var_71 == PEEP_ACTION_DROWNING ? STR_DROWNING : STR_WALKING;
 		*argument_2 = 0;
 		break;
 	case PEEP_STATE_1:
diff --git a/src/peep/peep.h b/src/peep/peep.h
index 9f5b63afe8..6c1b56fecf 100644
--- a/src/peep/peep.h
+++ b/src/peep/peep.h
@@ -208,6 +208,29 @@ enum PEEP_STATE {
 	PEEP_STATE_INSPECTING = 23
 };
 
+enum PEEP_ACTION_EVENTS {	
+	PEEP_ACTION_CHECK_WATCH = 1,
+	PEEP_ACTION_SHAKE_HEAD = 2,
+	PEEP_ACTION_EMPTY_POCKETS = 3,	
+	PEEP_ACTION_SITTING_EAT_FOOD = 4,
+	PEEP_ACTION_SITTING_CHECK_WATCH = 4,
+	PEEP_ACTION_SITTING_LOOK_AROUND_LEFT = 5,
+	PEEP_ACTION_SITTING_LOOK_AROUND_RIGHT = 6,	
+	PEEP_ACTION_WOW = 7,
+	PEEP_ACTION_THROW_UP = 8,
+	PEEP_ACTION_JUMP = 9,
+	PEEP_ACTION_STAFF_SWEEP = 10,
+	PEEP_ACTION_DROWNING = 11,
+	PEEP_ACTION_STAFF_ANSWER_CALL = 12,
+	PEEP_ACTION_STAFF_ANSWER_CALL_2 = 13,
+	PEEP_ACTION_STAFF_CHECKBOARD = 14,
+	PEEP_ACTION_STAFF_FIX = 15,
+	PEEP_ACTION_STAFF_FIX_2 = 16,
+	PEEP_ACTION_STAFF_FIX_GROUND = 17,
+
+	PEEP_ACTION_CLAP = 26,
+};
+
 enum PEEP_FLAGS {
 	PEEP_FLAGS_LEAVING_PARK = (1 << 0),
 	PEEP_FLAGS_SLOW_WALK = (1 << 1),