petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3313) Remove GPMI related changes from trunk

Browse Source 
Revisions in detail: 2542, 3226 (partial), 3229, 3231, 3232, 3238, 3242-3245, 3251, 3253, 3260, 3263, 3265, 3266, 3269, 3277, 3278, 3279, 3283 (partial), 3304, 3305, 3306
This commit is contained in:
tron
2005-12-18 12:10:46 +00:00
parent 2956b119b2
commit b06b3e2ca2
17 changed files with 24 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
misc_cmd.c
View File

@@ -13,7 +13,6 @@
#include "economy.h"
#include "network.h"
#include "variables.h"
#include "ai/ai.h"
/** Change the player's face.
* @param x,y unused
@@ -76,7 +75,7 @@ int32 CmdIncreaseLoan(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (flags & DC_EXEC) {
/* Loan the maximum amount or not? */
int32 loan = (p2) ? _economy.max_loan - p->current_loan : (IS_HUMAN_PLAYER(_current_player) || _patches.ainew_active || _ai.gpmi) ? 10000 : 50000;
int32 loan = (p2) ? _economy.max_loan - p->current_loan : (IS_HUMAN_PLAYER(_current_player) || _patches.ainew_active) ? 10000 : 50000;
p->money64 += loan;
p->current_loan += loan;
@@ -110,7 +109,7 @@ int32 CmdDecreaseLoan(int x, int y, uint32 flags, uint32 p1, uint32 p2)
loan = max(loan, 10000);
loan -= loan % 10000;
} else {
loan = min(loan, (IS_HUMAN_PLAYER(_current_player) || _patches.ainew_active || _ai.gpmi) ? 10000 : 50000);
loan = min(loan, (IS_HUMAN_PLAYER(_current_player) || _patches.ainew_active) ? 10000 : 50000);
}
if (p->player_money < loan) {