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

Set last player position based on game action result.

This commit is contained in:
Matt 2019-02-11 00:53:21 +01:00
parent 9a746c4fc1
commit 92d73e2fab
8 changed files with 29 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/actions/GameAction.cpp
View File

@ -318,6 +318,11 @@ namespace GameActions
{
network_add_player_money_spent(playerIndex, result->Cost);
}
if (result->Position.x != LOCATION_NULL)
{
network_set_player_last_action_coord(playerId, gCommandPosition);
}
}
else if (network_get_mode() == NETWORK_MODE_NONE)
{

6
src/openrct2/actions/LandSetHeightAction.hpp
View File

@ -156,12 +156,6 @@ public:
cost += GetSurfaceHeightChangeCost(surfaceElement);
SetSurfaceHeight(surfaceElement);
LocationXYZ16 coord;
coord.x = _coords.x + 16;
coord.y = _coords.y + 16;
coord.z = surfaceHeight;
network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord);
auto res = std::make_unique<GameActionResult>();
res->Position = { _coords.x + 16, _coords.y + 16, surfaceHeight };
res->Cost = cost;

22
src/openrct2/actions/PlaceParkEntranceAction.hpp
View File

@ -62,11 +62,9 @@ public:
GA_ERROR::NOT_IN_EDITOR_MODE, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_NONE);
}
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = _x;
gCommandPosition.y = _y;
gCommandPosition.z = _z * 16;
auto res = std::make_unique<GameActionResult>();
res->ExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
res->Position = CoordsXYZ{ _x, _y, _z * 16 };
if (!map_check_free_elements_and_reorganise(3))
{
@ -119,19 +117,17 @@ public:
}
}
return std::make_unique<GameActionResult>();
return res;
}
GameActionResult::Ptr Execute() const override
{
auto res = std::make_unique<GameActionResult>();
res->ExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
res->Position = CoordsXYZ{ _x, _y, _z * 16 };
uint32_t flags = GetFlags();
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = _x;
gCommandPosition.y = _y;
gCommandPosition.z = _z * 16;
CoordsXYZD parkEntrance;
parkEntrance.x = _x;
parkEntrance.y = _y;
@ -201,6 +197,6 @@ public:
}
}
return std::make_unique<GameActionResult>();
return res;
}
};

20
src/openrct2/actions/PlacePeepSpawnAction.hpp
View File

@ -55,11 +55,9 @@ public:
GA_ERROR::NOT_IN_EDITOR_MODE, STR_ERR_CANT_PLACE_PEEP_SPAWN_HERE, STR_NONE);
}
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = _location.x;
gCommandPosition.y = _location.y;
gCommandPosition.z = _location.z / 8;
auto res = std::make_unique<GameActionResult>();
res->ExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
res->Position = CoordsXYZ{ _location.x, _location.y, _location.z / 8 };
if (!map_check_free_elements_and_reorganise(3))
{
@ -94,16 +92,14 @@ public:
GA_ERROR::INVALID_PARAMETERS, STR_ERR_CANT_PLACE_PEEP_SPAWN_HERE, STR_ERR_MUST_BE_OUTSIDE_PARK_BOUNDARIES);
}
return std::make_unique<GameActionResult>();
return res;
}
GameActionResult::Ptr Execute() const override
{
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = _location.x;
gCommandPosition.y = _location.y;
gCommandPosition.z = _location.z / 8;
auto res = std::make_unique<GameActionResult>();
res->ExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
res->Position = CoordsXYZ{ _location.x, _location.y, _location.z / 8 };
// If we have reached our max peep spawns, use peep spawn next to last one set.
if (gPeepSpawns.size() >= MAX_PEEP_SPAWNS)
@ -134,6 +130,6 @@ public:
// Invalidate tile
map_invalidate_tile_full(_location.x, _location.y);
return std::make_unique<GameActionResult>();
return res;
}
};

1
src/openrct2/actions/RideCreateAction.hpp
View File

