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

Refactor footpath.cpp to remove LocationXY and use CoordsXY

This commit is contained in:
duncanspumpkin 2019-12-12 10:21:05 +00:00
parent 6b72b0992d
commit 1f80dee4df
5 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@ -534,7 +534,7 @@ static void viewport_interaction_remove_footpath(TileElement* tileElement, Coord
{ {
if (tileElement2->GetType() == TILE_ELEMENT_TYPE_PATH && tileElement2->base_height == z) if (tileElement2->GetType() == TILE_ELEMENT_TYPE_PATH && tileElement2->base_height == z)
{ {
footpath_remove(mapCoords.x, mapCoords.y, z, GAME_COMMAND_FLAG_APPLY); footpath_remove({ mapCoords, z }, GAME_COMMAND_FLAG_APPLY);
break; break;
} }
} while (!(tileElement2++)->IsLastForTile()); } while (!(tileElement2++)->IsLastForTile());

70
src/openrct2-ui/windows/Footpath.cpp
View File

@ -183,7 +183,7 @@ static void window_footpath_start_bridge_at_point(ScreenCoordsXY screenCoords);
static void window_footpath_construct(); static void window_footpath_construct();
static void window_footpath_remove(); static void window_footpath_remove();
static void window_footpath_set_enabled_and_pressed_widgets(); static void window_footpath_set_enabled_and_pressed_widgets();
static void footpath_get_next_path_info(int32_t* type, int32_t* x, int32_t* y, int32_t* z, int32_t* slope); static void footpath_get_next_path_info(int32_t* type, CoordsXYZ& footpathLoc, int32_t* slope);
static bool footpath_select_default(); static bool footpath_select_default();
/** /**
@ -463,7 +463,7 @@ static void window_footpath_toolup(rct_window* w, rct_widgetindex widgetIndex, S
*/ */
static void window_footpath_update_provisional_path_for_bridge_mode(rct_window* w) static void window_footpath_update_provisional_path_for_bridge_mode(rct_window* w)
{ {
int32_t type, x, y, z, slope; int32_t type, slope;
if (gFootpathConstructionMode != PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL) if (gFootpathConstructionMode != PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL)
{ {
@ -480,8 +480,9 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window*
// Update provisional bridge mode path // Update provisional bridge mode path
if (!(gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_1)) if (!(gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_1))
{ {
footpath_get_next_path_info(&type, &x, &y, &z, &slope); CoordsXYZ footpathLoc;
_window_footpath_cost = footpath_provisional_set(type, x, y, z, slope); footpath_get_next_path_info(&type, footpathLoc, &slope);
_window_footpath_cost = footpath_provisional_set(type, footpathLoc, slope);
widget_invalidate(w, WIDX_CONSTRUCT); widget_invalidate(w, WIDX_CONSTRUCT);
} }
@ -490,10 +491,11 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window*
{ {
_window_footpath_provisional_path_arrow_timer = 5; _window_footpath_provisional_path_arrow_timer = 5;
gFootpathProvisionalFlags ^= PROVISIONAL_PATH_FLAG_SHOW_ARROW; gFootpathProvisionalFlags ^= PROVISIONAL_PATH_FLAG_SHOW_ARROW;
footpath_get_next_path_info(&type, &x, &y, &z, &slope); CoordsXYZ footpathLoc;
gMapSelectArrowPosition.x = x; footpath_get_next_path_info(&type, footpathLoc, &slope);
gMapSelectArrowPosition.y = y; gMapSelectArrowPosition.x = footpathLoc.x;
gMapSelectArrowPosition.z = z * 8; gMapSelectArrowPosition.y = footpathLoc.y;
gMapSelectArrowPosition.z = footpathLoc.z;
gMapSelectArrowDirection = gFootpathConstructDirection; gMapSelectArrowDirection = gFootpathConstructDirection;
if (gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_SHOW_ARROW) if (gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_SHOW_ARROW)
{ {
@ -503,7 +505,7 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window*
{ {
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW;
} }
map_invalidate_tile_full(x, y); map_invalidate_tile_full(footpathLoc.x, footpathLoc.y);
} }
} }
@ -729,7 +731,7 @@ static void window_footpath_set_provisional_path_at_point(ScreenCoordsXY screenC
{ {
// Check for change // Check for change
if ((gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_1) && gFootpathProvisionalPosition.x == mapCoord.x if ((gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_1) && gFootpathProvisionalPosition.x == mapCoord.x
&& gFootpathProvisionalPosition.y == mapCoord.y && gFootpathProvisionalPosition.z == tileElement->base_height) && gFootpathProvisionalPosition.y == mapCoord.y && gFootpathProvisionalPosition.z / 8 == tileElement->base_height)
{ {
return; return;
} }
@ -779,7 +781,7 @@ static void window_footpath_set_provisional_path_at_point(ScreenCoordsXY screenC
} }
int32_t pathType = (gFootpathSelectedType << 7) + (gFootpathSelectedId & 0xFF); int32_t pathType = (gFootpathSelectedType << 7) + (gFootpathSelectedId & 0xFF);
_window_footpath_cost = footpath_provisional_set(pathType, mapCoord.x, mapCoord.y, z, slope); _window_footpath_cost = footpath_provisional_set(pathType, { mapCoord, z * 8 }, slope);
window_invalidate_by_class(WC_FOOTPATH); window_invalidate_by_class(WC_FOOTPATH);
} }
} }
@ -971,11 +973,12 @@ static void window_footpath_construct()
_window_footpath_cost = MONEY32_UNDEFINED; _window_footpath_cost = MONEY32_UNDEFINED;
footpath_provisional_update(); footpath_provisional_update();
int32_t type, x, y, z, slope; int32_t type, slope;
footpath_get_next_path_info(&type, &x, &y, &z, &slope); CoordsXYZ footpathLoc;
footpath_get_next_path_info(&type, footpathLoc, &slope);
gGameCommandErrorTitle = STR_CANT_BUILD_FOOTPATH_HERE; gGameCommandErrorTitle = STR_CANT_BUILD_FOOTPATH_HERE;
auto footpathPlaceAction = FootpathPlaceAction({ x, y, z * 8 }, slope, type, gFootpathConstructDirection); auto footpathPlaceAction = FootpathPlaceAction(footpathLoc, slope, type, gFootpathConstructDirection);
footpathPlaceAction.SetCallback([=](const GameAction* ga, const GameActionResult* result) { footpathPlaceAction.SetCallback([=](const GameAction* ga, const GameActionResult* result) {
if (result->Error == GA_ERROR::OK) if (result->Error == GA_ERROR::OK)
{ {
@ -995,20 +998,14 @@ static void window_footpath_construct()
viewport_set_visibility(1); viewport_set_visibility(1);
} }
gFootpathConstructFromPosition = footpathLoc;
// If we have just built an upwards slope, the next path to construct is // If we have just built an upwards slope, the next path to construct is
// a bit higher. Note that the z returned by footpath_get_next_path_info // a bit higher. Note that the z returned by footpath_get_next_path_info
// already is lowered if we are building a downwards slope. // already is lowered if we are building a downwards slope.
if (gFootpathConstructSlope == 2) if (gFootpathConstructSlope == 2)
{ {
gFootpathConstructFromPosition.z = (z + 2) * 8; gFootpathConstructFromPosition.z += 2 * 8;
} }
else
{
gFootpathConstructFromPosition.z = z * 8;
}
gFootpathConstructFromPosition.x = x;
gFootpathConstructFromPosition.y = y;
} }
window_footpath_set_enabled_and_pressed_widgets(); window_footpath_set_enabled_and_pressed_widgets();
}); });
@ -1021,9 +1018,7 @@ static void window_footpath_construct()
*/ */
static void footpath_remove_tile_element(TileElement* tileElement) static void footpath_remove_tile_element(TileElement* tileElement)
{ {
int32_t x, y, z; auto z = tileElement->base_height;
z = tileElement->base_height;
if (tileElement->AsPath()->IsSloped()) if (tileElement->AsPath()->IsSloped())
{ {
uint8_t slopeDirection = tileElement->AsPath()->GetSlopeDirection(); uint8_t slopeDirection = tileElement->AsPath()->GetSlopeDirection();
@ -1053,18 +1048,15 @@ static void footpath_remove_tile_element(TileElement* tileElement)
} }
} }
gFootpathConstructFromPosition.z = tileElement->base_height * 8;
// Remove path // Remove path
footpath_remove( footpath_remove(gFootpathConstructFromPosition, GAME_COMMAND_FLAG_APPLY);
gFootpathConstructFromPosition.x, gFootpathConstructFromPosition.y, tileElement->base_height, GAME_COMMAND_FLAG_APPLY);
// Move selection // Move selection
edge = direction_reverse(edge); gFootpathConstructFromPosition.x -= CoordsDirectionDelta[edge].x;
x = gFootpathConstructFromPosition.x - CoordsDirectionDelta[edge].x; gFootpathConstructFromPosition.y -= CoordsDirectionDelta[edge].y;
y = gFootpathConstructFromPosition.y - CoordsDirectionDelta[edge].y; gFootpathConstructFromPosition.z = z * 8;
gFootpathConstructFromPosition.x = x; gFootpathConstructDirection = direction_reverse(edge);
gFootpathConstructFromPosition.y = y;
gFootpathConstructFromPosition.z = z << 3;
gFootpathConstructDirection = edge;
gFootpathConstructValidDirections = 255; gFootpathConstructValidDirections = 255;
} }
@ -1223,14 +1215,14 @@ static void window_footpath_set_enabled_and_pressed_widgets()
* *
* rct2: 0x006A7B20 * rct2: 0x006A7B20
*/ */
static void footpath_get_next_path_info(int32_t* type, int32_t* x, int32_t* y, int32_t* z, int32_t* slope) static void footpath_get_next_path_info(int32_t* type, CoordsXYZ& footpathLoc, int32_t* slope)
{ {
int32_t direction; int32_t direction;
direction = gFootpathConstructDirection; direction = gFootpathConstructDirection;
*x = gFootpathConstructFromPosition.x + CoordsDirectionDelta[direction].x; footpathLoc.x = gFootpathConstructFromPosition.x + CoordsDirectionDelta[direction].x;
*y = gFootpathConstructFromPosition.y + CoordsDirectionDelta[direction].y; footpathLoc.y = gFootpathConstructFromPosition.y + CoordsDirectionDelta[direction].y;
*z = gFootpathConstructFromPosition.z / 8; footpathLoc.z = gFootpathConstructFromPosition.z;
*type = (gFootpathSelectedType << 7) + (gFootpathSelectedId & 0xFF); *type = (gFootpathSelectedType << 7) + (gFootpathSelectedId & 0xFF);
*slope = TILE_ELEMENT_SLOPE_FLAT; *slope = TILE_ELEMENT_SLOPE_FLAT;
if (gFootpathConstructSlope != 0) if (gFootpathConstructSlope != 0)
@ -1238,7 +1230,7 @@ static void footpath_get_next_path_info(int32_t* type, int32_t* x, int32_t* y, i
*slope = gFootpathConstructDirection | TILE_ELEMENT_SLOPE_S_CORNER_UP; *slope = gFootpathConstructDirection | TILE_ELEMENT_SLOPE_S_CORNER_UP;
if (gFootpathConstructSlope != 2) if (gFootpathConstructSlope != 2)
{ {
*z -= 2; footpathLoc.z -= 2 * 8;
*slope ^= TILE_ELEMENT_SLOPE_E_CORNER_UP; *slope ^= TILE_ELEMENT_SLOPE_E_CORNER_UP;
} }
} }

24
src/openrct2/world/Footpath.cpp
View File

@ -38,13 +38,13 @@
void footpath_update_queue_entrance_banner(int32_t x, int32_t y, TileElement* tileElement); void footpath_update_queue_entrance_banner(int32_t x, int32_t y, TileElement* tileElement);
uint8_t gFootpathProvisionalFlags; uint8_t gFootpathProvisionalFlags;
LocationXYZ16 gFootpathProvisionalPosition; CoordsXYZ gFootpathProvisionalPosition;
uint8_t gFootpathProvisionalType; uint8_t gFootpathProvisionalType;
uint8_t gFootpathProvisionalSlope; uint8_t gFootpathProvisionalSlope;
uint8_t gFootpathConstructionMode; uint8_t gFootpathConstructionMode;
uint16_t gFootpathSelectedId; uint16_t gFootpathSelectedId;
uint8_t gFootpathSelectedType; uint8_t gFootpathSelectedType;
LocationXYZ16 gFootpathConstructFromPosition; CoordsXYZ gFootpathConstructFromPosition;
uint8_t gFootpathConstructDirection; uint8_t gFootpathConstructDirection;
uint8_t gFootpathConstructSlope; uint8_t gFootpathConstructSlope;
uint8_t gFootpathConstructValidDirections; uint8_t gFootpathConstructValidDirections;
@ -125,9 +125,9 @@ TileElement* map_get_footpath_element(int32_t x, int32_t y, int32_t z)
return nullptr; return nullptr;
} }
money32 footpath_remove(int32_t x, int32_t y, int32_t z, int32_t flags) money32 footpath_remove(CoordsXYZ footpathLoc, int32_t flags)
{ {
auto action = FootpathRemoveAction({ x, y, z * 8 }); auto action = FootpathRemoveAction(footpathLoc);
action.SetFlags(flags); action.SetFlags(flags);
if (flags & GAME_COMMAND_FLAG_APPLY) if (flags & GAME_COMMAND_FLAG_APPLY)
@ -143,22 +143,20 @@ money32 footpath_remove(int32_t x, int32_t y, int32_t z, int32_t flags)
* *
* rct2: 0x006A76FF * rct2: 0x006A76FF
*/ */
money32 footpath_provisional_set(int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope) money32 footpath_provisional_set(int32_t type, CoordsXYZ footpathLoc, int32_t slope)
{ {
money32 cost; money32 cost;
footpath_provisional_remove(); footpath_provisional_remove();
auto footpathPlaceAction = FootpathPlaceAction({ x, y, z * 8 }, slope, type); auto footpathPlaceAction = FootpathPlaceAction(footpathLoc, slope, type);
footpathPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED); footpathPlaceAction.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED);
auto res = GameActions::Execute(&footpathPlaceAction); auto res = GameActions::Execute(&footpathPlaceAction);
cost = res->Error == GA_ERROR::OK ? res->Cost : MONEY32_UNDEFINED; cost = res->Error == GA_ERROR::OK ? res->Cost : MONEY32_UNDEFINED;
if (res->Error == GA_ERROR::OK) if (res->Error == GA_ERROR::OK)
{ {
gFootpathProvisionalType = type; gFootpathProvisionalType = type;
gFootpathProvisionalPosition.x = x; gFootpathProvisionalPosition = footpathLoc;
gFootpathProvisionalPosition.y = y;
gFootpathProvisionalPosition.z = z & 0xFF;
gFootpathProvisionalSlope = slope; gFootpathProvisionalSlope = slope;
gFootpathProvisionalFlags |= PROVISIONAL_PATH_FLAG_1; gFootpathProvisionalFlags |= PROVISIONAL_PATH_FLAG_1;
@ -184,15 +182,15 @@ money32 footpath_provisional_set(int32_t type, int32_t x, int32_t y, int32_t z,
} }
else if ( else if (
gFootpathConstructSlope == TILE_ELEMENT_SLOPE_FLAT gFootpathConstructSlope == TILE_ELEMENT_SLOPE_FLAT
|| gFootpathProvisionalPosition.z * 8 < gFootpathConstructFromPosition.z) || gFootpathProvisionalPosition.z < gFootpathConstructFromPosition.z)
{ {
// Going either straight on, or down. // Going either straight on, or down.
virtual_floor_set_height(gFootpathProvisionalPosition.z * 8); virtual_floor_set_height(gFootpathProvisionalPosition.z);
} }
else else
{ {
// Going up in the world! // Going up in the world!
virtual_floor_set_height((gFootpathProvisionalPosition.z + 2) * 8); virtual_floor_set_height(gFootpathProvisionalPosition.z + 2 * 8);
} }
} }
@ -210,7 +208,7 @@ void footpath_provisional_remove()
gFootpathProvisionalFlags &= ~PROVISIONAL_PATH_FLAG_1; gFootpathProvisionalFlags &= ~PROVISIONAL_PATH_FLAG_1;
footpath_remove( footpath_remove(
gFootpathProvisionalPosition.x, gFootpathProvisionalPosition.y, gFootpathProvisionalPosition.z, gFootpathProvisionalPosition,
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND
| GAME_COMMAND_FLAG_GHOST); | GAME_COMMAND_FLAG_GHOST);
} }

