cpp/openttd-patchpack/source Changeset - r7989:b4c8c33d9441

Changeset - r7989:b4c8c33d9441

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

belugas - 16 years ago 2007-12-01 02:59:22
belugas@openttd.org

(svn r11545) -Revert(r11543): The result is not what was expected. Looks like more work might be needed

2 files changed with 1 insertions and 2 deletions:

src/industry_cmd.cpp

src/lang/english.txt

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1235,13 +1235,13 @@ static bool CheckIfIndustryTilesAreFree( @@
 				Slope tileh = GetTileSlope(cur_tile, NULL);
 				refused_slope |= IsSlopeRefused(tileh, its->slopes_refused);
+			}
 			if (ind_behav & (INDUSTRYBEH_ONLY_INTOWN | INDUSTRYBEH_TOWN1200_MORE)) {
 				if (!IsTileType(cur_tile, MP_HOUSE)) {
-					_error_message = STR_INDUSTRY_MUST_BE_BUILT_ON_HOUSE;
+					_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS;
 					return false;
+				}
 				if (CmdFailed(DoCommand(cur_tile, 0, 0, 0, CMD_LANDSCAPE_CLEAR))) return false;
 			} else if ((ind_behav & INDUSTRYBEH_ONLY_NEARTOWN) == 0 || !IsTileType(cur_tile, MP_HOUSE)) {
 				if (CmdFailed(DoCommand(cur_tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR))) return false;
+			}

src/lang/english.txt

➞

Show inline comments

@@ @@ -746,13 +746,12 @@ STR_0299_SAVE_SCENARIO @@
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Play Scenario
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Play Heightmap
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Start a new game, using a heightmap as landscape
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Are you sure you want to quit this scenario ?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Quit Editor
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...can only be built in towns with a population of at least 1200
 STR_INDUSTRY_MUST_BE_BUILT_ON_HOUSE                             :{WHITE}...can only be built over a house
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Move the starting date backward 1 year
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Move the starting date forward 1 year
 STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...ends of bridge must both be on land
 STR_02A1_SMALL                                                  :{BLACK}Small
 STR_02A2_MEDIUM                                                 :{BLACK}Medium
 STR_02A3_LARGE                                                  :{BLACK}Large

0 comments (0 inline, 0 general)