diff options
| author | tron <tron@openttd.org> | 2005-05-06 06:56:30 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-05-06 06:56:30 +0000 |
| commit | d17476b058fb877484159bec0b725d1be5a6d68f (patch) | |
| tree | ec6a2e5ec15ed8e58408a2c562f10913bb6382e8 /misc_cmd.c | |
| parent | 203a84dd0b4f1fd7397052d3a645731eaeb5ebd7 (diff) | |
| download | openttd-d17476b058fb877484159bec0b725d1be5a6d68f.tar.xz | |
(svn r2271) CMD_SET_PLAYER_FACE, CMD_SET_PLAYER_COLOR, CMD_INCREASE_LOAN, CMD_DECREASE_LOAN only make sense for the current player, so don't explicitly pass a player number
Diffstat (limited to 'misc_cmd.c')
| -rw-r--r-- | misc_cmd.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/misc_cmd.c b/misc_cmd.c index c7e60a2ec..1e84edeed 100644 --- a/misc_cmd.c +++ b/misc_cmd.c @@ -18,7 +18,7 @@ int32 CmdSetPlayerFace(int x, int y, uint32 flags, uint32 p1, uint32 p2) { if (flags & DC_EXEC) { - DEREF_PLAYER(p1)->face = p2; + GetPlayer(_current_player)->face = p2; MarkWholeScreenDirty(); } return 0; @@ -31,11 +31,7 @@ int32 CmdSetPlayerColor(int x, int y, uint32 flags, uint32 p1, uint32 p2) { Player *p,*pp; -// /* can only set color for itself */ -// if ( (byte)p1 != _current_player) -// return CMD_ERROR; - - p = DEREF_PLAYER(p1); + p = GetPlayer(_current_player); /* ensure no dups */ FOR_ALL_PLAYERS(pp) { @@ -44,7 +40,7 @@ int32 CmdSetPlayerColor(int x, int y, uint32 flags, uint32 p1, uint32 p2) } if (flags & DC_EXEC) { - _player_colors[p1] = (byte)p2; + _player_colors[_current_player] = (byte)p2; p->player_color = (byte)p2; MarkWholeScreenDirty(); } @@ -56,10 +52,7 @@ int32 CmdIncreaseLoan(int x, int y, uint32 flags, uint32 p1, uint32 p2) Player *p; int32 size; - if ( (byte)p1 != _current_player) - return CMD_ERROR; - - p = DEREF_PLAYER(p1); + p = GetPlayer(_current_player); if (p->current_loan >= _economy.max_loan) { SetDParam(0, _economy.max_loan); @@ -70,7 +63,7 @@ int32 CmdIncreaseLoan(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (p2) size = _economy.max_loan - p->current_loan; else - size = IS_HUMAN_PLAYER((byte)p1) ? 10000 : 50000; + size = IS_HUMAN_PLAYER(_current_player) ? 10000 : 50000; p->money64 += size; p->current_loan += size; @@ -85,10 +78,8 @@ int32 CmdDecreaseLoan(int x, int y, uint32 flags, uint32 p1, uint32 p2) { Player *p; int32 size; - if ( (byte)p1 != _current_player) - return CMD_ERROR; - p = DEREF_PLAYER(p1); + p = GetPlayer(_current_player); if (p->current_loan == 0) return_cmd_error(STR_702D_LOAN_ALREADY_REPAYED); @@ -100,7 +91,7 @@ int32 CmdDecreaseLoan(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (_patches.ainew_active) size = min(size, 10000); else - size = min(size, IS_HUMAN_PLAYER((byte)p1) ? 10000 : 50000); + size = min(size, IS_HUMAN_PLAYER(_current_player) ? 10000 : 50000); } else { // only repay in chunks of 10K size = min(size, p->player_money); size = max(size, 10000); |