mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reflect actual string in string identifier (#14958)

This commit is contained in:
Hielke Morsink 2021-06-26 15:00:05 +02:00 committed by GitHub
parent e54dc7e466
commit bd18bce3a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/TrackList.cpp
View File

@ -241,7 +241,7 @@ static void window_track_list_select(rct_window* w, int32_t listIndex)
// Displays a message if the ride can't load, fix #4080
if (_loadedTrackDesign == nullptr)
{
context_show_error(STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_TRACK_LOAD_FAILED_ERROR, {});
context_show_error(STR_CANT_BUILD_THIS_HERE, STR_TRACK_LOAD_FAILED_ERROR, {});
return;
}

14
src/openrct2/actions/PlaceParkEntranceAction.cpp
View File

@ -43,8 +43,7 @@ GameActions::Result::Ptr PlaceParkEntranceAction::Query() const
{
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
{
return std::make_unique<GameActions::Result>(
GameActions::Status::NotInEditorMode, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::NotInEditorMode, STR_CANT_BUILD_THIS_HERE, STR_NONE);
}
auto res = std::make_unique<GameActions::Result>();
@ -55,19 +54,18 @@ GameActions::Result::Ptr PlaceParkEntranceAction::Query() const
|| _loc.y >= (gMapSizeUnits - 32))
{
return std::make_unique<GameActions::Result>(
GameActions::Status::InvalidParameters, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_TOO_CLOSE_TO_EDGE_OF_MAP);
GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_TOO_CLOSE_TO_EDGE_OF_MAP);
}
if (!CheckMapCapacity(3))
{
return std::make_unique<GameActions::Result>(
GameActions::Status::NoFreeElements, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::NoFreeElements, STR_CANT_BUILD_THIS_HERE, STR_NONE);
}
if (gParkEntrances.size() >= MAX_PARK_ENTRANCES)
{
return std::make_unique<GameActions::Result>(
GameActions::Status::InvalidParameters, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_ERR_TOO_MANY_PARK_ENTRANCES);
GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_ERR_TOO_MANY_PARK_ENTRANCES);
}
auto zLow = _loc.z;
@ -88,7 +86,7 @@ GameActions::Result::Ptr PlaceParkEntranceAction::Query() const
if (auto res2 = MapCanConstructAt({ entranceLoc, zLow, zHigh }, { 0b1111, 0 }); res2->Error != GameActions::Status::Ok)
{
return std::make_unique<GameActions::Result>(
GameActions::Status::NoClearance, STR_CANT_BUILD_PARK_ENTRANCE_HERE, res2->ErrorMessage.GetStringId(),
GameActions::Status::NoClearance, STR_CANT_BUILD_THIS_HERE, res2->ErrorMessage.GetStringId(),
res2->ErrorMessageArgs.data());
}
@ -97,7 +95,7 @@ GameActions::Result::Ptr PlaceParkEntranceAction::Query() const
if (entranceElement != nullptr)
{
return std::make_unique<GameActions::Result>(
GameActions::Status::ItemAlreadyPlaced, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_NONE);
GameActions::Status::ItemAlreadyPlaced, STR_CANT_BUILD_THIS_HERE, STR_NONE);
}
}

12
src/openrct2/actions/WallPlaceAction.cpp
View File

@ -21,22 +21,22 @@
#include "../world/Wall.h"
WallPlaceActionResult::WallPlaceActionResult()
: GameActions::Result(GameActions::Status::Ok, STR_CANT_BUILD_PARK_ENTRANCE_HERE)
: GameActions::Result(GameActions::Status::Ok, STR_CANT_BUILD_THIS_HERE)
{
}
WallPlaceActionResult::WallPlaceActionResult(GameActions::Status err)
: GameActions::Result(err, STR_CANT_BUILD_PARK_ENTRANCE_HERE)
: GameActions::Result(err, STR_CANT_BUILD_THIS_HERE)
{
}
WallPlaceActionResult::WallPlaceActionResult(GameActions::Status err, rct_string_id msg)
: GameActions::Result(err, STR_CANT_BUILD_PARK_ENTRANCE_HERE, msg)
: GameActions::Result(err, STR_CANT_BUILD_THIS_HERE, msg)
{
}
WallPlaceActionResult::WallPlaceActionResult(GameActions::Status error, rct_string_id msg, uint8_t* args)
: GameActions::Result(error, STR_CANT_BUILD_PARK_ENTRANCE_HERE, msg, args)
: GameActions::Result(error, STR_CANT_BUILD_THIS_HERE, msg, args)
{
}
@ -94,7 +94,7 @@ void WallPlaceAction::Serialise(DataSerialiser& stream)
GameActions::Result::Ptr WallPlaceAction::Query() const
{
auto res = std::make_unique<WallPlaceActionResult>();
res->ErrorTitle = STR_CANT_BUILD_PARK_ENTRANCE_HERE;
res->ErrorTitle = STR_CANT_BUILD_THIS_HERE;
res->Position = _loc;
res->Expenditure = ExpenditureType::Landscaping;
@ -302,7 +302,7 @@ GameActions::Result::Ptr WallPlaceAction::Query() const
GameActions::Result::Ptr WallPlaceAction::Execute() const
{
auto res = std::make_unique<WallPlaceActionResult>();
res->ErrorTitle = STR_CANT_BUILD_PARK_ENTRANCE_HERE;
res->ErrorTitle = STR_CANT_BUILD_THIS_HERE;
res->Position = _loc;
res->Expenditure = ExpenditureType::Landscaping;

2
src/openrct2/localisation/StringIds.h
View File

@ -1228,7 +1228,7 @@ enum
STR_LAST_BREAKDOWN = 1808,
STR_CURRENT_BREAKDOWN = 1809,
STR_CARRYING = 1810,
STR_CANT_BUILD_PARK_ENTRANCE_HERE = 1811,
STR_CANT_BUILD_THIS_HERE = 1811,
STR_STRING_DEFINED_TOOLTIP = 1812,
STR_MISCELLANEOUS = 1813,
STR_ACTIONS = 1814,