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

Remove redundant word ("index. index = %u")

This commit is contained in:
Peter Froud 2024-03-16 21:55:44 -07:00 committed by Gymnasiast
parent 338cca6760
commit 125fa12d6f
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/actions/BannerRemoveAction.cpp
View File

@ -70,14 +70,14 @@ GameActions::Result BannerRemoveAction::Query() const
auto bannerIndex = bannerElement->GetIndex();
if (bannerIndex == BannerIndex::GetNull())
{
LOG_ERROR("Invalid banner index. index = %u", bannerIndex);
LOG_ERROR("Invalid banner index %u", bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}
auto banner = bannerElement->GetBanner();
if (banner == nullptr)
{
LOG_ERROR("Invalid banner index. index = %u", bannerIndex);
LOG_ERROR("Invalid banner index %u", bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}
@ -109,14 +109,14 @@ GameActions::Result BannerRemoveAction::Execute() const
auto bannerIndex = bannerElement->GetIndex();
if (bannerIndex == BannerIndex::GetNull())
{
LOG_ERROR("Invalid banner index. index = %u", bannerIndex);
LOG_ERROR("Invalid banner index %u", bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}
auto banner = bannerElement->GetBanner();
if (banner == nullptr)
{
LOG_ERROR("Invalid banner index. index = %u", bannerIndex);
LOG_ERROR("Invalid banner index %u", bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}

4
src/openrct2/actions/BannerSetColourAction.cpp
View File

@ -66,7 +66,7 @@ GameActions::Result BannerSetColourAction::QueryExecute(bool isExecuting) const
if (_primaryColour > 31)
{
LOG_ERROR("Invalid primary colour: colour = %u", _primaryColour);
LOG_ERROR("Invalid primary colour %u", _primaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
@ -87,7 +87,7 @@ GameActions::Result BannerSetColourAction::QueryExecute(bool isExecuting) const
auto banner = GetBanner(index);
if (banner == nullptr)
{
LOG_ERROR("Invalid banner index: index = %u", index);
LOG_ERROR("Invalid banner index %u", index);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}

8
src/openrct2/actions/BannerSetStyleAction.cpp
View File

@ -49,7 +49,7 @@ GameActions::Result BannerSetStyleAction::Query() const
auto banner = GetBanner(_bannerIndex);
if (banner == nullptr)
{
LOG_ERROR("Invalid banner index: index = %u", _bannerIndex);
LOG_ERROR("Invalid banner index %u", _bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
@ -70,7 +70,7 @@ GameActions::Result BannerSetStyleAction::Query() const
case BannerSetStyleType::PrimaryColour:
if (_parameter > COLOUR_COUNT)
{
LOG_ERROR("Invalid primary colour: colour = %u", _parameter);
LOG_ERROR("Invalid primary colour %u", _parameter);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
break;
@ -78,7 +78,7 @@ GameActions::Result BannerSetStyleAction::Query() const
case BannerSetStyleType::TextColour:
if (_parameter > 13)
{
LOG_ERROR("Invalid text colour: colour = %u", _parameter);
LOG_ERROR("Invalid text colour %u", _parameter);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
break;
@ -103,7 +103,7 @@ GameActions::Result BannerSetStyleAction::Execute() const
auto banner = GetBanner(_bannerIndex);
if (banner == nullptr)
{
LOG_ERROR("Invalid banner index: index = %u", _bannerIndex);
LOG_ERROR("Invalid banner index %u", _bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}

4
src/openrct2/actions/LandBuyRightsAction.cpp
View File

@ -113,7 +113,7 @@ GameActions::Result LandBuyRightsAction::MapBuyLandRightsForTile(const CoordsXY&
{
if (_setting >= LandBuyRightSetting::Count)
{
LOG_ERROR("Tried calling buy land rights with an incorrect setting. setting = %u", _setting);
LOG_ERROR("Tried calling buy land rights with an incorrect setting %u", _setting);
return GameActions::Result(GameActions::Status::InvalidParameters, _ErrorTitles[0], STR_NONE);
}
@ -170,7 +170,7 @@ GameActions::Result LandBuyRightsAction::MapBuyLandRightsForTile(const CoordsXY&
return res;
default:
LOG_ERROR("Tried calling buy land rights with an incorrect setting. setting = %u", _setting);
LOG_ERROR("Tried calling buy land rights with an incorrect setting %u", _setting);
return GameActions::Result(GameActions::Status::InvalidParameters, _ErrorTitles[0], STR_NONE);
}
}

2
src/openrct2/actions/LandSetRightsAction.cpp
View File

@ -205,7 +205,7 @@ GameActions::Result LandSetRightsAction::MapBuyLandRightsForTile(const CoordsXY&
return res;
}
default:
LOG_ERROR("Tried calling set land rights with an incorrect setting. setting = %u", _setting);
LOG_ERROR("Tried calling set land rights with an incorrect setting %u", _setting);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}

6
src/openrct2/actions/LargeScenerySetColourAction.cpp
View File

@ -75,19 +75,19 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting)
if (_primaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid primary colour: colour = %u", _primaryColour);
LOG_ERROR("Invalid primary colour %u", _primaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
if (_secondaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid secondary colour: colour = %u", _secondaryColour);
LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
if (_tertiaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid tertiary colour: colour = %u", _tertiaryColour);
LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}

4
src/openrct2/actions/RideSetVehicleAction.cpp
View File

@ -66,7 +66,7 @@ GameActions::Result RideSetVehicleAction::Query() const
{
if (_type >= RideSetVehicleType::Count)
{
LOG_ERROR("Invalid type. type = %d", _type);
LOG_ERROR("Invalid type %d", _type);
}
auto errTitle = SetVehicleTypeErrorTitle[EnumValue(_type)];
@ -97,7 +97,7 @@ GameActions::Result RideSetVehicleAction::Query() const
{
if (!RideIsVehicleTypeValid(*ride))
{
LOG_ERROR("Invalid vehicle type. type = %d", _value);
LOG_ERROR("Invalid vehicle type %d", _value);
return GameActions::Result(GameActions::Status::InvalidParameters, errTitle, STR_NONE);
}
auto rideEntry = GetRideEntryByIndex(_value);

4
src/openrct2/actions/SignSetStyleAction.cpp
View File

@ -50,7 +50,7 @@ GameActions::Result SignSetStyleAction::Query() const
auto banner = GetBanner(_bannerIndex);
if (banner == nullptr)
{
LOG_ERROR("Invalid banner id. id = %u", _bannerIndex);
LOG_ERROR("Invalid banner id %u", _bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}
@ -87,7 +87,7 @@ GameActions::Result SignSetStyleAction::Execute() const
auto banner = GetBanner(_bannerIndex);
if (banner == nullptr)
{
LOG_ERROR("Invalid banner id. id = %u", _bannerIndex);
LOG_ERROR("Invalid banner id %u", _bannerIndex);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE);
}

6
src/openrct2/actions/StaffFireAction.cpp
View File

@ -38,7 +38,7 @@ GameActions::Result StaffFireAction::Query() const
{
if (_spriteId.ToUnderlying() >= MAX_ENTITIES || _spriteId.IsNull())
{
LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId);
LOG_ERROR("Invalid spriteId %u", _spriteId);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
@ -46,7 +46,7 @@ GameActions::Result StaffFireAction::Query() const
auto staff = TryGetEntity<Staff>(_spriteId);
if (staff == nullptr)
{
LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId);
LOG_ERROR("Invalid spriteId %u", _spriteId);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
}
@ -67,7 +67,7 @@ GameActions::Result StaffFireAction::Execute() const
auto staff = TryGetEntity<Staff>(_spriteId);
if (staff == nullptr)
{
LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId);
LOG_ERROR("Invalid spriteId %u", _spriteId);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
}
WindowCloseByClass(WindowClass::FirePrompt);