mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename FootpathPlaceFromTrack to FootpathLayoutPlace (#19028)
This commit is contained in:
parent
51582e3ab0
commit
c5805eaae6
|
@ -4,10 +4,11 @@
|
|||
- Feature: [#18732] [Plugin] API to get the guests thoughts.
|
||||
- Feature: [#18744] Cheat to allow using a regular path as a queue path.
|
||||
- Feature: [#19023] Add Canadian French translation.
|
||||
- Improved: [#18749] Ability to have 4 active awards for more than one month in a row.
|
||||
- Improved: [#18749] Ability to have 4 active awards for more than one month in a row.
|
||||
- Improved: [#18826] [Plugin] Added all actions and their documentation to plugin API.
|
||||
- Improved: [#18945] Languages can now fall back to other languages than English.
|
||||
- Improved: [#18970] Trying to load a non-park save will now display a context error.
|
||||
- Improved: [#19018] Renamed park entrance and peep spawn place actions to fit the naming scheme.
|
||||
- Improved: [#19044] Added special thanks to RMC and Wiegand to the About page.
|
||||
- Fix: [#18467] “Selected only” Object Selection filter is active in Track Designs Manager, and cannot be toggled.
|
||||
- Fix: [#18905] Ride Construction window theme is not applied correctly.
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#include <openrct2/OpenRCT2.h>
|
||||
#include <openrct2/actions/ChangeMapSizeAction.h>
|
||||
#include <openrct2/actions/LandSetRightsAction.h>
|
||||
#include <openrct2/actions/PlaceParkEntranceAction.h>
|
||||
#include <openrct2/actions/PlacePeepSpawnAction.h>
|
||||
#include <openrct2/actions/ParkEntrancePlaceAction.h>
|
||||
#include <openrct2/actions/PeepSpawnPlaceAction.h>
|
||||
#include <openrct2/actions/SurfaceSetStyleAction.h>
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/entity/EntityList.h>
|
||||
|
@ -516,7 +516,7 @@ public:
|
|||
|
||||
ParkEntranceRemoveGhost();
|
||||
|
||||
auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId);
|
||||
auto gameAction = ParkEntrancePlaceAction(parkEntrancePosition, gFootpathSelectedId);
|
||||
gameAction.SetFlags(GAME_COMMAND_FLAG_GHOST);
|
||||
|
||||
auto result = GameActions::Execute(&gameAction);
|
||||
|
@ -534,7 +534,7 @@ public:
|
|||
CoordsXYZD parkEntrancePosition = PlaceParkEntranceGetMapPosition(screenCoords);
|
||||
if (!parkEntrancePosition.IsNull())
|
||||
{
|
||||
auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId);
|
||||
auto gameAction = ParkEntrancePlaceAction(parkEntrancePosition, gFootpathSelectedId);
|
||||
auto result = GameActions::Execute(&gameAction);
|
||||
if (result.Error == GameActions::Status::Ok)
|
||||
{
|
||||
|
@ -584,7 +584,7 @@ public:
|
|||
|
||||
int32_t mapZ = tileElement->GetBaseZ();
|
||||
|
||||
auto gameAction = PlacePeepSpawnAction({ mapCoords, mapZ, static_cast<Direction>(direction) });
|
||||
auto gameAction = PeepSpawnPlaceAction({ mapCoords, mapZ, static_cast<Direction>(direction) });
|
||||
auto result = GameActions::Execute(&gameAction);
|
||||
if (result.Error == GameActions::Status::Ok)
|
||||
{
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
#include "MazePlaceTrackAction.h"
|
||||
#include "MazeSetTrackAction.h"
|
||||
#include "NetworkModifyGroupAction.h"
|
||||
#include "ParkEntrancePlaceAction.h"
|
||||
#include "ParkEntranceRemoveAction.h"
|
||||
#include "ParkMarketingAction.h"
|
||||
#include "ParkSetDateAction.h"
|
||||
|
@ -47,8 +48,7 @@
|
|||
#include "ParkSetResearchFundingAction.h"
|
||||
#include "PauseToggleAction.h"
|
||||
#include "PeepPickupAction.h"
|
||||
#include "PlaceParkEntranceAction.h"
|
||||
#include "PlacePeepSpawnAction.h"
|
||||
#include "PeepSpawnPlaceAction.h"
|
||||
#include "PlayerKickAction.h"
|
||||
#include "PlayerSetGroupAction.h"
|
||||
#include "RideCreateAction.h"
|
||||
|
@ -148,8 +148,8 @@ namespace GameActions
|
|||
REGISTER_ACTION(ParkSetParameterAction);
|
||||
REGISTER_ACTION(ParkSetResearchFundingAction);
|
||||
REGISTER_ACTION(PeepPickupAction);
|
||||
REGISTER_ACTION(PlaceParkEntranceAction);
|
||||
REGISTER_ACTION(PlacePeepSpawnAction);
|
||||
REGISTER_ACTION(ParkEntrancePlaceAction);
|
||||
REGISTER_ACTION(PeepSpawnPlaceAction);
|
||||
REGISTER_ACTION(PlayerKickAction);
|
||||
REGISTER_ACTION(PlayerSetGroupAction);
|
||||
REGISTER_ACTION(RideCreateAction);
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#include "PlaceParkEntranceAction.h"
|
||||
#include "ParkEntrancePlaceAction.h"
|
||||
|
||||
#include "../Cheats.h"
|
||||
#include "../OpenRCT2.h"
|
||||
|
@ -21,24 +21,24 @@
|
|||
#include "../world/Park.h"
|
||||
#include "../world/Surface.h"
|
||||
|
||||
PlaceParkEntranceAction::PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType)
|
||||
ParkEntrancePlaceAction::ParkEntrancePlaceAction(const CoordsXYZD& location, ObjectEntryIndex pathType)
|
||||
: _loc(location)
|
||||
, _pathType(pathType)
|
||||
{
|
||||
}
|
||||
|
||||
void PlaceParkEntranceAction::AcceptParameters(GameActionParameterVisitor& visitor)
|
||||
void ParkEntrancePlaceAction::AcceptParameters(GameActionParameterVisitor& visitor)
|
||||
{
|
||||
visitor.Visit(_loc);
|
||||
visitor.Visit("footpathSurfaceObject", _pathType);
|
||||
}
|
||||
|
||||
uint16_t PlaceParkEntranceAction::GetActionFlags() const
|
||||
uint16_t ParkEntrancePlaceAction::GetActionFlags() const
|
||||
{
|
||||
return GameActionBase::GetActionFlags() | GameActions::Flags::EditorOnly;
|
||||
}
|
||||
|
||||
void PlaceParkEntranceAction::Serialise(DataSerialiser& stream)
|
||||
void ParkEntrancePlaceAction::Serialise(DataSerialiser& stream)
|
||||
{
|
||||
GameAction::Serialise(stream);
|
||||
|
||||
|
@ -46,7 +46,7 @@ void PlaceParkEntranceAction::Serialise(DataSerialiser& stream)
|
|||
stream << DS_TAG(_pathType);
|
||||
}
|
||||
|
||||
GameActions::Result PlaceParkEntranceAction::Query() const
|
||||
GameActions::Result ParkEntrancePlaceAction::Query() const
|
||||
{
|
||||
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
|
||||
{
|
||||
|
@ -109,7 +109,7 @@ GameActions::Result PlaceParkEntranceAction::Query() const
|
|||
return res;
|
||||
}
|
||||
|
||||
GameActions::Result PlaceParkEntranceAction::Execute() const
|
||||
GameActions::Result ParkEntrancePlaceAction::Execute() const
|
||||
{
|
||||
auto res = GameActions::Result();
|
||||
res.Expenditure = ExpenditureType::LandPurchase;
|
||||
|
@ -183,7 +183,7 @@ GameActions::Result PlaceParkEntranceAction::Execute() const
|
|||
return res;
|
||||
}
|
||||
|
||||
bool PlaceParkEntranceAction::CheckMapCapacity(int16_t numTiles) const
|
||||
bool ParkEntrancePlaceAction::CheckMapCapacity(int16_t numTiles) const
|
||||
{
|
||||
CoordsXYZ entranceLoc = _loc;
|
||||
for (uint8_t index = 0; index < 3; index++)
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
#include "GameAction.h"
|
||||
|
||||
class PlaceParkEntranceAction final : public GameActionBase<GameCommand::PlaceParkEntrance>
|
||||
class ParkEntrancePlaceAction final : public GameActionBase<GameCommand::PlaceParkEntrance>
|
||||
{
|
||||
private:
|
||||
CoordsXYZD _loc;
|
||||
ObjectEntryIndex _pathType;
|
||||
|
||||
public:
|
||||
PlaceParkEntranceAction() = default;
|
||||
PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType);
|
||||
ParkEntrancePlaceAction() = default;
|
||||
ParkEntrancePlaceAction(const CoordsXYZD& location, ObjectEntryIndex pathType);
|
||||
|
||||
void AcceptParameters(GameActionParameterVisitor& visitor) override;
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#include "PlacePeepSpawnAction.h"
|
||||
#include "PeepSpawnPlaceAction.h"
|
||||
|
||||
#include "../Cheats.h"
|
||||
#include "../OpenRCT2.h"
|
||||
|
@ -18,29 +18,29 @@
|
|||
#include "../world/Park.h"
|
||||
#include "../world/Surface.h"
|
||||
|
||||
PlacePeepSpawnAction::PlacePeepSpawnAction(const CoordsXYZD& location)
|
||||
PeepSpawnPlaceAction::PeepSpawnPlaceAction(const CoordsXYZD& location)
|
||||
: _location(location)
|
||||
{
|
||||
}
|
||||
|
||||
void PlacePeepSpawnAction::AcceptParameters(GameActionParameterVisitor& visitor)
|
||||
void PeepSpawnPlaceAction::AcceptParameters(GameActionParameterVisitor& visitor)
|
||||
{
|
||||
visitor.Visit(_location);
|
||||
}
|
||||
|
||||
uint16_t PlacePeepSpawnAction::GetActionFlags() const
|
||||
uint16_t PeepSpawnPlaceAction::GetActionFlags() const
|
||||
{
|
||||
return GameActionBase::GetActionFlags() | GameActions::Flags::EditorOnly | GameActions::Flags::AllowWhilePaused;
|
||||
}
|
||||
|
||||
void PlacePeepSpawnAction::Serialise(DataSerialiser& stream)
|
||||
void PeepSpawnPlaceAction::Serialise(DataSerialiser& stream)
|
||||
{
|
||||
GameAction::Serialise(stream);
|
||||
|
||||
stream << DS_TAG(_location.x) << DS_TAG(_location.y) << DS_TAG(_location.z) << DS_TAG(_location.direction);
|
||||
}
|
||||
|
||||
GameActions::Result PlacePeepSpawnAction::Query() const
|
||||
GameActions::Result PeepSpawnPlaceAction::Query() const
|
||||
{
|
||||
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
|
||||
{
|
||||
|
@ -83,7 +83,7 @@ GameActions::Result PlacePeepSpawnAction::Query() const
|
|||
return res;
|
||||
}
|
||||
|
||||
GameActions::Result PlacePeepSpawnAction::Execute() const
|
||||
GameActions::Result PeepSpawnPlaceAction::Execute() const
|
||||
{
|
||||
auto res = GameActions::Result();
|
||||
res.Expenditure = ExpenditureType::LandPurchase;
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
#include "GameAction.h"
|
||||
|
||||
class PlacePeepSpawnAction final : public GameActionBase<GameCommand::PlacePeepSpawn>
|
||||
class PeepSpawnPlaceAction final : public GameActionBase<GameCommand::PlacePeepSpawn>
|
||||
{
|
||||
private:
|
||||
CoordsXYZD _location;
|
||||
|
||||
public:
|
||||
PlacePeepSpawnAction() = default;
|
||||
PlacePeepSpawnAction(const CoordsXYZD& location);
|
||||
PeepSpawnPlaceAction() = default;
|
||||
PeepSpawnPlaceAction(const CoordsXYZD& location);
|
||||
|
||||
void AcceptParameters(GameActionParameterVisitor& visitor) override;
|
||||
|
|
@ -93,6 +93,7 @@
|
|||
<ClInclude Include="actions\MazePlaceTrackAction.h" />
|
||||
<ClInclude Include="actions\MazeSetTrackAction.h" />
|
||||
<ClInclude Include="actions\NetworkModifyGroupAction.h" />
|
||||
<ClInclude Include="actions\ParkEntrancePlaceAction.h" />
|
||||
<ClInclude Include="actions\ParkEntranceRemoveAction.h" />
|
||||
<ClInclude Include="actions\ParkMarketingAction.h" />
|
||||
<ClInclude Include="actions\ParkSetDateAction.h" />
|
||||
|
@ -102,8 +103,7 @@
|
|||
<ClInclude Include="actions\ParkSetResearchFundingAction.h" />
|
||||
<ClInclude Include="actions\PauseToggleAction.h" />
|
||||
<ClInclude Include="actions\PeepPickupAction.h" />
|
||||
<ClInclude Include="actions\PlaceParkEntranceAction.h" />
|
||||
<ClInclude Include="actions\PlacePeepSpawnAction.h" />
|
||||
<ClInclude Include="actions\PeepSpawnPlaceAction.h" />
|
||||
<ClInclude Include="actions\PlayerKickAction.h" />
|
||||
<ClInclude Include="actions\PlayerSetGroupAction.h" />
|
||||
<ClInclude Include="actions\ResultWithMessage.h" />
|
||||
|
@ -603,8 +603,8 @@
|
|||
<ClCompile Include="actions\ParkSetResearchFundingAction.cpp" />
|
||||
<ClCompile Include="actions\PauseToggleAction.cpp" />
|
||||
<ClCompile Include="actions\PeepPickupAction.cpp" />
|
||||
<ClCompile Include="actions\PlaceParkEntranceAction.cpp" />
|
||||
<ClCompile Include="actions\PlacePeepSpawnAction.cpp" />
|
||||
<ClCompile Include="actions\ParkEntrancePlaceAction.cpp" />
|
||||
<ClCompile Include="actions\PeepSpawnPlaceAction.cpp" />
|
||||
<ClCompile Include="actions\PlayerKickAction.cpp" />
|
||||
<ClCompile Include="actions\PlayerSetGroupAction.cpp" />
|
||||
<ClCompile Include="actions\RideCreateAction.cpp" />
|
||||
|
|
Loading…
Reference in New Issue