Fix consecutive thoughts removal on ride demolish (#6937)

* Fix consecutive thoughts removal on ride demolish

* Update contributors.md

* Update changelog

* Update network version

contributors.md

@@ -98,6 +98,7 @@ The following people are not part of the project team, but have been contributin
 * (telk5093)
 * Ethan Smith (ethanhs) - Refactoring.
 * Robert Lewicki (rlewicki)
+* Tyler Ruckinger (TyPR124)
 
 ## Toolchain
 * (Balletie) - macOS

distribution/changelog.txt

@@ -100,6 +100,7 @@
 - Fix: RCT1 mazes with wooden fences not imported correctly.
 - Fix: Title sequence editor now gracefully fails to preview a title sequence and lets the user know with an error message.
 - Fix: When preset title sequence fails to load, the preset will forcibly be changed to the first sequence to successfully load.
+- Fix: Remove consecutive thoughts about a ride being demolished
 - Improved: [#6186] Transparent menu items now draw properly in OpenGL mode.
 - Improved: [#6218] Speed up game start up time by saving scenario index to file.
 - Improved: [#6423] Polish is now rendered using the sprite font, rather than TTF.

src/openrct2/actions/RideDemolishAction.hpp

@@ -176,6 +176,8 @@ public:
                     // Clear top thought, push others up
                     memmove(&peep->thoughts[i], &peep->thoughts[i + 1], sizeof(rct_peep_thought)*(PEEP_MAX_THOUGHTS - i - 1));
                     peep->thoughts[PEEP_MAX_THOUGHTS - 1].type = PEEP_THOUGHT_TYPE_NONE;
+                    //Next iteration, check the new thought at this index
+                    i--;
                 }
             }
         }

src/openrct2/network/network.h

@@ -51,7 +51,7 @@ typedef struct GameAction GameAction;
 // This define specifies which version of network stream current build uses.
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
-#define NETWORK_STREAM_VERSION "25"
+#define NETWORK_STREAM_VERSION "26"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 #ifdef __cplusplus