mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26585) -Fix/Feature [FS#5942]: don't truncate money to 32 bits

release/1.5
rubidium 2014-05-11 20:25:26 +00:00
parent 39e90ec6e0
commit 691c22ac6a
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/script/api/script_company.cpp
View File

@ -196,11 +196,11 @@
return LOAN_INTERVAL; return LOAN_INTERVAL;
} }
/* static */ bool ScriptCompany::SetLoanAmount(int32 loan) /* static */ bool ScriptCompany::SetLoanAmount(Money loan)
{ {
EnforcePrecondition(false, ScriptObject::GetCompany() != OWNER_DEITY); EnforcePrecondition(false, ScriptObject::GetCompany() != OWNER_DEITY);
EnforcePrecondition(false, loan >= 0); EnforcePrecondition(false, loan >= 0);
EnforcePrecondition(false, (loan % GetLoanInterval()) == 0); EnforcePrecondition(false, ((int64)loan % GetLoanInterval()) == 0);
EnforcePrecondition(false, loan <= GetMaxLoanAmount()); EnforcePrecondition(false, loan <= GetMaxLoanAmount());
EnforcePrecondition(false, (loan - GetLoanAmount() + GetBankBalance(COMPANY_SELF)) >= 0); EnforcePrecondition(false, (loan - GetLoanAmount() + GetBankBalance(COMPANY_SELF)) >= 0);
@ -211,12 +211,12 @@
(loan > GetLoanAmount()) ? CMD_INCREASE_LOAN : CMD_DECREASE_LOAN); (loan > GetLoanAmount()) ? CMD_INCREASE_LOAN : CMD_DECREASE_LOAN);
} }
/* static */ bool ScriptCompany::SetMinimumLoanAmount(int32 loan) /* static */ bool ScriptCompany::SetMinimumLoanAmount(Money loan)
{ {
EnforcePrecondition(false, ScriptObject::GetCompany() != OWNER_DEITY); EnforcePrecondition(false, ScriptObject::GetCompany() != OWNER_DEITY);
EnforcePrecondition(false, loan >= 0); EnforcePrecondition(false, loan >= 0);
int32 over_interval = loan % GetLoanInterval(); Money over_interval = (int64)loan % GetLoanInterval();
if (over_interval != 0) loan += GetLoanInterval() - over_interval; if (over_interval != 0) loan += GetLoanInterval() - over_interval;
EnforcePrecondition(false, loan <= GetMaxLoanAmount()); EnforcePrecondition(false, loan <= GetMaxLoanAmount());
@ -226,10 +226,12 @@
return GetLoanAmount() == loan; return GetLoanAmount() == loan;
} }
/* static */ bool ScriptCompany::ChangeBankBalance(CompanyID company, int32 delta, ExpensesType expenses_type) /* static */ bool ScriptCompany::ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type)
{ {
EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY); EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY);
EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END); EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END);
EnforcePrecondition(false, delta >= INT32_MIN);
EnforcePrecondition(false, delta <= INT32_MAX);
company = ResolveCompanyID(company); company = ResolveCompanyID(company);
EnforcePrecondition(false, company != COMPANY_INVALID); EnforcePrecondition(false, company != COMPANY_INVALID);
@ -280,12 +282,14 @@
return ::Company::Get((CompanyID)company)->settings.engine_renew_months; return ::Company::Get((CompanyID)company)->settings.engine_renew_months;
} }
/* static */ bool ScriptCompany::SetAutoRenewMoney(uint32 money) /* static */ bool ScriptCompany::SetAutoRenewMoney(Money money)
{ {
EnforcePrecondition(false, money >= 0);
EnforcePrecondition(false, (int64)money <= UINT32_MAX);
return ScriptObject::DoCommand(0, ::GetCompanySettingIndex("company.engine_renew_money"), money, CMD_CHANGE_COMPANY_SETTING); return ScriptObject::DoCommand(0, ::GetCompanySettingIndex("company.engine_renew_money"), money, CMD_CHANGE_COMPANY_SETTING);
} }
/* static */ uint32 ScriptCompany::GetAutoRenewMoney(CompanyID company) /* static */ Money ScriptCompany::GetAutoRenewMoney(CompanyID company)
{ {
company = ResolveCompanyID(company); company = ResolveCompanyID(company);
if (company == COMPANY_INVALID) return 0; if (company == COMPANY_INVALID) return 0;

14
src/script/api/script_company.hpp
View File

@ -145,7 +145,7 @@ public:
* @game @pre Valid ScriptCompanyMode active in scope. * @game @pre Valid ScriptCompanyMode active in scope.
* @return True if the loan could be set to your requested amount. * @return True if the loan could be set to your requested amount.
*/ */
static bool SetLoanAmount(int32 loan); static bool SetLoanAmount(Money loan);
/** /**
* Sets the minimum amount to loan, i.e. the given amount of loan rounded up. * Sets the minimum amount to loan, i.e. the given amount of loan rounded up.
@ -155,7 +155,7 @@ public:
* @game @pre Valid ScriptCompanyMode active in scope. * @game @pre Valid ScriptCompanyMode active in scope.
* @return True if we could allocate a minimum of 'loan' loan. * @return True if we could allocate a minimum of 'loan' loan.
*/ */
static bool SetMinimumLoanAmount(int32 loan); static bool SetMinimumLoanAmount(Money loan);
/** /**
* Gets the amount your company have loaned. * Gets the amount your company have loaned.
@ -194,10 +194,12 @@ public:
* @param expenses_type The account in the finances window that will register the cost. * @param expenses_type The account in the finances window that will register the cost.
* @game @pre No ScriptCompanyMode active in scope. * @game @pre No ScriptCompanyMode active in scope.
* @pre ResolveCompanyID(company) != COMPANY_INVALID. * @pre ResolveCompanyID(company) != COMPANY_INVALID.
* @pre delta >= -2**31
* @pre delta < 2**31
* @note You need to create your own news message to inform about costs/gifts that you create using this command. * @note You need to create your own news message to inform about costs/gifts that you create using this command.
* @api -ai * @api -ai
*/ */
static bool ChangeBankBalance(CompanyID company, int32 delta, ExpensesType expenses_type); static bool ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type);
/** /**
* Get the income of the company in the given quarter. * Get the income of the company in the given quarter.
@ -314,9 +316,11 @@ public:
* Set the minimum money needed to autorenew an engine for your company. * Set the minimum money needed to autorenew an engine for your company.
* @param money The new minimum required money for autorenew to work. * @param money The new minimum required money for autorenew to work.
* @return True if autorenew money has been modified. * @return True if autorenew money has been modified.
* @pre money >= 0
* @pre money < 2**32
* @api -game * @api -game
*/ */
static bool SetAutoRenewMoney(uint32 money); static bool SetAutoRenewMoney(Money money);
/** /**
* Return the minimum money needed to autorenew an engine for a company. * Return the minimum money needed to autorenew an engine for a company.
@ -324,7 +328,7 @@ public:
* @pre ResolveCompanyID(company) != COMPANY_INVALID. * @pre ResolveCompanyID(company) != COMPANY_INVALID.
* @return The minimum required money for autorenew to work. * @return The minimum required money for autorenew to work.
*/ */
static uint32 GetAutoRenewMoney(CompanyID company); static Money GetAutoRenewMoney(CompanyID company);
}; };
DECLARE_POSTFIX_INCREMENT(ScriptCompany::CompanyID) DECLARE_POSTFIX_INCREMENT(ScriptCompany::CompanyID)

