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

(svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals 

While here rewrite parts of the function to (hopefully) increase clarity
release/0.4.5
tron 2005-03-23 20:02:28 +00:00
parent 22c4924040
commit 71dba5f511
1 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
rail_cmd.c
View File

@ -41,6 +41,10 @@ enum { /* These values are bitmasks for the map5 byte */
RAIL_TYPE_WAYPOINT = 0xC4, RAIL_TYPE_WAYPOINT = 0xC4,
RAIL_WAYPOINT_TRACK_MASK = 1, RAIL_WAYPOINT_TRACK_MASK = 1,
RAIL_WAYPOINT_UNUSED_BITS = 0x3E, RAIL_WAYPOINT_UNUSED_BITS = 0x3E,
RAIL_SUBTYPE_MASK = 0x3C,
RAIL_SUBTYPE_DEPOT = 0x00,
RAIL_SUBTYPE_WAYPOINT = 0x04
}; };
#define IS_RAIL_DEPOT(x) (((x) & (RAIL_TYPE_DEPOT|RAIL_DEPOT_UNUSED_BITS)) == RAIL_TYPE_DEPOT) #define IS_RAIL_DEPOT(x) (((x) & (RAIL_TYPE_DEPOT|RAIL_DEPOT_UNUSED_BITS)) == RAIL_TYPE_DEPOT)
@ -1214,9 +1218,10 @@ static int32 RemoveTrainDepot(uint tile, uint32 flags)
return _price.remove_train_depot; return _price.remove_train_depot;
} }
static int32 ClearTile_Track(uint tile, byte flags) { static int32 ClearTile_Track(TileIndex tile, byte flags)
int32 cost,ret; {
int i; int32 cost;
int32 ret;
byte m5; byte m5;
m5 = _map5[tile]; m5 = _map5[tile];
@ -1233,44 +1238,54 @@ static int32 ClearTile_Track(uint tile, byte flags) {
cost = 0; cost = 0;
switch (m5 & RAIL_TYPE_MASK) {
if ( (m5 & RAIL_TYPE_MASK) == RAIL_TYPE_NORMAL) { case RAIL_TYPE_SIGNALS:
regular_track:; if (_map3_lo[tile] & _signals_table_both[0]) {
for(i=0; m5; i++, m5>>=1) { ret = DoCommandByTile(tile, 0, 0, flags, CMD_REMOVE_SIGNALS);
if (m5 & 1) { if (ret == CMD_ERROR) return CMD_ERROR;
ret = DoCommandByTile(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
if (ret == CMD_ERROR)
return CMD_ERROR;
cost += ret; cost += ret;
} }
if (_map3_lo[tile] & _signals_table_both[3]) {
ret = DoCommandByTile(tile, 3, 0, flags, CMD_REMOVE_SIGNALS);
if (ret == CMD_ERROR) return CMD_ERROR;
cost += ret;
}
m5 &= RAIL_BIT_MASK;
/* FALLTHROUGH */
case RAIL_TYPE_NORMAL: {
uint i;
for (i = 0; m5 != 0; i++, m5 >>= 1) {
if (m5 & 1) {
if (flags & DC_EXEC) {
ret = DoCommandByTile(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
if (ret == CMD_ERROR) return CMD_ERROR;
} else {
ret = _price.remove_rail;
}
cost += ret;
}
}
return cost;
} }
return cost;
} else if ((m5 & RAIL_TYPE_MASK)==RAIL_TYPE_SIGNALS) { case RAIL_TYPE_DEPOT:
cost = 0; switch (m5 & RAIL_SUBTYPE_MASK) {
if (_map3_lo[tile] & (_signals_table[0] | _signals_table[0 + 8])) { // check for signals in the first track case RAIL_SUBTYPE_DEPOT:
ret = DoCommandByTile(tile, 0, 0, flags, CMD_REMOVE_SIGNALS); return RemoveTrainDepot(tile, flags);
if (ret == CMD_ERROR)
return CMD_ERROR;
cost += ret;
};
if (_map3_lo[tile] & (_signals_table[3] | _signals_table[3 + 8])) { // check for signals in the other track
ret = DoCommandByTile(tile, 3, 0, flags, CMD_REMOVE_SIGNALS);
if (ret == CMD_ERROR)
return CMD_ERROR;
cost += ret;
};
m5 &= RAIL_BIT_MASK; case RAIL_SUBTYPE_WAYPOINT:
if (flags & DC_EXEC) return RemoveTrainWaypoint(tile, flags, false);
goto regular_track;
return cost + _price.remove_rail; default:
} else if ( (m5 & (RAIL_TYPE_MASK|RAIL_DEPOT_UNUSED_BITS)) == RAIL_TYPE_DEPOT) { return CMD_ERROR;
return RemoveTrainDepot(tile, flags); }
} else if ( (m5 & (RAIL_TYPE_MASK|RAIL_WAYPOINT_UNUSED_BITS)) == RAIL_TYPE_WAYPOINT) {
return RemoveTrainWaypoint(tile, flags, false); default:
} else return CMD_ERROR;
return CMD_ERROR; }
} }