mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Fix #4819. Prevent peep queue loops when next_in_queue broken.

Browse Source
This commit is contained in:
Duncan
2016-12-12 08:33:55 +00:00
committed by Michael Steenbeek
parent 9d43eaf0e0
commit 35472fe6e2
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network.h
View File

@@ -55,7 +55,7 @@ extern "C" {
// This define specifies which version of network stream current build uses. // This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "20" #define NETWORK_STREAM_VERSION "21"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus #ifdef __cplusplus

15
src/peep/peep.c
View File

@@ -4889,7 +4889,20 @@ static void peep_update_queuing(rct_peep* peep){
} }
if (peep->sub_state != 10){ if (peep->sub_state != 10){
if (peep->next_in_queue == 0xFFFF){ bool is_front = true;
if (peep->next_in_queue != 0xFFFF) {
// Fix #4819: Occasionally the peep->next_in_queue is incorrectly set
// to prevent this from causing the peeps to enter a loop
// first check if the next in queue is actually nearby
// if they are not then its safe to assume that this is
// the front of the queue.
rct_peep* next_peep = GET_PEEP(peep->next_in_queue);
if (abs(next_peep->x - peep->x) < 32 &&
abs(next_peep->y - peep->y) < 32) {
is_front = false;
}
}
if (is_front){
//Happens every time peep goes onto ride. //Happens every time peep goes onto ride.
peep->destination_tolerence = 0; peep->destination_tolerence = 0;
peep_decrement_num_riders(peep); peep_decrement_num_riders(peep);