From 4db8f0551597c0a8c0ca71c175bb0509208d749a Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Tue, 21 Feb 2017 20:45:59 +0000 Subject: [PATCH] Replace tabs with spaces. Use coding style for var names --- src/openrct2/world/wall.cpp | 1121 +++++++++++++++++------------------ 1 file changed, 560 insertions(+), 561 deletions(-) diff --git a/src/openrct2/world/wall.cpp b/src/openrct2/world/wall.cpp index 8150e9bc36..4324bf0782 100644 --- a/src/openrct2/world/wall.cpp +++ b/src/openrct2/world/wall.cpp @@ -20,679 +20,678 @@ extern "C" { #include "map.h" - #include "park.h" - #include "scenery.h" - #include "../cheats.h" - #include "../game.h" - #include "../ride/track.h" - #include "../ride/track_data.h" - #include "../localisation/string_ids.h" + #include "park.h" + #include "scenery.h" + #include "../cheats.h" + #include "../game.h" + #include "../ride/track.h" + #include "../ride/track_data.h" + #include "../localisation/string_ids.h" } -static bool gWallAcrossTrack; - /** * * rct2: 0x006E5CBA */ -static bool WallCheckObstructionWithTrack(rct_scenery_entry *wall, sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 edge, rct_map_element *trackElement) +static bool WallCheckObstructionWithTrack(rct_scenery_entry *wall, sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 edge, rct_map_element *trackElement, bool *wallAcrossTrack) { - const rct_preview_track *trackBlock; - sint32 z, direction; + const rct_preview_track *trackBlock; + sint32 z, direction; - sint32 trackType = trackElement->properties.track.type; - sint32 sequence = trackElement->properties.track.sequence & 0x0F; - direction = (edge - trackElement->type) & 3; - rct_ride *ride = get_ride(trackElement->properties.track.ride_index); + sint32 trackType = trackElement->properties.track.type; + sint32 sequence = trackElement->properties.track.sequence & 0x0F; + direction = (edge - trackElement->type) & 3; + rct_ride *ride = get_ride(trackElement->properties.track.ride_index); - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { - if (FlatRideTrackSequenceElementAllowedWallEdges[trackType][sequence] & (1 << direction)) { - if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_TRACK_NO_WALLS)) { - return true; - } - } - } else { - if (TrackSequenceElementAllowedWallEdges[trackType][sequence] & (1 << direction)) { - if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_TRACK_NO_WALLS)) { - return true; - } - } - } + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { + if (FlatRideTrackSequenceElementAllowedWallEdges[trackType][sequence] & (1 << direction)) { + if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_TRACK_NO_WALLS)) { + return true; + } + } + } else { + if (TrackSequenceElementAllowedWallEdges[trackType][sequence] & (1 << direction)) { + if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_TRACK_NO_WALLS)) { + return true; + } + } + } - if (!(wall->wall.flags & WALL_SCENERY_IS_DOOR)) { - return false; - } + if (!(wall->wall.flags & WALL_SCENERY_IS_DOOR)) { + return false; + } - if (!(RideData4[ride->type].flags & RIDE_TYPE_FLAG4_0)) { - return false; - } + if (!(RideData4[ride->type].flags & RIDE_TYPE_FLAG4_0)) { + return false; + } - rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); - if (rideEntry->flags & RIDE_ENTRY_FLAG_16) { - return false; - } + rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); + if (rideEntry->flags & RIDE_ENTRY_FLAG_16) { + return false; + } - gWallAcrossTrack = true; - if (z0 & 1) { - return false; - } + *wallAcrossTrack = true; + if (z0 & 1) { + return false; + } - if (sequence == 0) { - if (TrackSequenceProperties[trackType][0] & TRACK_SEQUENCE_FLAG_DISALLOW_DOORS) { - return false; - } + if (sequence == 0) { + if (TrackSequenceProperties[trackType][0] & TRACK_SEQUENCE_FLAG_DISALLOW_DOORS) { + return false; + } - if (TrackDefinitions[trackType].bank_start == 0) { - if (!(TrackCoordinates[trackType].rotation_begin & 4)) { - direction = (trackElement->type & 3) ^ 2; - if (direction == edge) { - trackBlock = &TrackBlocks[trackType][sequence]; - z = TrackCoordinates[trackType].z_begin; - z = trackElement->base_height + ((z - trackBlock->z) * 8); - if (z == z0) { - return true; - } - } - } - } - } + if (TrackDefinitions[trackType].bank_start == 0) { + if (!(TrackCoordinates[trackType].rotation_begin & 4)) { + direction = (trackElement->type & 3) ^ 2; + if (direction == edge) { + trackBlock = &TrackBlocks[trackType][sequence]; + z = TrackCoordinates[trackType].z_begin; + z = trackElement->base_height + ((z - trackBlock->z) * 8); + if (z == z0) { + return true; + } + } + } + } + } - trackBlock = &TrackBlocks[trackType][sequence + 1]; - if (trackBlock->index != 0xFF) { - return false; - } + trackBlock = &TrackBlocks[trackType][sequence + 1]; + if (trackBlock->index != 0xFF) { + return false; + } - if (TrackDefinitions[trackType].bank_end != 0) { - return false; - } + if (TrackDefinitions[trackType].bank_end != 0) { + return false; + } - direction = TrackCoordinates[trackType].rotation_end; - if (direction & 4) { - return false; - } + direction = TrackCoordinates[trackType].rotation_end; + if (direction & 4) { + return false; + } - direction = (trackElement->type + direction) & 3; - if (direction != edge) { - return false; - } + direction = (trackElement->type + direction) & 3; + if (direction != edge) { + return false; + } - trackBlock = &TrackBlocks[trackType][sequence]; - z = TrackCoordinates[trackType].z_end; - z = trackElement->base_height + ((z - trackBlock->z) * 8); - if (z != z0) { - return false; - } + trackBlock = &TrackBlocks[trackType][sequence]; + z = TrackCoordinates[trackType].z_end; + z = trackElement->base_height + ((z - trackBlock->z) * 8); + if (z != z0) { + return false; + } - return true; + return true; } /** * * rct2: 0x006E5C1A */ -static bool WallCheckObstruction(rct_scenery_entry *wall, sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 edge) +static bool WallCheckObstruction(rct_scenery_entry *wall, sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 edge, bool *wallAcrossTrack) { - sint32 entryType, sequence; - rct_scenery_entry *entry; - rct_large_scenery_tile *tile; + sint32 entryType, sequence; + rct_scenery_entry *entry; + rct_large_scenery_tile *tile; - gWallAcrossTrack = false; - gMapGroundFlags = ELEMENT_IS_ABOVE_GROUND; - if (map_is_location_at_edge(x, y)) { - gGameCommandErrorText = STR_OFF_EDGE_OF_MAP; - return false; - } + *wallAcrossTrack = false; + gMapGroundFlags = ELEMENT_IS_ABOVE_GROUND; + if (map_is_location_at_edge(x, y)) { + gGameCommandErrorText = STR_OFF_EDGE_OF_MAP; + return false; + } - rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); - do { - sint32 elementType = map_element_get_type(mapElement); - if (elementType == MAP_ELEMENT_TYPE_SURFACE) continue; - if (z0 >= mapElement->clearance_height) continue; - if (z1 <= mapElement->base_height) continue; - if (elementType == MAP_ELEMENT_TYPE_WALL) { - sint32 direction = mapElement->type & 3; - if (edge == direction) { - map_obstruction_set_error_text(mapElement); - return false; - } - continue; - } - if ((mapElement->flags & 0x0F) == 0) continue; + rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); + do { + sint32 elementType = map_element_get_type(mapElement); + if (elementType == MAP_ELEMENT_TYPE_SURFACE) continue; + if (z0 >= mapElement->clearance_height) continue; + if (z1 <= mapElement->base_height) continue; + if (elementType == MAP_ELEMENT_TYPE_WALL) { + sint32 direction = mapElement->type & 3; + if (edge == direction) { + map_obstruction_set_error_text(mapElement); + return false; + } + continue; + } + if ((mapElement->flags & 0x0F) == 0) continue; - switch (elementType) { - case MAP_ELEMENT_TYPE_ENTRANCE: - map_obstruction_set_error_text(mapElement); - return false; - case MAP_ELEMENT_TYPE_PATH: - if (mapElement->properties.path.edges & (1 << edge)) { - map_obstruction_set_error_text(mapElement); - return false; - } - break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: - entryType = mapElement->properties.scenerymultiple.type & 0x3FF; - sequence = mapElement->properties.scenerymultiple.type >> 10; - entry = get_large_scenery_entry(entryType); - tile = &entry->large_scenery.tiles[sequence]; - { - sint32 direction = ((edge - mapElement->type) & 3) + 8; - if (!(tile->var_7 & (1 << direction))) { - map_obstruction_set_error_text(mapElement); - return false; - } - } - break; - case MAP_ELEMENT_TYPE_SCENERY: - entryType = mapElement->properties.scenery.type; - entry = get_small_scenery_entry(entryType); - if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_ALLOW_WALLS) { - map_obstruction_set_error_text(mapElement); - return false; - } - break; - case MAP_ELEMENT_TYPE_TRACK: - if (!WallCheckObstructionWithTrack(wall, x, y, z0, z1, edge, mapElement)) { - return false; - } - break; - } - } while (!map_element_is_last_for_tile(mapElement++)); - return true; + switch (elementType) { + case MAP_ELEMENT_TYPE_ENTRANCE: + map_obstruction_set_error_text(mapElement); + return false; + case MAP_ELEMENT_TYPE_PATH: + if (mapElement->properties.path.edges & (1 << edge)) { + map_obstruction_set_error_text(mapElement); + return false; + } + break; + case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + entryType = mapElement->properties.scenerymultiple.type & 0x3FF; + sequence = mapElement->properties.scenerymultiple.type >> 10; + entry = get_large_scenery_entry(entryType); + tile = &entry->large_scenery.tiles[sequence]; + { + sint32 direction = ((edge - mapElement->type) & 3) + 8; + if (!(tile->var_7 & (1 << direction))) { + map_obstruction_set_error_text(mapElement); + return false; + } + } + break; + case MAP_ELEMENT_TYPE_SCENERY: + entryType = mapElement->properties.scenery.type; + entry = get_small_scenery_entry(entryType); + if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_ALLOW_WALLS) { + map_obstruction_set_error_text(mapElement); + return false; + } + break; + case MAP_ELEMENT_TYPE_TRACK: + if (!WallCheckObstructionWithTrack(wall, x, y, z0, z1, edge, mapElement, wallAcrossTrack)) { + return false; + } + break; + } + } while (!map_element_is_last_for_tile(mapElement++)); + return true; } - + enum { - EDGE_SLOPE_ELEVATED = (1 << 0), // 0x01 - EDGE_SLOPE_UPWARDS = (1 << 6), // 0x40 - EDGE_SLOPE_DOWNWARDS = (1 << 7), // 0x80 + EDGE_SLOPE_ELEVATED = (1 << 0), // 0x01 + EDGE_SLOPE_UPWARDS = (1 << 6), // 0x40 + EDGE_SLOPE_DOWNWARDS = (1 << 7), // 0x80 - EDGE_SLOPE_UPWARDS_ELEVATED = EDGE_SLOPE_UPWARDS | EDGE_SLOPE_ELEVATED, - EDGE_SLOPE_DOWNWARDS_ELEVATED = EDGE_SLOPE_DOWNWARDS | EDGE_SLOPE_ELEVATED, + EDGE_SLOPE_UPWARDS_ELEVATED = EDGE_SLOPE_UPWARDS | EDGE_SLOPE_ELEVATED, + EDGE_SLOPE_DOWNWARDS_ELEVATED = EDGE_SLOPE_DOWNWARDS | EDGE_SLOPE_ELEVATED, }; /** rct2: 0x009A3FEC */ static const uint8 EdgeSlopes[][4] = { -// Top right Bottom right Bottom left Top left - { 0, 0, 0, 0 }, - { 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, 0 }, - { 0, 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS }, - { 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS }, - { EDGE_SLOPE_DOWNWARDS, 0, 0, EDGE_SLOPE_UPWARDS }, - { EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS }, - { EDGE_SLOPE_DOWNWARDS, 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED }, - { EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED }, - { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, 0, 0 }, - { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, 0 }, - { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS }, - { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS }, - { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, 0, EDGE_SLOPE_UPWARDS }, - { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS }, - { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED }, - { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_UPWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS_ELEVATED }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, - { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_UPWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS }, - { 0, 0, 0, 0 }, - { EDGE_SLOPE_UPWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS }, - { EDGE_SLOPE_DOWNWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_UPWARDS_ELEVATED }, - { 0, 0, 0, 0 }, +// Top right Bottom right Bottom left Top left + { 0, 0, 0, 0 }, + { 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, 0 }, + { 0, 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS }, + { 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS }, + { EDGE_SLOPE_DOWNWARDS, 0, 0, EDGE_SLOPE_UPWARDS }, + { EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS }, + { EDGE_SLOPE_DOWNWARDS, 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED }, + { EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED }, + { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, 0, 0 }, + { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, 0 }, + { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS }, + { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS }, + { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, 0, EDGE_SLOPE_UPWARDS }, + { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS }, + { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_ELEVATED }, + { EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED, EDGE_SLOPE_ELEVATED }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_UPWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS_ELEVATED }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { EDGE_SLOPE_UPWARDS, EDGE_SLOPE_UPWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS }, + { 0, 0, 0, 0 }, + { EDGE_SLOPE_UPWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS }, + { EDGE_SLOPE_DOWNWARDS_ELEVATED, EDGE_SLOPE_DOWNWARDS, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_UPWARDS_ELEVATED }, + { 0, 0, 0, 0 }, }; -money32 WallPlace(uint8 wall_type, sint16 x, sint16 y, sint16 z, uint8 edge, uint8 primary_colour, uint8 secondary_colour, uint8 tertiary_colour, uint8 flags) { - rct_xyz16 position = { - x, - y, - z - }; +money32 WallPlace(uint8 wallType, sint16 x, sint16 y, sint16 z, uint8 edge, uint8 primaryColour, uint8 secondaryColour, uint8 tertiaryColour, uint8 flags) { + rct_xyz16 position = { + x, + y, + z + }; - gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - gCommandPosition.x = position.x + 16; - gCommandPosition.y = position.y + 16; - gCommandPosition.z = position.z; + gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; + gCommandPosition.x = position.x + 16; + gCommandPosition.y = position.y + 16; + gCommandPosition.z = position.z; - if (position.z == 0){ - gCommandPosition.z = map_element_height(position.x, position.y) & 0xFFFF; - } + if (position.z == 0){ + gCommandPosition.z = map_element_height(position.x, position.y) & 0xFFFF; + } - if (game_is_paused() && !gCheatsBuildInPauseMode){ - gGameCommandErrorText = STR_CONSTRUCTION_NOT_POSSIBLE_WHILE_GAME_IS_PAUSED; - return MONEY32_UNDEFINED; - } + if (game_is_paused() && !gCheatsBuildInPauseMode){ + gGameCommandErrorText = STR_CONSTRUCTION_NOT_POSSIBLE_WHILE_GAME_IS_PAUSED; + return MONEY32_UNDEFINED; + } - if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && - !(flags & GAME_COMMAND_FLAG_7) && !gCheatsSandboxMode){ + if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && + !(flags & GAME_COMMAND_FLAG_7) && !gCheatsSandboxMode){ - if (position.z == 0){ - if (!map_is_location_in_park(position.x, position.y)){ - return MONEY32_UNDEFINED; - } - } - else if (!map_is_location_owned(position.x, position.y, position.z)){ - return MONEY32_UNDEFINED; - } - } + if (position.z == 0){ + if (!map_is_location_in_park(position.x, position.y)){ + return MONEY32_UNDEFINED; + } + } + else if (!map_is_location_owned(position.x, position.y, position.z)){ + return MONEY32_UNDEFINED; + } + } - uint8 bp = 0; - if (position.z == 0){ - rct_map_element* map_element = map_get_surface_element_at(position.x / 32, position.y / 32); - if (map_element == NULL){ - return MONEY32_UNDEFINED; - } - position.z = map_element->base_height * 8; + uint8 bp = 0; + if (position.z == 0){ + rct_map_element* surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); + if (surfaceElement == NULL){ + return MONEY32_UNDEFINED; + } + position.z = surfaceElement->base_height * 8; - uint8 slope = map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; - bp = EdgeSlopes[slope][edge & 3]; - if (bp & EDGE_SLOPE_ELEVATED) { - position.z += 16; - bp &= ~(1 << 0); - } - } + uint8 slope = surfaceElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + bp = EdgeSlopes[slope][edge & 3]; + if (bp & EDGE_SLOPE_ELEVATED) { + position.z += 16; + bp &= ~(1 << 0); + } + } - rct_map_element* map_element = map_get_surface_element_at(position.x / 32, position.y / 32); - if (map_element == NULL){ - return MONEY32_UNDEFINED; - } + rct_map_element* surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); + if (surfaceElement == NULL){ + return MONEY32_UNDEFINED; + } - if (map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK){ - uint16 water_height = map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; - water_height *= 16; + if (surfaceElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK){ + uint16 waterHeight = surfaceElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + waterHeight *= 16; - if (position.z < water_height){ - gGameCommandErrorText = STR_CANT_BUILD_THIS_UNDERWATER; - return MONEY32_UNDEFINED; - } - } + if (position.z < waterHeight){ + gGameCommandErrorText = STR_CANT_BUILD_THIS_UNDERWATER; + return MONEY32_UNDEFINED; + } + } - if (position.z / 8 < map_element->base_height){ - gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; - return MONEY32_UNDEFINED; - } + if (position.z / 8 < surfaceElement->base_height){ + gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; + return MONEY32_UNDEFINED; + } - if (!(bp & 0xC0)){ - uint8 new_edge = (edge + 2) & 3; - uint8 new_base_height = map_element->base_height; - new_base_height += 2; - if (map_element->properties.surface.slope & (1 << new_edge)){ - if (position.z / 8 < new_base_height){ - gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; - return MONEY32_UNDEFINED; - } + if (!(bp & 0xC0)){ + uint8 newEdge = (edge + 2) & 3; + uint8 newBaseHeight = surfaceElement->base_height; + newBaseHeight += 2; + if (surfaceElement->properties.surface.slope & (1 << newEdge)){ + if (position.z / 8 < newBaseHeight){ + gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; + return MONEY32_UNDEFINED; + } - if (map_element->properties.surface.slope & (1 << 4)){ - new_edge = (new_edge - 1) & 3; + if (surfaceElement->properties.surface.slope & (1 << 4)){ + newEdge = (newEdge - 1) & 3; - if (map_element->properties.surface.slope & (1 << new_edge)){ - new_edge = (new_edge + 2) & 3; - if (map_element->properties.surface.slope & (1 << new_edge)){ - new_base_height += 2; - if (position.z / 8 < new_base_height){ - gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; - return MONEY32_UNDEFINED; - } - new_base_height -= 2; - } - } - } - } + if (surfaceElement->properties.surface.slope & (1 << newEdge)){ + newEdge = (newEdge + 2) & 3; + if (surfaceElement->properties.surface.slope & (1 << newEdge)){ + newBaseHeight += 2; + if (position.z / 8 < newBaseHeight){ + gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; + return MONEY32_UNDEFINED; + } + newBaseHeight -= 2; + } + } + } + } - new_edge = (edge + 3) & 3; - if (map_element->properties.surface.slope & (1 << new_edge)){ - if (position.z / 8 < new_base_height){ - gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; - return MONEY32_UNDEFINED; - } + newEdge = (edge + 3) & 3; + if (surfaceElement->properties.surface.slope & (1 << newEdge)){ + if (position.z / 8 < newBaseHeight){ + gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; + return MONEY32_UNDEFINED; + } - if (map_element->properties.surface.slope & (1 << 4)){ - new_edge = (new_edge - 1) & 3; + if (surfaceElement->properties.surface.slope & (1 << 4)){ + newEdge = (newEdge - 1) & 3; - if (map_element->properties.surface.slope & (1 << new_edge)){ - new_edge = (new_edge + 2) & 3; - if (map_element->properties.surface.slope & (1 << new_edge)){ - new_base_height += 2; - if (position.z / 8 < new_base_height){ - gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; - return MONEY32_UNDEFINED; - } - } - } - } - } - } - sint32 banner_index = 0xFF; - rct_scenery_entry* wall_entry = get_wall_entry(wall_type); - // Have to check both -1 and NULL, as one can be a invalid object, - // while the other can be invalid index - if ((uintptr_t)wall_entry == (uintptr_t)-1 || wall_entry == NULL) { - return MONEY32_UNDEFINED; - } - if (wall_entry->wall.scrolling_mode != 0xFF){ - banner_index = create_new_banner(flags); + if (surfaceElement->properties.surface.slope & (1 << newEdge)){ + newEdge = (newEdge + 2) & 3; + if (surfaceElement->properties.surface.slope & (1 << newEdge)){ + newBaseHeight += 2; + if (position.z / 8 < newBaseHeight){ + gGameCommandErrorText = STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND; + return MONEY32_UNDEFINED; + } + } + } + } + } + } + sint32 bannerIndex = 0xFF; + rct_scenery_entry* wallEntry = get_wall_entry(wallType); + // Have to check both -1 and NULL, as one can be a invalid object, + // while the other can be invalid index + if ((uintptr_t)wallEntry == (uintptr_t)-1 || wallEntry == NULL) { + return MONEY32_UNDEFINED; + } + if (wallEntry->wall.scrolling_mode != 0xFF){ + bannerIndex = create_new_banner(flags); - if (banner_index == 0xFF){ - return MONEY32_UNDEFINED; - } + if (bannerIndex == 0xFF){ + return MONEY32_UNDEFINED; + } - rct_banner* banner = &gBanners[banner_index]; - if (flags & GAME_COMMAND_FLAG_APPLY){ - banner->flags |= (1 << 3); - banner->type = 0; - banner->x = position.x / 32; - banner->y = position.y / 32; + rct_banner* banner = &gBanners[bannerIndex]; + if (flags & GAME_COMMAND_FLAG_APPLY){ + banner->flags |= (1 << 3); + banner->type = 0; + banner->x = position.x / 32; + banner->y = position.y / 32; - sint32 rideIndex = banner_get_closest_ride_index(position.x, position.y, position.z); - if (rideIndex != -1) { - banner->colour = rideIndex & 0xFF; - banner->flags |= BANNER_FLAG_LINKED_TO_RIDE; - } - } - } + sint32 rideIndex = banner_get_closest_ride_index(position.x, position.y, position.z); + if (rideIndex != -1) { + banner->colour = rideIndex & 0xFF; + banner->flags |= BANNER_FLAG_LINKED_TO_RIDE; + } + } + } - uint8 clearanceHeight = position.z / 8; - if (bp & (EDGE_SLOPE_UPWARDS | EDGE_SLOPE_DOWNWARDS)) { - if (wall_entry->wall.flags & WALL_SCENERY_CANT_BUILD_ON_SLOPE){ - gGameCommandErrorText = STR_ERR_UNABLE_TO_BUILD_THIS_ON_SLOPE; - return MONEY32_UNDEFINED; - } - clearanceHeight += 2; - } - clearanceHeight += wall_entry->wall.height; + uint8 clearanceHeight = position.z / 8; + if (bp & (EDGE_SLOPE_UPWARDS | EDGE_SLOPE_DOWNWARDS)) { + if (wallEntry->wall.flags & WALL_SCENERY_CANT_BUILD_ON_SLOPE){ + gGameCommandErrorText = STR_ERR_UNABLE_TO_BUILD_THIS_ON_SLOPE; + return MONEY32_UNDEFINED; + } + clearanceHeight += 2; + } + clearanceHeight += wallEntry->wall.height; - if (!(flags & GAME_COMMAND_FLAG_7) && !gCheatsDisableClearanceChecks){ - if (!WallCheckObstruction(wall_entry, position.x, position.y, position.z / 8, clearanceHeight, edge)) { - return MONEY32_UNDEFINED; - } - } + bool wallAcrossTrack = false; + if (!(flags & GAME_COMMAND_FLAG_7) && !gCheatsDisableClearanceChecks){ + if (!WallCheckObstruction(wallEntry, position.x, position.y, position.z / 8, clearanceHeight, edge, &wallAcrossTrack)) { + return MONEY32_UNDEFINED; + } + } - if (!map_check_free_elements_and_reorganise(1)){ - return MONEY32_UNDEFINED; - } + if (!map_check_free_elements_and_reorganise(1)){ + return MONEY32_UNDEFINED; + } - if (flags & GAME_COMMAND_FLAG_APPLY){ - if (gGameCommandNestLevel == 1 && !(flags & GAME_COMMAND_FLAG_GHOST)) { - rct_xyz16 coord; - coord.x = position.x + 16; - coord.y = position.y + 16; - coord.z = map_element_height(coord.x, coord.y); - network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); - } + if (flags & GAME_COMMAND_FLAG_APPLY){ + if (gGameCommandNestLevel == 1 && !(flags & GAME_COMMAND_FLAG_GHOST)) { + rct_xyz16 coord; + coord.x = position.x + 16; + coord.y = position.y + 16; + coord.z = map_element_height(coord.x, coord.y); + network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); + } - map_element = map_element_insert(position.x / 32, position.y / 32, position.z / 8, 0); - assert(map_element != NULL); + rct_map_element* mapElement = map_element_insert(position.x / 32, position.y / 32, position.z / 8, 0); + assert(mapElement != NULL); - map_animation_create(MAP_ANIMATION_TYPE_WALL, position.x, position.y, position.z / 8); + map_animation_create(MAP_ANIMATION_TYPE_WALL, position.x, position.y, position.z / 8); - map_element->clearance_height = clearanceHeight; + mapElement->clearance_height = clearanceHeight; - map_element->type = bp | edge | MAP_ELEMENT_TYPE_WALL; + mapElement->type = bp | edge | MAP_ELEMENT_TYPE_WALL; - map_element->properties.wall.colour_1 = primary_colour; - map_element->properties.wall.colour_1 |= (secondary_colour & 7) << 5; - map_element->flags |= (secondary_colour & 0x18) << 2; + mapElement->properties.wall.colour_1 = primaryColour; + mapElement->properties.wall.colour_1 |= (secondaryColour & 7) << 5; + mapElement->flags |= (secondaryColour & 0x18) << 2; - if (gWallAcrossTrack) { - map_element->properties.wall.animation |= (1 << 2); - } + if (wallAcrossTrack) { + mapElement->properties.wall.animation |= (1 << 2); + } - map_element->properties.wall.type = wall_type; - if (banner_index != 0xFF){ - map_element->properties.wall.banner_index = banner_index; - } + mapElement->properties.wall.type = wallType; + if (bannerIndex != 0xFF){ + mapElement->properties.wall.banner_index = bannerIndex; + } - if (wall_entry->wall.flags & WALL_SCENERY_HAS_TERNARY_COLOUR){ - map_element->properties.wall.colour_3 = tertiary_colour; - } + if (wallEntry->wall.flags & WALL_SCENERY_HAS_TERNARY_COLOUR){ + mapElement->properties.wall.colour_3 = tertiaryColour; + } - if (flags & (1 << 6)){ - map_element->flags |= MAP_ELEMENT_FLAG_GHOST; - } + if (flags & (1 << 6)){ + mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + } - gSceneryMapElement = map_element; - map_invalidate_tile_zoom1(position.x, position.y, map_element->base_height * 8, map_element->base_height * 8 + 72); - } + gSceneryMapElement = mapElement; + map_invalidate_tile_zoom1(position.x, position.y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); + } - if (gParkFlags & PARK_FLAGS_NO_MONEY){ - return 0; - } - else{ - return wall_entry->wall.price; - } + if (gParkFlags & PARK_FLAGS_NO_MONEY){ + return 0; + } + else{ + return wallEntry->wall.price; + } } -money32 WallRemove(sint16 x, sint16 y, uint8 base_height, uint8 direction, uint8 flags) +money32 WallRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 direction, uint8 flags) { - if (!map_is_location_valid(x, y)) { - return MONEY32_UNDEFINED; - } + if (!map_is_location_valid(x, y)) { + return MONEY32_UNDEFINED; + } - gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - if(!(flags & GAME_COMMAND_FLAG_GHOST) && game_is_paused() && !gCheatsBuildInPauseMode){ - gGameCommandErrorText = STR_CONSTRUCTION_NOT_POSSIBLE_WHILE_GAME_IS_PAUSED; - return MONEY32_UNDEFINED; - } - if(!(flags & GAME_COMMAND_FLAG_GHOST) && !(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode && !map_is_location_owned(x, y, base_height * 8)){ - return MONEY32_UNDEFINED; - } + gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; + if(!(flags & GAME_COMMAND_FLAG_GHOST) && game_is_paused() && !gCheatsBuildInPauseMode){ + gGameCommandErrorText = STR_CONSTRUCTION_NOT_POSSIBLE_WHILE_GAME_IS_PAUSED; + return MONEY32_UNDEFINED; + } + if(!(flags & GAME_COMMAND_FLAG_GHOST) && !(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode && !map_is_location_owned(x, y, baseHeight * 8)){ + return MONEY32_UNDEFINED; + } - bool sceneryFound = false; - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); - do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_WALL) - continue; - if (map_element->base_height != base_height) - continue; - if ((map_element->type & MAP_ELEMENT_DIRECTION_MASK) != direction) - continue; - if ((flags & GAME_COMMAND_FLAG_GHOST) && !(map_element->flags & MAP_ELEMENT_FLAG_GHOST)) - continue; + bool wallFound = false; + rct_map_element* wallElement = map_get_first_element_at(x / 32, y / 32); + do { + if (map_element_get_type(wallElement) != MAP_ELEMENT_TYPE_WALL) + continue; + if (wallElement->base_height != baseHeight) + continue; + if ((wallElement->type & MAP_ELEMENT_DIRECTION_MASK) != direction) + continue; + if ((flags & GAME_COMMAND_FLAG_GHOST) && !(wallElement->flags & MAP_ELEMENT_FLAG_GHOST)) + continue; - sceneryFound = true; - break; - } while (!map_element_is_last_for_tile(map_element++)); + wallFound = true; + break; + } while (!map_element_is_last_for_tile(wallElement++)); - if (!(flags & GAME_COMMAND_FLAG_APPLY) || (sceneryFound == false)) { - return 0; - } + if (!(flags & GAME_COMMAND_FLAG_APPLY) || (wallFound == false)) { + return 0; + } - if (gGameCommandNestLevel == 1 && !(flags & GAME_COMMAND_FLAG_GHOST)) { - rct_xyz16 coord; - coord.x = x + 16; - coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); - network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); - } + if (gGameCommandNestLevel == 1 && !(flags & GAME_COMMAND_FLAG_GHOST)) { + rct_xyz16 coord; + coord.x = x + 16; + coord.y = y + 16; + coord.z = map_element_height(coord.x, coord.y); + network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); + } - map_element_remove_banner_entry(map_element); - map_invalidate_tile_zoom1(x, y, map_element->base_height * 8, (map_element->base_height * 8) + 72); - map_element_remove(map_element); - return 0; + map_element_remove_banner_entry(wallElement); + map_invalidate_tile_zoom1(x, y, wallElement->base_height * 8, (wallElement->base_height * 8) + 72); + map_element_remove(wallElement); + return 0; } -money32 WallSetColour(sint16 x, sint16 y, uint8 base_height, uint8 direction, uint8 primaryColour, uint8 secondaryColour, uint8 tertiaryColour, uint8 flags) +money32 WallSetColour(sint16 x, sint16 y, uint8 baseHeight, uint8 direction, uint8 primaryColour, uint8 secondaryColour, uint8 tertiaryColour, uint8 flags) { - gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - sint32 z = base_height * 8; + gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; + sint32 z = baseHeight * 8; - gCommandPosition.x = x + 16; - gCommandPosition.y = y + 16; - gCommandPosition.z = z; + gCommandPosition.x = x + 16; + gCommandPosition.y = y + 16; + gCommandPosition.z = z; - if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && - !map_is_location_in_park(x, y) && - !gCheatsSandboxMode) { + if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && + !map_is_location_in_park(x, y) && + !gCheatsSandboxMode) { - return MONEY32_UNDEFINED; - } + return MONEY32_UNDEFINED; + } - rct_map_element* map_element = map_get_wall_element_at(x, y, base_height, direction); + rct_map_element* wallElement = map_get_wall_element_at(x, y, baseHeight, direction); - if (map_element == NULL) { - return 0; - } + if (wallElement == NULL) { + return 0; + } - if ((flags & GAME_COMMAND_FLAG_GHOST) && !(map_element->flags & MAP_ELEMENT_FLAG_GHOST)) { - return 0; - } + if ((flags & GAME_COMMAND_FLAG_GHOST) && !(wallElement->flags & MAP_ELEMENT_FLAG_GHOST)) { + return 0; + } - if(flags & GAME_COMMAND_FLAG_APPLY){ - rct_scenery_entry* scenery_entry = get_wall_entry(map_element->properties.wall.type); - map_element->properties.wall.colour_1 &= 0xE0; - map_element->properties.wall.colour_1 |= primaryColour; - map_element->properties.wall.colour_1 &= 0x1F; - map_element->flags &= 0x9F; - map_element->properties.wall.colour_1 |= (secondaryColour & 0x7) * 32; - map_element->flags |= (secondaryColour & 0x18) * 4; + if(flags & GAME_COMMAND_FLAG_APPLY){ + rct_scenery_entry* scenery_entry = get_wall_entry(wallElement->properties.wall.type); + wallElement->properties.wall.colour_1 &= 0xE0; + wallElement->properties.wall.colour_1 |= primaryColour; + wallElement->properties.wall.colour_1 &= 0x1F; + wallElement->flags &= 0x9F; + wallElement->properties.wall.colour_1 |= (secondaryColour & 0x7) * 32; + wallElement->flags |= (secondaryColour & 0x18) * 4; - if(scenery_entry->wall.flags & WALL_SCENERY_HAS_TERNARY_COLOUR){ - map_element->properties.wall.colour_3 = tertiaryColour; - } - map_invalidate_tile_zoom1(x, y, z, z + 72); - } + if(scenery_entry->wall.flags & WALL_SCENERY_HAS_TERNARY_COLOUR){ + wallElement->properties.wall.colour_3 = tertiaryColour; + } + map_invalidate_tile_zoom1(x, y, z, z + 72); + } - return 0; + return 0; } extern "C" { - uint8 wall_get_animation_frame(rct_map_element *wallElement) { - return (wallElement->properties.wall.animation >> 3) & 0xF; - } - - /** - * - * rct2: 0x006E588E - */ - void wall_remove_at(sint32 x, sint32 y, sint32 z0, sint32 z1) - { - rct_map_element *mapElement; + uint8 wall_get_animation_frame(rct_map_element *wallElement) { + return (wallElement->properties.wall.animation >> 3) & 0xF; + } + + /** + * + * rct2: 0x006E588E + */ + void wall_remove_at(sint32 x, sint32 y, sint32 z0, sint32 z1) + { + rct_map_element *mapElement; - z0 /= 8; - z1 /= 8; - repeat: - mapElement = map_get_first_element_at(x >> 5, y >> 5); - do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) - continue; - if (z0 >= mapElement->clearance_height) - continue; - if (z1 <= mapElement->base_height) - continue; + z0 /= 8; + z1 /= 8; + repeat: + mapElement = map_get_first_element_at(x >> 5, y >> 5); + do { + if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + continue; + if (z0 >= mapElement->clearance_height) + continue; + if (z1 <= mapElement->base_height) + continue; - map_element_remove_banner_entry(mapElement); - map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); - map_element_remove(mapElement); - goto repeat; - } while (!map_element_is_last_for_tile(mapElement++)); - } - - /** - * - * rct2: 0x006E57E6 - */ - void wall_remove_at_z(sint32 x, sint32 y, sint32 z) - { - wall_remove_at(x, y, z, z + 48); - } + map_element_remove_banner_entry(mapElement); + map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); + map_element_remove(mapElement); + goto repeat; + } while (!map_element_is_last_for_tile(mapElement++)); + } + + /** + * + * rct2: 0x006E57E6 + */ + void wall_remove_at_z(sint32 x, sint32 y, sint32 z) + { + wall_remove_at(x, y, z, z + 48); + } - /** - * - * rct2: 0x006E5935 - */ - void wall_remove_intersecting_walls(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) - { - rct_map_element *mapElement; + /** + * + * rct2: 0x006E5935 + */ + void wall_remove_intersecting_walls(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) + { + rct_map_element *mapElement; - mapElement = map_get_first_element_at(x >> 5, y >> 5); - do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) - continue; + mapElement = map_get_first_element_at(x >> 5, y >> 5); + do { + if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + continue; - if (mapElement->clearance_height <= z0 || mapElement->base_height >= z1) - continue; + if (mapElement->clearance_height <= z0 || mapElement->base_height >= z1) + continue; - if (direction != (mapElement->type & 3)) - continue; + if (direction != (mapElement->type & 3)) + continue; - map_element_remove_banner_entry(mapElement); - map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); - map_element_remove(mapElement); - mapElement--; - } while (!map_element_is_last_for_tile(mapElement++)); - } + map_element_remove_banner_entry(mapElement); + map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); + map_element_remove(mapElement); + mapElement--; + } while (!map_element_is_last_for_tile(mapElement++)); + } - /** - * - * rct2: 0x006E519A - */ - void game_command_place_wall(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - *ebx = WallPlace( - (*ebx >> 8) & 0xFF, - *eax & 0xFFFF, - *ecx & 0xFFFF, - *edi & 0xFFFF, - *edx & 0xFF, - (*edx >> 8) & 0xFF, - *ebp & 0xFF, - (*ebp >> 8) & 0xFF, - *ebx & 0xFF - ); - } + /** + * + * rct2: 0x006E519A + */ + void game_command_place_wall(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { + *ebx = WallPlace( + (*ebx >> 8) & 0xFF, + *eax & 0xFFFF, + *ecx & 0xFFFF, + *edi & 0xFFFF, + *edx & 0xFF, + (*edx >> 8) & 0xFF, + *ebp & 0xFF, + (*ebp >> 8) & 0xFF, + *ebx & 0xFF + ); + } - money32 wall_place( - sint32 type, sint32 x, sint32 y, sint32 z, sint32 edge, sint32 primaryColour, sint32 secondaryColour, sint32 tertiaryColour, sint32 flags - ) { - sint32 eax, ebx, ecx, edx, esi, edi, ebp; + money32 wall_place( + sint32 type, sint32 x, sint32 y, sint32 z, sint32 edge, sint32 primaryColour, sint32 secondaryColour, sint32 tertiaryColour, sint32 flags + ) { + sint32 eax, ebx, ecx, edx, esi, edi, ebp; - eax = x; - ebx = flags | (type << 8); - ecx = y; - edx = edge | (primaryColour << 8); - edi = z; - ebp = secondaryColour | (tertiaryColour << 8); - game_command_place_wall(&eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); - return ebx; - } + eax = x; + ebx = flags | (type << 8); + ecx = y; + edx = edge | (primaryColour << 8); + edi = z; + ebp = secondaryColour | (tertiaryColour << 8); + game_command_place_wall(&eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); + return ebx; + } - /** - * - * rct2: 0x006E5597 - */ - void game_command_remove_wall(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) - { - *ebx = WallRemove( - *eax & 0xFFFF, - *ecx & 0xFFFF, - (*edx >> 8) & 0xFF, - *edx & 0xFF, - *ebx & 0xFF - ); - } - - /** - * - * rct2: 0x006E56B5 - */ - void game_command_set_wall_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) - { - *ebx = WallSetColour( - *eax & 0xFFFF, - *ecx & 0xFFFF, - (*edx >> 8) & 0xFF, - *edx & 0xFF, - (*ebx >> 8) & 0xFF, - *ebp & 0xFF, - (*ebp >> 8) & 0xFF, - *ebx & 0xFF - ); - } + /** + * + * rct2: 0x006E5597 + */ + void game_command_remove_wall(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) + { + *ebx = WallRemove( + *eax & 0xFFFF, + *ecx & 0xFFFF, + (*edx >> 8) & 0xFF, + *edx & 0xFF, + *ebx & 0xFF + ); + } + + /** + * + * rct2: 0x006E56B5 + */ + void game_command_set_wall_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) + { + *ebx = WallSetColour( + *eax & 0xFFFF, + *ecx & 0xFFFF, + (*edx >> 8) & 0xFF, + *edx & 0xFF, + (*ebx >> 8) & 0xFF, + *ebp & 0xFF, + (*ebp >> 8) & 0xFF, + *ebx & 0xFF + ); + } }