From 392815cd0c1affff545100fabec5376bcc62f0b7 Mon Sep 17 00:00:00 2001
From: Duncan Frost <duncans_pumpkin@hotmail.co.uk>
Date: Fri, 10 Apr 2015 08:24:36 +0100
Subject: [PATCH] Added more of waiting_for_passengers

---
 src/peep/peep.c    |  4 +--
 src/ride/ride.h    |  4 ++-
 src/ride/vehicle.c | 89 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index 13e2e32f2e..f6b043963f 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -1690,8 +1690,8 @@ static void peep_update_ride_sub_state_0(rct_peep* peep){
 			}
 		}
 		else{
-			chosen_train = ride->var_066[peep->current_ride_station];
-		}
+			chosen_train = ride->train_at_station[peep->current_ride_station];
+		}	
 		if (chosen_train == 0xFF){
 			return;
 		}
diff --git a/src/ride/ride.h b/src/ride/ride.h
index 285f5a75e3..15c2073702 100644
--- a/src/ride/ride.h
+++ b/src/ride/ride.h
@@ -193,7 +193,9 @@ typedef struct {
 	uint8 station_heights[4];		// 0x05A
 	uint8 station_length[4];		// 0x05E
 	uint8 station_depart[4];		// 0x062
-	uint8 var_066[4];
+	// ride->vehicle index for current train waiting for passengers
+	// at station
+	uint8 train_at_station[4];		// 0x066
 	uint16 entrances[4];			// 0x06A
 	uint16 exits[4];				// 0x072
 	uint16 last_peep_in_queue[4];	// 0x07A
diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c
index 214b712c1b..11f5157d2b 100644
--- a/src/ride/vehicle.c
+++ b/src/ride/vehicle.c
@@ -562,6 +562,7 @@ static int sub_6D6A2C(rct_vehicle* vehicle){
 				vehicle->var_B5 = 255;
 				continue;
 			}
+			vehicle->var_B5 += 20;
 			invalidate_sprite((rct_sprite*)vehicle);
 			ebp++;
 		}
@@ -1153,8 +1154,94 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle){
 	if (vehicle->var_51 == 0){
 		if (sub_6D6A2C(vehicle))
 			return;
-		//0x6d7dc1
+
+		if (ride->entrances[vehicle->current_station] == 0xFFFF){
+			ride->train_at_station[vehicle->current_station] = 0xFF;
+			vehicle->var_51 = 2;
+			return;
+		}
+
+		uint8 train_index = 0;
+		while (ride->vehicles[train_index] != vehicle->sprite_index)train_index++;
+
+		if (ride->train_at_station[vehicle->current_station] != 0xFF)
+			return;
+
+		ride->train_at_station[vehicle->current_station] = train_index;
+		vehicle->var_51 = 1;
+		vehicle->var_C0 = 0;
+
+		invalidate_sprite((rct_sprite*)vehicle);
+		return;
 	}
+	else if (vehicle->var_51 == 1){
+		if (vehicle->var_C0 != 0xFFFF)
+			vehicle->var_C0++;
+
+		vehicle->var_48 &= ~(1 << 4);
+
+		// 0xF64E31, 0xF64E32, 0xF64E33
+		uint8 num_peeps_on_train = 0, num_used_seats_on_train = 0, num_seats_on_train = 0;
+
+		for (uint16 sprite_id = vehicle->sprite_index; sprite_id != 0xFFFF;){
+			rct_vehicle* train_vehicle = GET_VEHICLE(sprite_id);
+
+			num_peeps_on_train += train_vehicle->num_peeps;
+			num_used_seats_on_train += train_vehicle->next_free_seat;
+			num_seats_on_train += train_vehicle->num_seats;
+
+			sprite_id = train_vehicle->next_vehicle_on_train;
+		}
+
+		num_seats_on_train &= 0x7F;
+
+		if (!(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & RIDE_TYPE_FLAG_NO_TEST_MODE)){
+			if (vehicle->var_C0 < 20){
+				//0x6D7FB9
+			}
+		}
+		else{
+			if (num_peeps_on_train == 0){
+				//0x6D7FB9
+			}
+		}
+
+		if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS){
+			if (ride->depart_flags & RIDE_DEPART_WAIT_FOR_MINIMUM_LENGTH){
+				if (ride->min_waiting_time * 32 > vehicle->var_C0){
+					//0x6D7FB9
+				}
+			}
+			if (ride->depart_flags & RIDE_DEPART_WAIT_FOR_MAXIMUM_LENGTH){
+				if (ride->max_waiting_time * 32 < vehicle->var_C0){
+					//***0x6D7FB4
+				}
+			}
+		}
+
+		if (ride->depart_flags & RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES){
+
+			for (int i = 0; i < 32; ++i){
+				uint16 train_id = ride->vehicles[i];
+				if (train_id == 0xFFFF)
+					continue;
+
+				if (train_id == vehicle->sprite_index)
+					continue;
+
+				rct_vehicle* train = GET_VEHICLE(train_id);
+
+				if (train->status == VEHICLE_STATUS_UNLOADING_PASSENGERS ||
+					train->status == VEHICLE_STATUS_MOVING_TO_END_OF_STATION){
+					if (train->current_station == vehicle->current_station){
+						//0x6d7FB4
+					}
+				}
+			}
+		}
+		//0x6d7f49
+	}
+	//0x6d8085
 }
 
 /**