6
src/script/squirrel_helper.hpp
View File

@ -85,8 +85,8 @@ namespace SQConvert {
template <> inline int Return<int8> (HSQUIRRELVM vm, int8 res) { sq_pushinteger(vm, res); return 1; } template <> inline int Return<int8> (HSQUIRRELVM vm, int8 res) { sq_pushinteger(vm, res); return 1; }
template <> inline int Return<int16> (HSQUIRRELVM vm, int16 res) { sq_pushinteger(vm, res); return 1; } template <> inline int Return<int16> (HSQUIRRELVM vm, int16 res) { sq_pushinteger(vm, res); return 1; }
template <> inline int Return<int32> (HSQUIRRELVM vm, int32 res) { sq_pushinteger(vm, res); return 1; } template <> inline int Return<int32> (HSQUIRRELVM vm, int32 res) { sq_pushinteger(vm, res); return 1; }
template <> inline int Return<int64> (HSQUIRRELVM vm, int64 res) { sq_pushinteger(vm, ClampToI32(res)); return 1; } template <> inline int Return<int64> (HSQUIRRELVM vm, int64 res) { sq_pushinteger(vm, res); return 1; }
template <> inline int Return<Money> (HSQUIRRELVM vm, Money res) { sq_pushinteger(vm, ClampToI32(res)); return 1; } template <> inline int Return<Money> (HSQUIRRELVM vm, Money res) { sq_pushinteger(vm, res); return 1; }
template <> inline int Return<bool> (HSQUIRRELVM vm, bool res) { sq_pushbool (vm, res); return 1; } template <> inline int Return<bool> (HSQUIRRELVM vm, bool res) { sq_pushbool (vm, res); return 1; }
template <> inline int Return<char *> (HSQUIRRELVM vm, char *res) { if (res == NULL) sq_pushnull(vm); else { sq_pushstring(vm, OTTD2SQ(res), -1); free(res); } return 1; } template <> inline int Return<char *> (HSQUIRRELVM vm, char *res) { if (res == NULL) sq_pushnull(vm); else { sq_pushstring(vm, OTTD2SQ(res), -1); free(res); } return 1; }
template <> inline int Return<const char *>(HSQUIRRELVM vm, const char *res) { if (res == NULL) sq_pushnull(vm); else { sq_pushstring(vm, OTTD2SQ(res), -1); } return 1; } template <> inline int Return<const char *>(HSQUIRRELVM vm, const char *res) { if (res == NULL) sq_pushnull(vm); else { sq_pushstring(vm, OTTD2SQ(res), -1); } return 1; }
@ -104,6 +104,8 @@ namespace SQConvert {
template <> inline int8 GetParam(ForceType<int8> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; } template <> inline int8 GetParam(ForceType<int8> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; }
template <> inline int16 GetParam(ForceType<int16> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; } template <> inline int16 GetParam(ForceType<int16> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; }
template <> inline int32 GetParam(ForceType<int32> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; } template <> inline int32 GetParam(ForceType<int32> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; }
template <> inline int64 GetParam(ForceType<int64> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; }
template <> inline Money GetParam(ForceType<Money> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger (vm, index, &tmp); return tmp; }
template <> inline bool GetParam(ForceType<bool> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQBool tmp; sq_getbool (vm, index, &tmp); return tmp != 0; } template <> inline bool GetParam(ForceType<bool> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQBool tmp; sq_getbool (vm, index, &tmp); return tmp != 0; }
template <> inline void *GetParam(ForceType<void *> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer tmp; sq_getuserpointer(vm, index, &tmp); return tmp; } template <> inline void *GetParam(ForceType<void *> , HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer tmp; sq_getuserpointer(vm, index, &tmp); return tmp; }
template <> inline const char *GetParam(ForceType<const char *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) template <> inline const char *GetParam(ForceType<const char *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr)