Remove built-in explode guests cheat

data/language/en-GB.txt

@@ -2629,8 +2629,6 @@ STR_5281    :{SMALLFONT}{BLACK}Features
 STR_5282    :RCT1 Ride Open/Close Lights
 STR_5283    :RCT1 Park Open/Close Lights
 STR_5284    :RCT1 Scenario Selection Font
-STR_5285    :EXPLODE!!!
-STR_5286    :{SMALLFONT}{BLACK}Makes some guests explode
 STR_5287    :Ride is already broken down
 STR_5288    :Ride is closed
 STR_5289    :No breakdowns available for this ride

distribution/changelog.txt

@@ -7,6 +7,7 @@
 - Fix: [#13334] Uninitialised variables in CustomTabDesc.
 - Fix: [#13342] Rename tabChange to onTabChange in WindowDesc interface.
 - Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths.
+- Removed: [#13423] Built-in explode guests cheat (replaced by plug-in).
 
 0.3.2 (2020-11-01)
 ------------------------------------------------------------------------

src/openrct2-ui/windows/Cheats.cpp

@@ -126,7 +126,6 @@ enum WINDOW_CHEATS_WIDGET_IDX
     WIDX_GIVE_GUESTS_UMBRELLAS,
     WIDX_TRAM_GUESTS,
     WIDX_REMOVE_ALL_GUESTS,
-    WIDX_EXPLODE_GUESTS,
 
     WIDX_GENERAL_GROUP = WIDX_TAB_CONTENT,
     WIDX_OPEN_CLOSE_PARK,
@@ -252,7 +251,6 @@ static rct_widget window_cheats_guests_widgets[] =
     MakeWidget({127, 384}, CHEAT_BUTTON,  WWT_BUTTON,   WindowColour::Secondary, STR_SHOP_ITEM_PLURAL_UMBRELLA                                   ), // give guests umbrellas
     MakeWidget({ 11, 426}, CHEAT_BUTTON,  WWT_BUTTON,   WindowColour::Secondary, STR_CHEAT_LARGE_TRAM_GUESTS,     STR_CHEAT_LARGE_TRAM_GUESTS_TIP), // large tram
     MakeWidget({127, 426}, CHEAT_BUTTON,  WWT_BUTTON,   WindowColour::Secondary, STR_CHEAT_REMOVE_ALL_GUESTS,     STR_CHEAT_REMOVE_ALL_GUESTS_TIP), // remove all guests
-    MakeWidget({ 11, 447}, CHEAT_BUTTON,  WWT_BUTTON,   WindowColour::Secondary, STR_CHEAT_EXPLODE,               STR_CHEAT_EXPLODE_TIP          ), // explode guests
     { WIDGETS_END },
 };
 
@@ -437,7 +435,6 @@ static uint64_t window_cheats_page_enabled_widgets[] = {
     (1ULL << WIDX_GIVE_GUESTS_UMBRELLAS) |
     (1ULL << WIDX_TRAM_GUESTS) |
     (1ULL << WIDX_REMOVE_ALL_GUESTS) |
-    (1ULL << WIDX_EXPLODE_GUESTS) |
     (1ULL << WIDX_DISABLE_VANDALISM) |
     (1ULL << WIDX_DISABLE_LITTERING),
 
@@ -787,9 +784,6 @@ static void window_cheats_guests_mouseup(rct_window* w, rct_widgetindex widgetIn
         case WIDX_REMOVE_ALL_GUESTS:
             CheatsSet(CheatType::RemoveAllGuests);
             break;
-        case WIDX_EXPLODE_GUESTS:
-            CheatsSet(CheatType::ExplodeGuests);
-            break;
         case WIDX_GIVE_GUESTS_MONEY:
             CheatsSet(CheatType::GiveAllGuests, OBJECT_MONEY);
             break;

src/openrct2/Cheats.cpp

@@ -264,8 +264,6 @@ const char* CheatsGetName(CheatType cheatType)
             return language_get_string(STR_CHEAT_LARGE_TRAM_GUESTS);
         case CheatType::RemoveAllGuests:
             return language_get_string(STR_CHEAT_REMOVE_ALL_GUESTS);
-        case CheatType::ExplodeGuests:
-            return language_get_string(STR_CHEAT_EXPLODE);
         case CheatType::GiveAllGuests:
             return language_get_string(STR_CHEAT_GIVE_ALL_GUESTS);
         case CheatType::SetGrassLength:

src/openrct2/Cheats.h

@@ -59,7 +59,6 @@ enum class CheatType : int32_t
     SetGuestParameter,
     GenerateGuests,
     RemoveAllGuests,
-    ExplodeGuests,
     GiveAllGuests,
     SetGrassLength,
     WaterPlants,

src/openrct2/actions/SetCheatAction.hpp

@@ -164,9 +164,6 @@ public:
             case CheatType::RemoveAllGuests:
                 RemoveAllGuests();
                 break;
-            case CheatType::ExplodeGuests:
-                ExplodeGuests();
-                break;
             case CheatType::GiveAllGuests:
                 GiveObjectToGuests(_param1);
                 break;
@@ -686,17 +683,6 @@ private:
         gfx_invalidate_screen();
     }
 
-    void ExplodeGuests() const
-    {
-        for (auto peep : EntityList<Guest>(EntityListId::Peep))
-        {
-            if (scenario_rand_max(6) == 0)
-            {
-                peep->PeepFlags |= PEEP_FLAGS_EXPLODE;
-            }
-        }
-    }
-
     void SetStaffSpeed(uint8_t value) const
     {
         for (auto peep : EntityList<Staff>(EntityListId::Peep))

src/openrct2/localisation/StringIds.h

@@ -2758,8 +2758,7 @@ enum
     STR_THEMES_OPTION_RCT1_RIDE_CONTROLS = 5282,
     STR_THEMES_OPTION_RCT1_PARK_CONTROLS = 5283,
     STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT = 5284,
-    STR_CHEAT_EXPLODE = 5285,
-    STR_CHEAT_EXPLODE_TIP = 5286,
+
     STR_DEBUG_RIDE_ALREADY_BROKEN = 5287,
     STR_DEBUG_RIDE_IS_CLOSED = 5288,
     STR_DEBUG_NO_BREAKDOWNS_AVAILABLE = 5289,

src/openrct2/network/NetworkBase.cpp

@@ -34,7 +34,7 @@
 // This string 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 "3"
+#define NETWORK_STREAM_VERSION "4"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;