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

Apply the cpp style guide

This commit is contained in:
duncanspumpkin 2017-03-01 21:19:15 +00:00
parent ffeb1fa527
commit 9725e6b647
3 changed files with 217 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/windows/map.c
View File

@ -527,7 +527,7 @@ static void window_map_toolabort(rct_window *w, sint32 widgetIndex)
hide_construction_rights();
break;
case WIDX_BUILD_PARK_ENTRANCE:
park_entrance_ghost();
park_entrance_remove_ghost();
window_invalidate(w);
hide_gridlines();
hide_land_rights();
@ -1244,7 +1244,7 @@ static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y)
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT;
sub_666EEF(x, y, &mapX, &mapY, &mapZ, &direction);
if (mapX == (sint16)-1) {
park_entrance_ghost();
park_entrance_remove_ghost();
return;
}
@ -1269,7 +1269,7 @@ static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y)
return;
}
park_entrance_ghost();
park_entrance_remove_ghost();
gParkEntranceGhostPrice = park_entrance_place_ghost(mapX, mapY, mapZ, direction);
}
@ -1317,7 +1317,7 @@ static void window_map_set_peep_spawn_tool_update(sint32 x, sint32 y)
*/
static void window_map_place_park_entrance_tool_down(sint32 x, sint32 y)
{
park_entrance_ghost();
park_entrance_remove_ghost();
sint16 mapX, mapY, mapZ;
sint32 direction;

382
src/openrct2/world/entrance.cpp
View File

@ -35,168 +35,193 @@ money32 gParkEntranceGhostPrice;
rct_xyzd16 gParkEntrances[MAX_PARK_ENTRANCES];
static money32 ParkEntrancePlace(sint32 flags, sint16 x, sint16 y, sint16 z, uint8 direction) {
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode) {
return MONEY32_UNDEFINED;
}
static money32 ParkEntrancePlace(sint32 flags, sint16 x, sint16 y, uint8 z, uint8 direction)
{
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
{
return MONEY32_UNDEFINED;
}
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = x;
gCommandPosition.y = y;
// ??
gCommandPosition.z = (z & 0xFF) << 4;
gCommandPosition.x = x;
gCommandPosition.y = y;
gCommandPosition.z = z * 16;
if (!map_check_free_elements_and_reorganise(3)) {
return MONEY32_UNDEFINED;
}
if (!map_check_free_elements_and_reorganise(3))
{
return MONEY32_UNDEFINED;
}
if (x <= 32 || y <= 32 || x >= (gMapSizeUnits - 32) || y >= (gMapSizeUnits - 32)) {
gGameCommandErrorText = STR_TOO_CLOSE_TO_EDGE_OF_MAP;
return MONEY32_UNDEFINED;
}
if (x <= 32 || y <= 32 || x >= (gMapSizeUnits - 32) || y >= (gMapSizeUnits - 32))
{
gGameCommandErrorText = STR_TOO_CLOSE_TO_EDGE_OF_MAP;
return MONEY32_UNDEFINED;
}
sint8 entranceNum = -1;
for (uint8 i = 0; i < MAX_PARK_ENTRANCES; ++i) {
if (gParkEntrances[i].x == MAP_LOCATION_NULL) {
entranceNum = i;
break;
}
}
sint8 entranceNum = -1;
for (uint8 i = 0; i < MAX_PARK_ENTRANCES; ++i)
{
if (gParkEntrances[i].x == MAP_LOCATION_NULL)
{
entranceNum = i;
break;
}
}
if (entranceNum == -1) {
gGameCommandErrorText = STR_ERR_TOO_MANY_PARK_ENTRANCES;
return MONEY32_UNDEFINED;
}
if (entranceNum == -1)
{
gGameCommandErrorText = STR_ERR_TOO_MANY_PARK_ENTRANCES;
return MONEY32_UNDEFINED;
}
if (flags & GAME_COMMAND_FLAG_APPLY) {
gParkEntrances[entranceNum].x = x;
gParkEntrances[entranceNum].y = y;
gParkEntrances[entranceNum].z = (z & 0xFF) << 4;
gParkEntrances[entranceNum].direction = direction;
}
if (flags & GAME_COMMAND_FLAG_APPLY)
{
gParkEntrances[entranceNum].x = x;
gParkEntrances[entranceNum].y = y;
gParkEntrances[entranceNum].z = z * 16;
gParkEntrances[entranceNum].direction = direction;
}
sint8 zLow = (z & 0xFF) * 2;
sint8 zHigh = zLow + 12;
sint8 zLow = z * 2;
sint8 zHigh = zLow + 12;
for (uint8 index = 0; index < 3; index++) {
if (index == 1) {
x += TileDirectionDelta[(direction - 1) & 0x3].x;
y += TileDirectionDelta[(direction - 1) & 0x3].y;
}
else if (index == 2) {
x += TileDirectionDelta[(direction + 1) & 0x3].x * 2;
y += TileDirectionDelta[(direction + 1) & 0x3].y * 2;
}
for (uint8 index = 0; index < 3; index++)
{
if (index == 1)
{
x += TileDirectionDelta[(direction - 1) & 0x3].x;
y += TileDirectionDelta[(direction - 1) & 0x3].y;
}
else if (index == 2)
{
x += TileDirectionDelta[(direction + 1) & 0x3].x * 2;
y += TileDirectionDelta[(direction + 1) & 0x3].y * 2;
}
if (!gCheatsDisableClearanceChecks) {
if (!map_can_construct_at(x, y, zLow, zHigh, 0xF)) {
return MONEY32_UNDEFINED;
}
}
if (!gCheatsDisableClearanceChecks)
{
if (!map_can_construct_at(x, y, zLow, zHigh, 0xF))
{
return MONEY32_UNDEFINED;
}
}
// Check that entrance element does not already exist at this location
rct_map_element* entranceElement = map_get_park_entrance_element_at(x, y, zLow, false);
if (entranceElement != NULL)
return MONEY32_UNDEFINED;
// Check that entrance element does not already exist at this location
rct_map_element* entranceElement = map_get_park_entrance_element_at(x, y, zLow, false);
if (entranceElement != NULL)
{
return MONEY32_UNDEFINED;
}
if (!(flags & GAME_COMMAND_FLAG_APPLY))
continue;
if (!(flags & GAME_COMMAND_FLAG_APPLY))
{
continue;
}
if (!(flags & GAME_COMMAND_FLAG_GHOST)) {
rct_map_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32);
surfaceElement->properties.surface.ownership = 0;
}
if (!(flags & GAME_COMMAND_FLAG_GHOST))
{
rct_map_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32);
surfaceElement->properties.surface.ownership = 0;
}
rct_map_element* newElement = map_element_insert(x / 32, y / 32, zLow, 0xF);
assert(newElement != NULL);
newElement->clearance_height = zHigh;
rct_map_element* newElement = map_element_insert(x / 32, y / 32, zLow, 0xF);
assert(newElement != NULL);
newElement->clearance_height = zHigh;
if (flags & GAME_COMMAND_FLAG_GHOST) {
newElement->flags |= MAP_ELEMENT_FLAG_GHOST;
}
if (flags & GAME_COMMAND_FLAG_GHOST)
{
newElement->flags |= MAP_ELEMENT_FLAG_GHOST;
}
newElement->type = MAP_ELEMENT_TYPE_ENTRANCE;
newElement->type |= direction;
newElement->properties.entrance.index = index;
newElement->properties.entrance.type = ENTRANCE_TYPE_PARK_ENTRANCE;
newElement->properties.entrance.path_type = gFootpathSelectedId & 0xFF;
newElement->type = MAP_ELEMENT_TYPE_ENTRANCE;
newElement->type |= direction;
newElement->properties.entrance.index = index;
newElement->properties.entrance.type = ENTRANCE_TYPE_PARK_ENTRANCE;
newElement->properties.entrance.path_type = gFootpathSelectedId;
if (!(flags & GAME_COMMAND_FLAG_GHOST)) {
footpath_connect_edges(x, y, newElement, 1);
}
if (!(flags & GAME_COMMAND_FLAG_GHOST))
{
footpath_connect_edges(x, y, newElement, 1);
}
update_park_fences(x, y);
update_park_fences(x - 32, y);
update_park_fences(x + 32, y);
update_park_fences(x, y - 32);
update_park_fences(x, y + 32);
update_park_fences(x, y);
update_park_fences(x - 32, y);
update_park_fences(x + 32, y);
update_park_fences(x, y - 32);
update_park_fences(x, y + 32);
map_invalidate_tile(x, y, newElement->base_height * 8, newElement->clearance_height * 8);
map_invalidate_tile(x, y, newElement->base_height * 8, newElement->clearance_height * 8);
if (index == 0) {
map_animation_create(MAP_ANIMATION_TYPE_PARK_ENTRANCE, x, y, zLow);
}
}
return 0;
if (index == 0)
{
map_animation_create(MAP_ANIMATION_TYPE_PARK_ENTRANCE, x, y, zLow);
}
}
return 0;
}
static void ParkEntranceRemoveSegment(sint32 x, sint32 y, sint32 z)
{
rct_map_element *mapElement;
rct_map_element *mapElement;
mapElement = map_get_park_entrance_element_at(x, y, z, true);
if (mapElement == NULL)
return;
mapElement = map_get_park_entrance_element_at(x, y, z, true);
if (mapElement == NULL)
{
return;
}
map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8);
map_element_remove(mapElement);
update_park_fences(x, y);
map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8);
map_element_remove(mapElement);
update_park_fences(x, y);
}
static money32 ParkEntranceRemove(sint16 x, sint16 y, uint8 z, uint8 flags)
{
sint32 entranceIndex, direction;
sint32 entranceIndex, direction;
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode) {
return MONEY32_UNDEFINED;
}
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
{
return MONEY32_UNDEFINED;
}
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = x;
gCommandPosition.y = y;
gCommandPosition.z = z * 16;
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
gCommandPosition.x = x;
gCommandPosition.y = y;
gCommandPosition.z = z * 16;
if (!(flags & GAME_COMMAND_FLAG_APPLY)) {
return 0;
}
if (!(flags & GAME_COMMAND_FLAG_APPLY))
{
return 0;
}
entranceIndex = park_get_entrance_index(x, y, z * 16);
if (entranceIndex == -1) {
return 0;
}
entranceIndex = park_get_entrance_index(x, y, z * 16);
if (entranceIndex == -1)
{
return 0;
}
gParkEntrances[entranceIndex].x = MAP_LOCATION_NULL;
direction = (gParkEntrances[entranceIndex].direction - 1) & 3;
gParkEntrances[entranceIndex].x = MAP_LOCATION_NULL;
direction = (gParkEntrances[entranceIndex].direction - 1) & 3;
// Centre (sign)
ParkEntranceRemoveSegment(x, y, z * 2);
// Centre (sign)
ParkEntranceRemoveSegment(x, y, z * 2);
// Left post
ParkEntranceRemoveSegment(
x + TileDirectionDelta[direction].x,
y + TileDirectionDelta[direction].y,
z * 2
);
// Left post
ParkEntranceRemoveSegment(
x + TileDirectionDelta[direction].x,
y + TileDirectionDelta[direction].y,
z * 2
);
// Right post
ParkEntranceRemoveSegment(
x - TileDirectionDelta[direction].x,
y - TileDirectionDelta[direction].y,
z * 2
);
// Right post
ParkEntranceRemoveSegment(
x - TileDirectionDelta[direction].x,
y - TileDirectionDelta[direction].y,
z * 2
);
return 0;
return 0;
}
@ -206,12 +231,19 @@ extern "C"
*
* rct2: 0x006666E7
*/
void game_command_place_park_entrance(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) {
void game_command_place_park_entrance(sint32* eax,
sint32* ebx,
sint32* ecx,
sint32* edx,
sint32* esi,
sint32* edi,
sint32* ebp)
{
*ebx = ParkEntrancePlace(
*ebx & 0xFF,
*eax & 0xFFFF,
*ecx & 0xFFFF,
*edx & 0xFFFF,
*edx & 0xFF,
(*ebx >> 8) & 0xFF);
}
@ -219,7 +251,13 @@ extern "C"
*
* rct2: 0x00666A63
*/
void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp)
void game_command_remove_park_entrance(sint32 *eax,
sint32 *ebx,
sint32 *ecx,
sint32 *edx,
sint32 *esi,
sint32 *edi,
sint32 *ebp)
{
*ebx = ParkEntranceRemove(
*eax & 0xFFFF,
@ -232,20 +270,21 @@ extern "C"
*
* rct2: 0x00666F9E
*/
void park_entrance_ghost()
void park_entrance_remove_ghost()
{
if (gParkEntranceGhostExists) {
gParkEntranceGhostExists = false;
game_do_command(
gParkEntranceGhostPosition.x,
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY,
gParkEntranceGhostPosition.y,
gParkEntranceGhostPosition.z,
GAME_COMMAND_REMOVE_PARK_ENTRANCE,
0,
0
);
}
if (gParkEntranceGhostExists)
{
gParkEntranceGhostExists = false;
game_do_command(
gParkEntranceGhostPosition.x,
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY,
gParkEntranceGhostPosition.y,
gParkEntranceGhostPosition.z,
GAME_COMMAND_REMOVE_PARK_ENTRANCE,
0,
0
);
}
}
/**
@ -254,53 +293,56 @@ extern "C"
*/
money32 park_entrance_place_ghost(sint32 x, sint32 y, sint32 z, sint32 direction)
{
money32 result;
money32 result;
park_entrance_ghost();
result = game_do_command(
x,
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED |
park_entrance_remove_ghost();
result = game_do_command(
x,
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED |
GAME_COMMAND_FLAG_5 |
GAME_COMMAND_FLAG_GHOST |
GAME_COMMAND_FLAG_APPLY |
(direction << 8),
y,
z,
GAME_COMMAND_PLACE_PARK_ENTRANCE,
0,
0
);
if (result != MONEY32_UNDEFINED) {
gParkEntranceGhostPosition.x = x;
gParkEntranceGhostPosition.y = y;
gParkEntranceGhostPosition.z = z;
gParkEntranceGhostDirection = direction;
gParkEntranceGhostExists = true;
}
return result;
y,
z,
GAME_COMMAND_PLACE_PARK_ENTRANCE,
0,
0
);
if (result != MONEY32_UNDEFINED)
{
gParkEntranceGhostPosition.x = x;
gParkEntranceGhostPosition.y = y;
gParkEntranceGhostPosition.z = z;
gParkEntranceGhostDirection = direction;
gParkEntranceGhostExists = true;
}
return result;
}
sint32 park_get_entrance_index(sint32 x, sint32 y, sint32 z)
{
sint32 i;
sint32 i;
for (i = 0; i < MAX_PARK_ENTRANCES; i++) {
if (
x == gParkEntrances[i].x &&
y == gParkEntrances[i].y &&
z == gParkEntrances[i].z
) {
return i;
}
}
for (i = 0; i < MAX_PARK_ENTRANCES; i++)
{
if (x == gParkEntrances[i].x &&
y == gParkEntrances[i].y &&
z == gParkEntrances[i].z)
{
return i;
}
}
return -1;
return -1;
}
void reset_park_entrance()
{
for (sint32 i = 0; i < MAX_PARK_ENTRANCES; i++) {
for (sint32 i = 0; i < MAX_PARK_ENTRANCES; i++)
{
gParkEntrances[i].x = MAP_LOCATION_NULL;
}
}

2
src/openrct2/world/entrance.h
View File

@ -43,7 +43,7 @@ extern money32 gParkEntranceGhostPrice;
extern rct_xyzd16 gParkEntrances[MAX_PARK_ENTRANCES];
void park_entrance_ghost();
void park_entrance_remove_ghost();
money32 park_entrance_place_ghost(sint32 x, sint32 y, sint32 z, sint32 direction);
void reset_park_entrance();