gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19773) -Add: [NoAI] AIIndustry::GetIndustryID(TileIndex)

Browse Source
This commit is contained in:
yexo 2010-05-09 15:59:30 +00:00
parent 96c1fd6173
commit 37928e29f7
6 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ai/regression/regression.nut
View File

@ -605,6 +605,8 @@ function Regression::Industry()
}
print(" Valid Industries: " + j);
print(" GetIndustryCount(): " + AIIndustry.GetIndustryCount());
print(" GetIndustryID(): " + AIIndustry.GetIndustryID(19694));
print(" GetIndustryID(): " + AIIndustry.GetIndustryID(19695));
}
function Regression::IndustryList()

2
bin/ai/regression/regression.txt
View File

@ -6548,6 +6548,8 @@ ERROR: IsEnd() is invalid as Begin() is never called
GetStockpiledCargo(): 0
Valid Industries: 71
GetIndustryCount(): 71
GetIndustryID(): 65535
GetIndustryID(): 0
--IndustryList--
Count(): 71

1
src/ai/api/ai_changelog.hpp
View File

@ -20,6 +20,7 @@
*
* API additions:
* \li IsEnd for all lists.
* \li AIIndustry::GetIndustryID
* \li AIRail::GetMaxSpeed
*
* API removals:

6
src/ai/api/ai_industry.cpp
View File

@ -27,6 +27,12 @@
return ::Industry::IsValidID(industry_id);
}
/* static */ IndustryID AIIndustry::GetIndustryID(TileIndex tile)
{
if (!::IsValidTile(tile) || !::IsTileType(tile, MP_INDUSTRY)) return INVALID_INDUSTRY;
return ::GetIndustryIndex(tile);
}
/* static */ char *AIIndustry::GetName(IndustryID industry_id)
{
if (!IsValidIndustry(industry_id)) return NULL;

10
src/ai/api/ai_industry.hpp
View File

@ -36,6 +36,16 @@ public:
*/
static bool IsValidIndustry(IndustryID industry_id);
/**
* Get the IndustryID of a tile, if there is an industry.
* @param tile The tile to find the IndustryID of.
* @return IndustryID of the industry.
* @post Use IsValidIndustry() to see if the industry is valid.
* @note GetIndustryID will return an invalid IndustryID for the
* station tile of industries with a dock/heliport.
*/
static IndustryID GetIndustryID(TileIndex tile);
/**
* Get the name of the industry.
* @param industry_id The industry to get the name of.

1
src/ai/api/ai_industry.hpp.sq
View File

@ -28,6 +28,7 @@ void SQAIIndustry_Register(Squirrel *engine)
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetIndustryCount, "GetIndustryCount", 1, ".");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::IsValidIndustry, "IsValidIndustry", 2, ".i");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetIndustryID, "GetIndustryID", 2, ".i");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetName, "GetName", 2, ".i");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::IsCargoAccepted, "IsCargoAccepted", 3, ".ii");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetStockpiledCargo, "GetStockpiledCargo", 3, ".ii");