From 451af76fb67c55b8136a16eb80d7e2ee08bb2d8b Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Mon, 11 May 2020 21:31:02 +0200 Subject: [PATCH] Remove nonfunctional "guest is lost" notification (#11722) --- data/language/en-GB.txt | 1 - src/openrct2-ui/windows/NewsOptions.cpp | 1 - src/openrct2/config/Config.cpp | 2 -- src/openrct2/config/Config.h | 1 - src/openrct2/localisation/StringIds.h | 1 - 5 files changed, 6 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 620f07af1c..86691751c6 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2950,7 +2950,6 @@ STR_5595 :Ride has crashed STR_5596 :Ride warnings STR_5597 :Ride / scenery researched STR_5598 :Guest warnings -STR_5599 :Guest is lost STR_5600 :Guest has left the park STR_5601 :Guest is queuing for ride STR_5602 :Guest is on ride diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 1160a92f7e..2d3f7076cb 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -45,7 +45,6 @@ static constexpr const notification_def NewsItemOptionDefinitions[] = { { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_RESEARCHED, offsetof(NotificationConfiguration, ride_researched) }, { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_VEHICLE_STALLED, offsetof(NotificationConfiguration, ride_stalled_vehicles) }, { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_WARNINGS, offsetof(NotificationConfiguration, guest_warnings) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LOST, offsetof(NotificationConfiguration, guest_lost) }, { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_PARK, offsetof(NotificationConfiguration, guest_left_park) }, { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_QUEUING_FOR_RIDE, offsetof(NotificationConfiguration, guest_queuing_for_ride) }, { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_ON_RIDE, offsetof(NotificationConfiguration, guest_on_ride) }, diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index ca46558635..d17f715583 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -443,7 +443,6 @@ namespace Config model->ride_researched = reader->GetBoolean("ride_researched", true); model->ride_stalled_vehicles = reader->GetBoolean("ride_stalled_vehicles", true); model->guest_warnings = reader->GetBoolean("guest_warnings", true); - model->guest_lost = reader->GetBoolean("guest_lost", false); model->guest_left_park = reader->GetBoolean("guest_left_park", true); model->guest_queuing_for_ride = reader->GetBoolean("guest_queuing_for_ride", true); model->guest_on_ride = reader->GetBoolean("guest_on_ride", true); @@ -469,7 +468,6 @@ namespace Config writer->WriteBoolean("ride_researched", model->ride_researched); writer->WriteBoolean("ride_stalled_vehicles", model->ride_stalled_vehicles); writer->WriteBoolean("guest_warnings", model->guest_warnings); - writer->WriteBoolean("guest_lost", model->guest_lost); writer->WriteBoolean("guest_left_park", model->guest_left_park); writer->WriteBoolean("guest_queuing_for_ride", model->guest_queuing_for_ride); writer->WriteBoolean("guest_on_ride", model->guest_on_ride); diff --git a/src/openrct2/config/Config.h b/src/openrct2/config/Config.h index feb1c3a1ae..af6f9e5aa3 100644 --- a/src/openrct2/config/Config.h +++ b/src/openrct2/config/Config.h @@ -175,7 +175,6 @@ struct NotificationConfiguration bool ride_researched; bool ride_stalled_vehicles; bool guest_warnings; - bool guest_lost; bool guest_left_park; bool guest_queuing_for_ride; bool guest_on_ride; diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index fe005f4b9a..e4c98fd726 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3079,7 +3079,6 @@ enum STR_NOTIFICATION_RIDE_WARNINGS = 5596, STR_NOTIFICATION_RIDE_RESEARCHED = 5597, STR_NOTIFICATION_GUEST_WARNINGS = 5598, - STR_NOTIFICATION_GUEST_LOST = 5599, STR_NOTIFICATION_GUEST_LEFT_PARK = 5600, STR_NOTIFICATION_GUEST_QUEUING_FOR_RIDE = 5601, STR_NOTIFICATION_GUEST_ON_RIDE = 5602,