src/ai/api/ai_company.cpp
branchnoai
changeset 9696 4384ed3de1f0
parent 9668 6fe3d2cb9655
child 9701 d1ac22c62f64
--- a/src/ai/api/ai_company.cpp	Sun Aug 19 13:01:41 2007 +0000
+++ b/src/ai/api/ai_company.cpp	Sun Aug 19 13:16:06 2007 +0000
@@ -28,16 +28,13 @@
 char *AICompany::GetCompanyName(AICompany::CompanyIndex company)
 {
 	company = this->ResolveCompanyIndex(company);
+	if (company == INVALID_COMPANY) return NULL;
 
 	static const int len = 64;
 	char *company_name = MallocT<char>(len);
-	if (company != INVALID_COMPANY) {
-		SetDParam(0, GetPlayer((PlayerID)company)->index);
-		GetString(company_name, STR_COMPANY_NAME, &company_name[len - 1]);
-	} else {
-		*company_name = '\0';
-	}
 
+	SetDParam(0, GetPlayer((PlayerID)company)->index);
+	GetString(company_name, STR_COMPANY_NAME, &company_name[len - 1]);
 	return company_name;
 }