cpp/openttd-patchpack/source Changeset - r10331:6aba91f3f8fa

Changeset - r10331:6aba91f3f8fa

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-11-16 14:17:49
rubidium@openttd.org

(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.

3 files changed with 6 insertions and 3 deletions:

src/lang/english.txt

src/terraform_cmd.cpp

src/terraform_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -1640,26 +1640,28 @@ STR_0803_INCOME @@
 STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Transfer: {CURRENCY}
 STR_FEEDER                                                      :{YELLOW}Transfer: {CURRENCY}
 STR_0805_ESTIMATED_COST                                         :{WHITE}Estimated Cost: {CURRENCY}
 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
 STR_080D_GRASS                                                  :Grass
 STR_080E_FIELDS                                                 :Fields
 STR_080F_SNOW_COVERED_LAND                                      :Snow-covered land
 STR_0810_DESERT                                                 :Desert
 ##id 0x1000
 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
 STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Road is one way or blocked
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Railway Construction
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Electrified Railway Construction

src/terraform_cmd.cpp

➞

Show inline comments

@@ @@ -356,12 +356,13 @@ CommandCost CmdLevelLand(TileIndex tile, @@
 	/* compute new height */
 	uint h = oldh + 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);
 	int ey = TileY(tile);
 	int sx = TileX(p1);
 	int sy = TileY(p1);

src/terraform_gui.cpp

➞

Show inline comments

@@ @@ -120,13 +120,13 @@ bool GUIPlaceProcDragXY(ViewportDragDrop @@
 			DoCommandP(end_tile, start_tile, 1, CcTerraform, CMD_LEVEL_LAND | CMD_MSG(STR_0808_CAN_T_RAISE_LAND_HERE));
 			break;
 		case DDSP_LOWER_AND_LEVEL_AREA:
 			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);
 			break;
 		case DDSP_CREATE_DESERT:
 			GenerateDesertArea(end_tile, start_tile);

0 comments (0 inline, 0 general)