8
src/openrct2/world/Footpath.h
View File

@ -155,13 +155,13 @@ enum
}; };
extern uint8_t gFootpathProvisionalFlags; extern uint8_t gFootpathProvisionalFlags;
extern LocationXYZ16 gFootpathProvisionalPosition; extern CoordsXYZ gFootpathProvisionalPosition;
extern uint8_t gFootpathProvisionalType; extern uint8_t gFootpathProvisionalType;
extern uint8_t gFootpathProvisionalSlope; extern uint8_t gFootpathProvisionalSlope;
extern uint8_t gFootpathConstructionMode; extern uint8_t gFootpathConstructionMode;
extern uint16_t gFootpathSelectedId; extern uint16_t gFootpathSelectedId;
extern uint8_t gFootpathSelectedType; extern uint8_t gFootpathSelectedType;
extern LocationXYZ16 gFootpathConstructFromPosition; extern CoordsXYZ gFootpathConstructFromPosition;
extern uint8_t gFootpathConstructDirection; extern uint8_t gFootpathConstructDirection;
extern uint8_t gFootpathConstructSlope; extern uint8_t gFootpathConstructSlope;
extern uint8_t gFootpathConstructValidDirections; extern uint8_t gFootpathConstructValidDirections;
@ -176,8 +176,8 @@ TileElement* map_get_footpath_element(int32_t x, int32_t y, int32_t z);
struct PathElement; struct PathElement;
PathElement* map_get_footpath_element_slope(int32_t x, int32_t y, int32_t z, int32_t slope); PathElement* map_get_footpath_element_slope(int32_t x, int32_t y, int32_t z, int32_t slope);
void footpath_interrupt_peeps(int32_t x, int32_t y, int32_t z); void footpath_interrupt_peeps(int32_t x, int32_t y, int32_t z);
money32 footpath_remove(int32_t x, int32_t y, int32_t z, int32_t flags); money32 footpath_remove(CoordsXYZ footpathLoc, int32_t flags);
money32 footpath_provisional_set(int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope); money32 footpath_provisional_set(int32_t type, CoordsXYZ footpathLoc, int32_t slope);
void footpath_provisional_remove(); void footpath_provisional_remove();
void footpath_provisional_update(); void footpath_provisional_update();
void footpath_get_coordinates_from_pos( void footpath_get_coordinates_from_pos(

4
src/openrct2/world/Map.cpp
View File

@ -1506,9 +1506,7 @@ void map_restore_provisional_elements()
if (gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_1) if (gFootpathProvisionalFlags & PROVISIONAL_PATH_FLAG_1)
{ {
gFootpathProvisionalFlags &= ~PROVISIONAL_PATH_FLAG_1; gFootpathProvisionalFlags &= ~PROVISIONAL_PATH_FLAG_1;
footpath_provisional_set( footpath_provisional_set(gFootpathProvisionalType, gFootpathProvisionalPosition, gFootpathProvisionalSlope);
gFootpathProvisionalType, gFootpathProvisionalPosition.x, gFootpathProvisionalPosition.y,
gFootpathProvisionalPosition.z, gFootpathProvisionalSlope);
} }
if (window_find_by_class(WC_RIDE_CONSTRUCTION) != nullptr) if (window_find_by_class(WC_RIDE_CONSTRUCTION) != nullptr)
{ {