mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-29 09:29:10 +00:00
Code Issues Activity

(svn r2384) - Fix: Check selling land and setting player colour. Also an extra map-bounds check for terraforming; inspired by the monkey (and Tron :) )

Browse Source
This commit is contained in:
Darkvater
2005-05-30 15:50:20 +00:00
parent 00cf2eae38
commit 0cd53574ec
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
misc_cmd.c
View File

@@ -33,18 +33,21 @@ int32 CmdSetPlayerFace(int x, int y, uint32 flags, uint32 p1, uint32 p2)
int32 CmdSetPlayerColor(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{
Player *p, *pp;
byte colour = (byte)p2;
if (p2 >= 16) return CMD_ERROR; // max 16 colours
p = GetPlayer(_current_player);
/* Ensure no two companies have the same colour */
FOR_ALL_PLAYERS(pp) {
if (pp->is_active && pp != p && pp->player_color == (byte)p2)
if (pp->is_active && pp != p && pp->player_color == colour)
return CMD_ERROR;
}
if (flags & DC_EXEC) {
_player_colors[_current_player] = (byte)p2;
p->player_color = (byte)p2;
_player_colors[_current_player] = colour;
p->player_color = colour;
MarkWholeScreenDirty();
}
return 0;