mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Use other game commands for error messages

Browse Source 
Errors in game_command_raise/lower_land will now be passed on in
smooth_land. Removes need for error checking elsewhere
This commit is contained in:
jensj12
2017-07-13 18:23:58 +02:00
parent 1b69fe485f
commit f2df2c80d2
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/world/map.c
View File

@@ -2220,18 +2220,10 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32
if (commandType == GAME_COMMAND_RAISE_LAND) {
minHeight += 2;
maxHeight += 2;
if (minHeight > MAXIMUM_LAND_HEIGHT) {
gGameCommandErrorText = STR_TOO_HIGH;
return MONEY32_UNDEFINED;
}
}
else {
maxHeight -= 2;
minHeight -= 2;
if (maxHeight < MINIMUM_LAND_HEIGHT) {
gGameCommandErrorText = STR_TOO_LOW;
return MONEY32_UNDEFINED;
}
}
}
else
@@ -2245,10 +2237,6 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32
newBaseZ += 2;
newSlope &= ~0x20;
}
if (map_get_corner_height(newBaseZ, newSlope, command & 0xFF) > MAXIMUM_LAND_HEIGHT) {
gGameCommandErrorText = STR_TOO_HIGH;
return MONEY32_UNDEFINED;
}
}
else {
newSlope = map_element_lower_styles[command & 0xFF][newSlope];
@@ -2256,10 +2244,6 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32
newBaseZ -= 2;
newSlope &= ~0x20;
}
if (newBaseZ < MINIMUM_LAND_HEIGHT) {
gGameCommandErrorText = STR_TOO_LOW;
return MONEY32_UNDEFINED;
}
}
}
@@ -2456,6 +2440,8 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32
result = game_do_command(centreX, flags, centreY, mapLeftRight, commandType, command & 0x7FFF, mapTopBottom);
if (result != MONEY32_UNDEFINED) {
totalCost += result;
} else {
return MONEY32_UNDEFINED;
}
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING;