cpp/openttd-patchpack/source Changeset - r16416:c3fdb9143278

Changeset - r16416:c3fdb9143278

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-11-10 23:43:14
rubidium@openttd.org

(svn r21142) -Codechange: replace magic bridge length constants with proper constants (uni657)

3 files changed with 7 insertions and 4 deletions:

src/ai/api/ai_bridge.cpp

src/bridge.h

src/tunnelbridge_cmd.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_bridge.cpp

➞

Show inline comments

@@ @@ -152,7 +152,7 @@ static void _DoCommandReturnBuildBridge1 @@
 	if (!IsValidBridge(bridge_id)) return -1;
 	uint max = ::GetBridgeSpec(bridge_id)->max_length;
-	if (max >= 16 && _settings_game.construction.longbridges) max = 100;
+	if (max >= MAX_BRIDGE_LENGTH && _settings_game.construction.longbridges) max = MAX_BRIDGE_LENGTH_LONGBRIDGES;
 	return max + 2;
+}

src/bridge.h

➞

Show inline comments

@@ @@ -72,4 +72,7 @@ int CalcBridgeLenCostFactor(int x); @@
 void ResetBridges();
 static const uint MAX_BRIDGE_LENGTH             =  16; ///< Maximum length of the bridge
 static const uint MAX_BRIDGE_LENGTH_LONGBRIDGES = 100; ///< Maximum length of the bridge with longbridges enabled
 #endif /* BRIDGE_H */

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -173,7 +173,7 @@ static CommandCost CheckBridgeSlopeSouth @@
 CommandCost CheckBridgeAvailability(BridgeType bridge_type, uint bridge_len, DoCommandFlag flags)
+{
 	if (flags & DC_QUERY_COST) {
-		if (bridge_len <= (_settings_game.construction.longbridges ? 100U : 16U)) return CommandCost();
+		if (bridge_len <= (_settings_game.construction.longbridges ? MAX_BRIDGE_LENGTH_LONGBRIDGES : MAX_BRIDGE_LENGTH)) return CommandCost();
 		return_cmd_error(STR_ERROR_BRIDGE_TOO_LONG);
+	}
@@ @@ -183,7 +183,7 @@ CommandCost CheckBridgeAvailability(Brid @@
 	if (b->avail_year > _cur_year) return CMD_ERROR;
 	uint max = b->max_length;
-	if (max >= 16 && _settings_game.construction.longbridges) max = 100;
+	if (max >= MAX_BRIDGE_LENGTH && _settings_game.construction.longbridges) max = MAX_BRIDGE_LENGTH_LONGBRIDGES;
 	if (b->min_length > bridge_len) return CMD_ERROR;
 	if (bridge_len <= max) return CommandCost();
@@ @@ -257,7 +257,7 @@ CommandCost CmdBuildBridge(TileIndex end @@
 		CommandCost ret = CheckBridgeAvailability(bridge_type, bridge_len, flags);
 		if (ret.Failed()) return ret;
 	} else {
-		if (bridge_len > (_settings_game.construction.longbridges ? 100U : 16U)) return_cmd_error(STR_ERROR_BRIDGE_TOO_LONG);
+		if (bridge_len > (_settings_game.construction.longbridges ? MAX_BRIDGE_LENGTH_LONGBRIDGES : MAX_BRIDGE_LENGTH)) return_cmd_error(STR_ERROR_BRIDGE_TOO_LONG);
+	}
 	uint z_start;

0 comments (0 inline, 0 general)