Mercurial > hg > openttd

changeset 15291:90225375fccd draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19930) -Codechange: Deduplicate magic command parameter casts. (rubidium)
author frosch <frosch@openttd.org>
date Sat, 05 Jun 2010 11:51:34 +0000
parents e689480aad70
children e2c62d70dfcf
files src/misc_cmd.cpp
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -222,14 +222,15 @@
 
 	const Company *c = Company::Get(_current_company);
 	CommandCost amount(EXPENSES_OTHER, min((Money)p1, (Money)20000000LL));
+	CompanyID dest_company = (CompanyID)p2;
 
 	/* You can only transfer funds that is in excess of your loan */
 	if (c->money - c->current_loan < amount.GetCost() || amount.GetCost() < 0) return CMD_ERROR;
-	if (!_networking || !Company::IsValidID((CompanyID)p2)) return CMD_ERROR;
+	if (!_networking || !Company::IsValidID(dest_company)) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
 		/* Add money to company */
-		Backup<CompanyByte> cur_company(_current_company, (CompanyID)p2);
+		Backup<CompanyByte> cur_company(_current_company, dest_company);
 		SubtractMoneyFromCompany(CommandCost(EXPENSES_OTHER, -amount.GetCost()));
 		cur_company.Restore();
 	}