(svn r23777) -Codechange: refactor allocating memory and fetching strings into a single function for scripts

2012-01-08 21:48:05 +00:00
parent ab38e3227d
commit 4479f90843
14 changed files with 27 additions and 60 deletions
--- a/src/script/api/script_industry.cpp
+++ b/src/script/api/script_industry.cpp
@@ -38,13 +38,9 @@
 /* static */ char *ScriptIndustry::GetName(IndustryID industry_id)
 {
 	if (!IsValidIndustry(industry_id)) return NULL;
-	static const int len = 64;
-	char *industry_name = MallocT<char>(len);

 	::SetDParam(0, industry_id);
-	::GetString(industry_name, STR_INDUSTRY_NAME, &industry_name[len - 1]);
-
-	return industry_name;
+	return GetString(STR_INDUSTRY_NAME);
 }

 /* static */ ScriptIndustry::CargoAcceptState ScriptIndustry::IsCargoAccepted(IndustryID industry_id, CargoID cargo_id)