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

(svn r14582) -Fix [FS#2392]: blank box on cost estimation of levelling a flat area. 

-Fix: make levelling, raising and lowering of an area behave the same.
This commit is contained in:
rubidium 2008-11-16 14:17:49 +00:00
parent ffa3ec54f9
commit cdfa2d68b1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lang/english.txt
View File

@ -1643,6 +1643,7 @@ STR_0805_ESTIMATED_COST :{WHITE}Estimate
STR_0807_ESTIMATED_INCOME :{WHITE}Estimated Income: {CURRENCY}
STR_0808_CAN_T_RAISE_LAND_HERE :{WHITE}Can't raise land here...
STR_0809_CAN_T_LOWER_LAND_HERE :{WHITE}Can't lower land here...
STR_CAN_T_LEVEL_LAND_HERE :{WHITE}Can't level land here...
STR_080A_ROCKS :Rocks
STR_080B_ROUGH_LAND :Rough land
STR_080C_BARE_LAND :Bare land
@ -1655,8 +1656,9 @@ STR_0810_DESERT :Desert
STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Land sloped in wrong direction
STR_1001_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Impossible track combination
STR_1002_EXCAVATION_WOULD_DAMAGE :{WHITE}Excavation would damage tunnel
STR_1003_ALREADY_AT_SEA_LEVEL :{WHITE}Already at sea-level
STR_1004_TOO_HIGH :{WHITE}Too high
STR_1003_ALREADY_AT_SEA_LEVEL :{WHITE}... already at sea level
STR_1004_TOO_HIGH :{WHITE}... too high
STR_ALREADY_LEVELLED :{WHITE}... already flat
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}No suitable railway track
STR_1007_ALREADY_BUILT :{WHITE}...already built
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Must remove railway track first

1
src/terraform_cmd.cpp
View File

@ -359,6 +359,7 @@ CommandCost CmdLevelLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
/* Check range of destination height */
if (h > MAX_TILE_HEIGHT) return_cmd_error((oldh == 0) ? STR_1003_ALREADY_AT_SEA_LEVEL : STR_1004_TOO_HIGH);
if (p2 == 0) _error_message = STR_ALREADY_LEVELLED;
/* make sure sx,sy are smaller than ex,ey */
int ex = TileX(tile);

2
src/terraform_gui.cpp
View File

@ -123,7 +123,7 @@ bool GUIPlaceProcDragXY(ViewportDragDropSelectionProcess proc, TileIndex start_t
DoCommandP(end_tile, start_tile, (uint32)-1, CcTerraform, CMD_LEVEL_LAND | CMD_MSG(STR_0809_CAN_T_LOWER_LAND_HERE));
break;
case DDSP_LEVEL_AREA:
DoCommandP(end_tile, start_tile, 0, CcPlaySound10, CMD_LEVEL_LAND);
DoCommandP(end_tile, start_tile, 0, CcPlaySound10, CMD_LEVEL_LAND | CMD_MSG(STR_CAN_T_LEVEL_LAND_HERE));
break;
case DDSP_CREATE_ROCKS:
GenerateRockyArea(end_tile, start_tile);