mirror of https://github.com/OpenTTD/OpenTTD
(svn r16308) -Fix: parameter is invalid when it's equal to length of an array (Yexo)
parent
b3a539b016
commit
683a6ca039
|
@ -1820,7 +1820,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
|
||||||
if (distant_join && (!_settings_game.station.distant_join_stations || !IsValidStationID(station_to_join))) return CMD_ERROR;
|
if (distant_join && (!_settings_game.station.distant_join_stations || !IsValidStationID(station_to_join))) return CMD_ERROR;
|
||||||
|
|
||||||
/* Check if a valid, buildable airport was chosen for construction */
|
/* Check if a valid, buildable airport was chosen for construction */
|
||||||
if (p1 > lengthof(_airport_sections) || !HasBit(GetValidAirports(), p1)) return CMD_ERROR;
|
if (p1 >= lengthof(_airport_sections) || !HasBit(GetValidAirports(), p1)) return CMD_ERROR;
|
||||||
|
|
||||||
if (!CheckIfAuthorityAllowsNewStation(tile, flags)) {
|
if (!CheckIfAuthorityAllowsNewStation(tile, flags)) {
|
||||||
return CMD_ERROR;
|
return CMD_ERROR;
|
||||||
|
|
|
@ -2553,7 +2553,7 @@ uint GetMaskOfTownActions(int *nump, CompanyID cid, const Town *t)
|
||||||
*/
|
*/
|
||||||
CommandCost CmdDoTownAction(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
CommandCost CmdDoTownAction(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
||||||
{
|
{
|
||||||
if (!IsValidTownID(p1) || p2 > lengthof(_town_action_proc)) return CMD_ERROR;
|
if (!IsValidTownID(p1) || p2 >= lengthof(_town_action_proc)) return CMD_ERROR;
|
||||||
|
|
||||||
Town *t = GetTown(p1);
|
Town *t = GetTown(p1);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue