(svn r15441) -Cleanup: Use a return value instead of passing a pointer to where the result should be stored.

3 files changed, 19 insertions, 19 deletions

diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 9cb6ad653..0c45c0cce 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -119,20 +119,19 @@ const char *AIFileInfo::GetMainScript()
 	return this->main_script;
 }
 
-void AIFileInfo::CheckMethods(SQInteger *res, const char *name)
+bool AIFileInfo::CheckMethod(const char *name)
 {
 	if (!this->engine->MethodExists(*this->SQ_instance, name)) {
 		char error[1024];
 		snprintf(error, sizeof(error), "your info.nut/library.nut doesn't have the method '%s'", name);
 		this->engine->ThrowError(error);
-		*res = SQ_ERROR;
+		return false;
 	}
+	return true;
 }
 
 /* static */ SQInteger AIFileInfo::Constructor(HSQUIRRELVM vm, AIFileInfo *info, bool library)
 {
-	SQInteger res = 0;
-
 	/* Set some basic info from the parent */
 	info->SQ_instance = MallocT<SQObject>(1);
 	Squirrel::GetInstance(vm, info->SQ_instance, 2);
@@ -141,21 +140,22 @@ void AIFileInfo::CheckMethods(SQInteger *res, const char *name)
 	info->base = ((AIScanner *)Squirrel::GetGlobalPointer(vm));
 	info->engine = info->base->GetEngine();
 
-	/* Check if all needed fields are there */
-	info->CheckMethods(&res, "GetAuthor");
-	info->CheckMethods(&res, "GetName");
-	info->CheckMethods(&res, "GetShortName");
-	info->CheckMethods(&res, "GetDescription");
-	info->CheckMethods(&res, "GetVersion");
-	info->CheckMethods(&res, "GetDate");
-	info->CheckMethods(&res, "CreateInstance");
+	static const char * const required_functions[] = {
+		"GetAuthor",
+		"GetName",
+		"GetShortName",
+		"GetDescription",
+		"GetVersion",
+		"GetDate",
+		"CreateInstance",
+	};
+	for (size_t i = 0; i < lengthof(required_functions); i++) {
+		if (!info->CheckMethod(required_functions[i])) return SQ_ERROR;
+	}
 	if (library) {
-		info->CheckMethods(&res, "GetCategory");
+		if (!info->CheckMethod("GetCategory")) return SQ_ERROR;
 	}
 
-	/* Abort if one method was missing */
-	if (res != 0) return res;
-
 	info->main_script = strdup(info->base->GetMainScript());
 
 	return 0;
diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.hpp
index 57317d3f0..b7ca5ad45 100644
--- a/src/ai/ai_info.hpp
+++ b/src/ai/ai_info.hpp
@@ -97,7 +97,7 @@ public:
 	/**
 	 * Check if a given method exists.
 	 */
-	void CheckMethods(SQInteger *res, const char *name);
+	bool CheckMethod(const char *name);
 
 	/**
 	 * Process the creation of a FileInfo object.
diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp
index 095aaa45f..83d356a3c 100644
--- a/src/ai/api/ai_industrytype.cpp
+++ b/src/ai/api/ai_industrytype.cpp
@@ -56,7 +56,7 @@
 	const IndustrySpec *ins = ::GetIndustrySpec(industry_type);
 
 	AIList *list = new AIList();
-	for (int i = 0; i < 2; i++) {
+	for (size_t i = 0; i < lengthof(ins->produced_cargo); i++) {
 		if (ins->produced_cargo[i] != CT_INVALID) list->AddItem(ins->produced_cargo[i], 0);
 	}
 
@@ -70,7 +70,7 @@
 	const IndustrySpec *ins = ::GetIndustrySpec(industry_type);
 
 	AIList *list = new AIList();
-	for (int i = 0; i < 3; i++) {
+	for (size_t i = 0; i < lengthof(ins->accepts_cargo); i++) {
 		if (ins->accepts_cargo[i] != CT_INVALID) list->AddItem(ins->accepts_cargo[i], 0);
 	}