@ -307,7 +307,6 @@ public:
window_invalidate_by_class(WC_RIDE_LIST);
res->ExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
res->Position.x = 0x8000;
return std::move(res);
}

12
src/openrct2/actions/RideSetAppearanceAction.hpp
View File

@ -167,15 +167,11 @@ public:
auto res = std::make_unique<GameActionResult>();
if (ride->overall_view.xy != RCT_XY8_UNDEFINED)
{
LocationXYZ16 coord;
coord.x = ride->overall_view.x * 32 + 16;
coord.y = ride->overall_view.y * 32 + 16;
coord.z = tile_element_height(coord.x, coord.y);
res->Position.x = coord.x;
res->Position.y = coord.y;
res->Position.z = coord.z;
network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord);
res->Position.x = ride->overall_view.x * 32 + 16;
res->Position.y = ride->overall_view.y * 32 + 16;
res->Position.z = tile_element_height(res->Position.x, res->Position.y);
}
return res;
}
};

8
src/openrct2/actions/RideSetPriceAction.hpp
View File

@ -101,11 +101,9 @@ public:
if (ride->overall_view.xy != RCT_XY8_UNDEFINED)
{
LocationXYZ16 coord;
coord.x = ride->overall_view.x * 32 + 16;
coord.y = ride->overall_view.y * 32 + 16;
coord.z = tile_element_height(coord.x, coord.y);
network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord);
res->Position.x = ride->overall_view.x * 32 + 16;
res->Position.y = ride->overall_view.y * 32 + 16;
res->Position.z = tile_element_height(res->Position.x, res->Position.y);
}
uint32_t shopItem;

26
src/openrct2/actions/TrackPlaceAction.hpp
View File

@ -97,12 +97,7 @@ public:
res->Position.x = _origin.x + 16;
res->Position.y = _origin.y + 16;
res->Position.z = _origin.z;
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
gCommandPosition.x = res->Position.x;
gCommandPosition.y = res->Position.y;
gCommandPosition.z = res->Position.z;
int16_t trackpieceZ = _origin.z;
gTrackGroundFlags = 0;
uint32_t rideTypeFlags = RideProperties[ride->type].flags;
@ -246,8 +241,6 @@ public:
mapLoc.z += trackBlock->z;
trackpieceZ = mapLoc.z;
if (mapLoc.z < 16)
{
return std::make_unique<GameActionResult>(
@ -443,12 +436,6 @@ public:
cost += ((supportHeight / 2) * RideTrackCosts[ride->type].support_price) * 5;
}
LocationXYZ16 coord;
coord.x = res->Position.x;
coord.y = res->Position.y;
coord.z = trackpieceZ;
network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord);
money32 price = RideTrackCosts[ride->type].track_price;
price *= (rideTypeFlags & RIDE_TYPE_FLAG_FLAT_RIDE) ? FlatRideTrackPricing[_trackType] : TrackPricing[_trackType];
@ -480,12 +467,7 @@ public:
res->Position.x = _origin.x + 16;
res->Position.y = _origin.y + 16;
res->Position.z = _origin.z;
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
gCommandPosition.x = res->Position.x;
gCommandPosition.y = res->Position.y;
gCommandPosition.z = res->Position.z;
int16_t trackpieceZ = _origin.z;
gTrackGroundFlags = 0;
uint32_t rideTypeFlags = RideProperties[ride->type].flags;
@ -547,8 +529,6 @@ public:
mapLoc.z += trackBlock->z;
trackpieceZ = mapLoc.z;
int32_t baseZ = mapLoc.z / 8;
int32_t clearanceZ = trackBlock->var_07;
@ -789,12 +769,6 @@ public:
map_invalidate_tile_full(mapLoc.x, mapLoc.y);
}
LocationXYZ16 coord;
coord.x = res->Position.x;
coord.y = res->Position.y;
coord.z = trackpieceZ;
network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord);
money32 price = RideTrackCosts[ride->type].track_price;
price *= (rideTypeFlags & RIDE_TYPE_FLAG_FLAT_RIDE) ? FlatRideTrackPricing[_trackType] : TrackPricing[_trackType];