openttd-mini: comparison tunnelbridge

equal deleted inserted replaced

-:54fd558314dc
+:538e73c53f54
 			m5 = 0xC0;
 		}
 		/* do middle part of bridge */
 		if (flags & DC_EXEC) {
-			_map5[ti.tile] = (byte)(m5 | direction | rail_or_road);
+			_m[ti.tile].m5 = (byte)(m5 | direction | rail_or_road);
 			SetTileType(ti.tile, MP_TUNNELBRIDGE);
 			//bridges pieces sequence (middle parts)
 			// bridge len 1: 0
 			// bridge len 2: 0 1
 					// this sequence swaps [... XOR (i>odd_middle_part)],
 					// for even bridges XOR does not apply as odd_middle_part==bridge_len
 					m5 = 2 + ((i%2==0)^(i>odd_middle_part));
 			}
-			_map2[ti.tile] = (bridge_type << 4) | m5;
+			_m[ti.tile].m2 = (bridge_type << 4) | m5;
-			_map3_lo[ti.tile] &= 0xF;
+			_m[ti.tile].m3 &= 0xF;
-			_map3_lo[ti.tile] |= (byte)(railtype << 4);
+			_m[ti.tile].m3 |= (byte)(railtype << 4);
 			MarkTileDirtyByTile(ti.tile);
 		}
 	}
 }
 TileIndex CheckTunnelBusy(TileIndex tile, uint *length)
 {
 	uint z = GetTileZ(tile);
-	byte m5 = _map5[tile];
+	byte m5 = _m[tile].m5;
 	int delta = TileOffsByDir(m5 & 3);
 	uint len = 0;
 	TileIndex starttile = tile;
 	Vehicle *v;
 	do {
 		tile += delta;
 		len++;
 	} while (
 		!IsTileType(tile, MP_TUNNELBRIDGE) ||
-		(_map5[tile] & 0xF0) != 0 ||
+		(_m[tile].m5 & 0xF0) != 0 ||
-		(byte)(_map5[tile] ^ 2) != m5 ||
+		(byte)(_m[tile].m5 ^ 2) != m5 ||
 		GetTileZ(tile) != z
 	);
 	v = FindVehicleBetween(starttile, tile, z);
 	if (v != NULL) {
 	}
 	if (flags & DC_EXEC) {
 		// We first need to request the direction before calling DoClearSquare
 		//  else the direction is always 0.. dah!! ;)
-		byte tile_dir = _map5[tile]&3;
+		byte tile_dir = _m[tile].m5&3;
-		byte endtile_dir = _map5[endtile]&3;
+		byte endtile_dir = _m[endtile].m5&3;
 		DoClearSquare(tile);
 		DoClearSquare(endtile);
 		UpdateSignalsOnSegment(tile, _updsignals_tunnel_dir[tile_dir]);
 		UpdateSignalsOnSegment(endtile, _updsignals_tunnel_dir[endtile_dir]);
 		if (IsTileOwner(tile, OWNER_TOWN) && _game_mode != GM_EDITOR)
 	return  _price.clear_tunnel * (length + 1);
 }
 static TileIndex FindEdgesOfBridge(TileIndex tile, TileIndex *endtile)
 {
-	int direction = _map5[tile] & 1;
+	int direction = _m[tile].m5 & 1;
 	TileIndex start;
 	// find start of bridge
 	for(;;) {
-		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_map5[tile] & 0xE0) == 0x80)
+		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5 & 0xE0) == 0x80)
 			break;
 		tile += direction ? TileDiffXY(0, -1) : TileDiffXY(-1, 0);
 	}
 	start = tile;
 	// find end of bridge
 	for(;;) {
-		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_map5[tile] & 0xE0) == 0xA0)
+		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5 & 0xE0) == 0xA0)
 			break;
 		tile += direction ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
 	}
 	*endtile = tile;
 	Town *t;
 	int direction;
 	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
-	direction = _map5[tile]&1;
+	direction = _m[tile].m5&1;
 	/* delete stuff under the middle part if there's a transport route there..? */
-	if ((_map5[tile] & 0xE0) == 0xE0) {
+	if ((_m[tile].m5 & 0xE0) == 0xE0) {
 		int32 cost;
 		// check if we own the tile below the bridge..
 		if (_current_player != OWNER_WATER && (!CheckTileOwnership(tile) || !EnsureNoVehicleZ(tile, TilePixelHeight(tile))))
 			return CMD_ERROR;
-		cost = (_map5[tile] & 8) ? _price.remove_road * 2 : _price.remove_rail;
+		cost = (_m[tile].m5 & 8) ? _price.remove_road * 2 : _price.remove_rail;
 		if (flags & DC_EXEC) {
-			_map5[tile] = _map5[tile] & ~0x38;
+			_m[tile].m5 = _m[tile].m5 & ~0x38;
 			SetTileOwner(tile, OWNER_NONE);
 			MarkTileDirtyByTile(tile);
 		}
 		return cost;
 	/* delete canal under bridge */
-	} else if ((_map5[tile] & 0xC8) == 0xC8 && TilePixelHeight(tile) != 0) {
+	} else if ((_m[tile].m5 & 0xC8) == 0xC8 && TilePixelHeight(tile) != 0) {
 		int32 cost;
 		// check for vehicles under bridge
 		if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
 			return CMD_ERROR;
 		cost = _price.clear_water;
 		if (flags & DC_EXEC) {
-			_map5[tile] = _map5[tile] & ~0x38;
+			_m[tile].m5 = _m[tile].m5 & ~0x38;
 			SetTileOwner(tile, OWNER_NONE);
 			MarkTileDirtyByTile(tile);
 		}
 		return cost;
 	}
 		// you have a "Poor" (0) town rating
 		if (IsTileOwner(tile, OWNER_TOWN) && _game_mode != GM_EDITOR)
 			ChangeTownRating(t, RATING_TUNNEL_BRIDGE_DOWN_STEP, RATING_TUNNEL_BRIDGE_MINIMUM);
 		do {
-			m5 = _map5[c];
+			m5 = _m[c].m5;
 			pbs = PBSTileReserved(c);
 			if (m5 & 0x40) {
 				if (m5 & 0x20) {
 					static const uint16 _new_data_table[] = {0x1002, 0x1001, 0x2005, 0x200A, 0, 0, 0, 0};
 					if (!(m5 & 0x18)) goto clear_it;
 					new_data = (GetTileSlope(c, NULL) == 0) ? 0x6000 : 0x6001;
 				}
 				SetTileType(c, new_data >> 12);
-				_map5[c] = (byte)new_data;
+				_m[c].m5 = (byte)new_data;
-				_map2[c] = 0;
+				_m[c].m2 = 0;
-				_map3_hi[c] &= 0x0F;
+				_m[c].m4 &= 0x0F;
 				if (direction ? HASBIT(pbs,0) : HASBIT(pbs,1))
 					PBSReserveTrack(c, direction ? 0 : 1);
 				MarkTileDirtyByTile(c);
 	return ((((endtile - tile) >> (direction?8:0))&0xFF)+1) * _price.clear_bridge;
 }
 static int32 ClearTile_TunnelBridge(TileIndex tile, byte flags)
 {
-	byte m5 = _map5[tile];
+	byte m5 = _m[tile].m5;
 	if ((m5 & 0xF0) == 0) {
 		if (flags & DC_AUTO)
 			return_cmd_error(STR_5006_MUST_DEMOLISH_TUNNEL_FIRST);
 {
 	TileIndex endtile;
 	uint length;
 	Vehicle *v;
-	if ((_map5[tile] & 0xFC) == 0x00) {
+	if ((_m[tile].m5 & 0xFC) == 0x00) {
 		// railway tunnel
 		if (!CheckTileOwnership(tile)) return CMD_ERROR;
-		if ( (uint)(_map3_lo[tile] & 0xF) == totype) return CMD_ERROR;
+		if ( (uint)(_m[tile].m3 & 0xF) == totype) return CMD_ERROR;
 		endtile = CheckTunnelBusy(tile, &length);
 		if (endtile == INVALID_TILE) return CMD_ERROR;
 		if (exec) {
-			_map3_lo[tile] = (_map3_lo[tile] & 0xF0) + totype;
+			_m[tile].m3 = (_m[tile].m3 & 0xF0) + totype;
-			_map3_lo[endtile] = (_map3_lo[endtile] & 0xF0) + totype;
+			_m[endtile].m3 = (_m[endtile].m3 & 0xF0) + totype;
 			MarkTileDirtyByTile(tile);
 			MarkTileDirtyByTile(endtile);
 		}
 		return (length + 1) * (_price.build_rail >> 1);
-	} else if ((_map5[tile] & 0xF8) == 0xE0) {
+	} else if ((_m[tile].m5 & 0xF8) == 0xE0) {
 		// bridge middle part with rail below
 		// only check for train under bridge
 		if (!CheckTileOwnership(tile) || !EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
 			return CMD_ERROR;
 		// tile is already of requested type?
-		if ( (uint)(_map3_lo[tile] & 0xF) == totype) return CMD_ERROR;
+		if ( (uint)(_m[tile].m3 & 0xF) == totype) return CMD_ERROR;
 		// change type.
 		if (exec) {
-			_map3_lo[tile] = (_map3_lo[tile] & 0xF0) + totype;
+			_m[tile].m3 = (_m[tile].m3 & 0xF0) + totype;
 			MarkTileDirtyByTile(tile);
 		}
 		return _price.build_rail >> 1;
-	} else if ((_map5[tile]&0xC6) == 0x80) {
+	} else if ((_m[tile].m5&0xC6) == 0x80) {
 		TileIndex starttile;
 		int32 cost;
 		uint z = TilePixelHeight(tile);
 		z += 8;
 		if (!EnsureNoVehicle(starttile) || !EnsureNoVehicle(endtile)) {
 			_error_message = STR_8803_TRAIN_IN_THE_WAY;
 			return CMD_ERROR;
 		}
-		if ( (uint)(_map3_lo[tile] & 0xF) == totype) return CMD_ERROR;
+		if ( (uint)(_m[tile].m3 & 0xF) == totype) return CMD_ERROR;
 		cost = 0;
 		do {
 			if (exec) {
 				if (tile == starttile || tile == endtile) {
-					_map3_lo[tile] = (_map3_lo[tile] & 0xF0) + totype;
+					_m[tile].m3 = (_m[tile].m3 & 0xF0) + totype;
 				} else {
-					_map3_lo[tile] = (_map3_lo[tile] & 0x0F) + (totype << 4);
+					_m[tile].m3 = (_m[tile].m3 & 0x0F) + (totype << 4);
 				}
 				MarkTileDirtyByTile(tile);
 			}
 			cost += (_price.build_rail>>1);
-			tile += _map5[tile] & 1 ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
+			tile += _m[tile].m5 & 1 ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
 		} while (tile <= endtile);
 		return cost;
 	} else
 		return CMD_ERROR;
 {
 	TileIndexDiff delta;
 	TileIndex tile = ti->tile;
 	// find the end tile of the bridge.
-	delta = (_map5[tile] & 1) ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
+	delta = (_m[tile].m5 & 1) ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
 	do {
-		assert((_map5[tile] & 0xC0) == 0xC0);	// bridge and middle part
+		assert((_m[tile].m5 & 0xC0) == 0xC0);	// bridge and middle part
 		tile += delta;
-	} while (_map5[tile] & 0x40);	// while bridge middle parts
+	} while (_m[tile].m5 & 0x40);	// while bridge middle parts
 	/* Return the height there (the height of the NORTH CORNER)
 	 * If the end of the bridge is on a tileh 7 (all raised, except north corner),
 	 * the z coordinate is 1 height level too low. Compensate for that */
 	return TilePixelHeight(tile) + (GetTileSlope(tile, NULL) == 7 ? 8 : 0);
 {
 	const uint32 *b;
 	uint32 image;
 	int piece;
-	b = _bridge_poles_table[_map2[ti->tile]>>4];
+	b = _bridge_poles_table[_m[ti->tile].m2>>4];
 	// Draw first piece
 	// (necessary for cantilever bridges)
 	image = b[12 + (ti->map5&0x01)];
-	piece = _map2[ti->tile]&0xF;
+	piece = _m[ti->tile].m2&0xF;
 	if (image != 0 && piece != 0) {
 		if (_display_opt & DO_TRANS_BUILDINGS) image = (image & 0x3FFF) | 0x03224000;
 		DrawGroundSpriteAt(image, x, y, z);
 	}
 static void DrawTile_TunnelBridge(TileInfo *ti)
 {
 	uint32 image;
 	uint tmp;
 	const uint32 *b;
-	bool ice = _map3_hi[ti->tile] & 0x80;
+	bool ice = _m[ti->tile].m4 & 0x80;
 	// draw tunnel?
 	if ( (byte)(ti->map5&0xF0) == 0) {
 		/* railway type */
-		image = (_map3_lo[ti->tile] & 0xF) * 8;
+		image = (_m[ti->tile].m3 & 0xF) * 8;
 		/* ice? */
 		if (ice)
 			image += 32;
 		AddSortableSpriteToDraw(image+1, ti->x + 15, ti->y + 15, 1, 1, 8, (byte)ti->z);
 	// draw bridge?
 	} else if ((byte)ti->map5 & 0x80) {
 		// get type of track on the bridge.
-		tmp = _map3_lo[ti->tile];
+		tmp = _m[ti->tile].m3;
 		if (ti->map5 & 0x40) tmp >>= 4;
 		tmp &= 0xF;
 		// 0 = rail bridge
 		// 1 = road bridge
 				// default sloped sprites..
 				if (ti->tileh != 0) image = _track_sloped_sprites[ti->tileh - 1] + 0x3F3;
 			}
 			// bridge ending.
-			b = _bridge_sprite_table[(_map2[ti->tile] >> 4) & 0xF][6];
+			b = _bridge_sprite_table[(_m[ti->tile].m2 >> 4) & 0xF][6];
 			b += (tmp&(3<<1))*4; /* actually ((tmp>>2)&3)*8 */
 			b += (tmp&1); // direction
 			if (ti->tileh == 0) b += 4; // sloped "entrance" ?
 			if (ti->map5 & 0x20) b += 2; // which side
 				if (!(image&1)) {
 					// railway
 					image = 0x3F3 + (ti->map5 & 1);
 					if (ti->tileh != 0) image = _track_sloped_sprites[ti->tileh - 1] + 0x3F3;
-					image += (_map3_lo[ti->tile] & 0xF) * TRACKTYPE_SPRITE_PITCH;
+					image += (_m[ti->tile].m3 & 0xF) * TRACKTYPE_SPRITE_PITCH;
 					if (ice) image += 26; // ice?
 				} else {
 					// road
 					image = 1332 + (ti->map5 & 1);
 					if (ti->tileh != 0) image = _road_sloped_sprites[ti->tileh - 1] + 0x53F;
 					if (ice) image += 19; // ice?
 				}
 				DrawGroundSprite(image);
 			}
 			// get bridge sprites
-			b = _bridge_sprite_table[(_map2[ti->tile] >> 4) & 0xF][_map2[ti->tile]&0xF] + tmp * 4;
+			b = _bridge_sprite_table[(_m[ti->tile].m2 >> 4) & 0xF][_m[ti->tile].m2&0xF] + tmp * 4;
 			z = GetBridgeHeight(ti) + 5;
 			// draw rail
 			image = b[0];
 	0,0,0,
 };
 static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
 {
-	if ((_map5[tile] & 0x80) == 0) {
+	if ((_m[tile].m5 & 0x80) == 0) {
-		td->str = STR_5017_RAILROAD_TUNNEL + ((_map5[tile] >> 2) & 3);
+		td->str = STR_5017_RAILROAD_TUNNEL + ((_m[tile].m5 >> 2) & 3);
 	} else {
-		td->str = _bridge_tile_str[ (_map2[tile] >> 4) + (((_map5[tile]>>1)&3)<<4) ];
+		td->str = _bridge_tile_str[ (_m[tile].m2 >> 4) + (((_m[tile].m5>>1)&3)<<4) ];
 		/* scan to the end of the bridge, that's where the owner is stored */
-		if (_map5[tile] & 0x40) {
+		if (_m[tile].m5 & 0x40) {
-			TileIndexDiff delta = _map5[tile] & 1 ? TileDiffXY(0, -1) : TileDiffXY(-1, 0);
+			TileIndexDiff delta = _m[tile].m5 & 1 ? TileDiffXY(0, -1) : TileDiffXY(-1, 0);
-			do tile += delta; while (_map5[tile] & 0x40);
+			do tile += delta; while (_m[tile].m5 & 0x40);
 		}
 	}
 	td->owner = GetTileOwner(tile);
 }
 static void TileLoop_TunnelBridge(TileIndex tile)
 {
 	if (_opt.landscape == LT_HILLY) {
 		if ( GetTileZ(tile) > _opt.snow_line) {
-			if (!(_map3_hi[tile] & 0x80)) {
+			if (!(_m[tile].m4 & 0x80)) {
-				_map3_hi[tile] |= 0x80;
+				_m[tile].m4 |= 0x80;
 				MarkTileDirtyByTile(tile);
 			}
 		} else {
-			if (_map3_hi[tile] & 0x80) {
+			if (_m[tile].m4 & 0x80) {
-				_map3_hi[tile] &= ~0x80;
+				_m[tile].m4 &= ~0x80;
 				MarkTileDirtyByTile(tile);
 			}
 		}
 	} else if (_opt.landscape == LT_DESERT) {
-		if (GetMapExtraBits(tile) == 1 && !(_map3_hi[tile]&0x80)) {
+		if (GetMapExtraBits(tile) == 1 && !(_m[tile].m4&0x80)) {
-			_map3_hi[tile] |= 0x80;
+			_m[tile].m4 |= 0x80;
 			MarkTileDirtyByTile(tile);
 		}
 	}
 	// if it's a bridge with water below, call tileloop_water on it.
-	if ((_map5[tile] & 0xF8) == 0xC8) TileLoop_Water(tile);
+	if ((_m[tile].m5 & 0xF8) == 0xC8) TileLoop_Water(tile);
 }
 static void ClickTile_TunnelBridge(TileIndex tile)
 {
 	/* not used */
 static uint32 GetTileTrackStatus_TunnelBridge(TileIndex tile, TransportType mode)
 {
 	uint32 result;
-	byte m5 = _map5[tile];
+	byte m5 = _m[tile].m5;
 	if ((m5 & 0xF0) == 0) {
 		/* This is a tunnel */
 		if (((m5 & 0xCU) >> 2) == mode) {
 			/* Tranport in the tunnel is compatible */
 	if (!IsTileOwner(tile, old_player)) return;
 	if (new_player != 255) {
 		SetTileOwner(tile, new_player);
 	}	else {
-		if((_map5[tile] & 0xC0)==0xC0) {
+		if((_m[tile].m5 & 0xC0)==0xC0) {
 			// the stuff BELOW the middle part is owned by the deleted player.
-			if (!(_map5[tile] & (1 << 4 | 1 << 3))) {
+			if (!(_m[tile].m5 & (1 << 4 | 1 << 3))) {
 				// convert railway into grass.
-				_map5[tile] &= ~(1 << 5 | 1 << 4 | 1 << 3); // no transport route under bridge anymore..
+				_m[tile].m5 &= ~(1 << 5 | 1 << 4 | 1 << 3); // no transport route under bridge anymore..
 			} else {
 				// for road, change the owner of the road to local authority
 				SetTileOwner(tile, OWNER_NONE);
 			}
 		} else {
 {
 	int z;
 	int dir, vdir;
 	byte fc;
-	if ((_map5[tile] & 0xF0) == 0) {
+	if ((_m[tile].m5 & 0xF0) == 0) {
 		z = GetSlopeZ(x, y) - v->z_pos;
 		if (myabs(z) > 2)
 			return 8;
 		if (v->type == VEH_Train) {
 			fc = (x&0xF)+(y<<4);
-			dir = _map5[tile] & 3;
+			dir = _m[tile].m5 & 3;
 			vdir = v->direction >> 1;
 			if (v->u.rail.track != 0x40 && dir == vdir) {
 				if (v->subtype == TS_Front_Engine && fc == _tunnel_fractcoord_1[dir]) {
 					if (v->spritenum < 4)
 				v->vehstatus &= ~VS_HIDDEN;
 				return 4;
 			}
 		} else if (v->type == VEH_Road) {
 			fc = (x&0xF)+(y<<4);
-			dir = _map5[tile] & 3;
+			dir = _m[tile].m5 & 3;
 			vdir = v->direction >> 1;
 			// Enter tunnel?
 			if (v->u.road.state != 0xFF && dir == vdir) {
 				if (fc == _tunnel_fractcoord_4[dir] ||
 				v->u.road.frame = _road_exit_tunnel_frame[dir];
 				v->vehstatus &= ~VS_HIDDEN;
 				return 4;
 			}
 		}
-	} else if (_map5[tile] & 0x80) {
+	} else if (_m[tile].m5 & 0x80) {
 		if (v->type == VEH_Road || (v->type == VEH_Train && v->subtype == TS_Front_Engine)) {
 			uint h;
 			if (GetTileSlope(tile, &h) != 0)
 				h += 8; // Compensate for possible foundation
-			if (!(_map5[tile] & 0x40) || // start/end tile of bridge
+			if (!(_m[tile].m5 & 0x40) || // start/end tile of bridge
 					myabs(h - v->z_pos) > 2) { // high above the ground -> on the bridge
 				/* modify speed of vehicle */
-				uint16 spd = _bridge_speeds[_map2[tile] >> 4];
+				uint16 spd = _bridge_speeds[_m[tile].m2 >> 4];
 				if (v->type == VEH_Road) spd<<=1;
 				if (spd < v->cur_speed)
 					v->cur_speed = spd;
 			}
 		}
 	TileIndex tile;
 	TileIndexDiff delta = (v->direction & 2) ? TileDiffXY(0, 1) : TileDiffXY(1, 0);
 	byte z = v->z_pos;
 	for (tile = v->tile;; tile += delta) {
-		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_map5[tile] & 0xF0) == 0 &&
+		if (IsTileType(tile, MP_TUNNELBRIDGE) && (_m[tile].m5 & 0xF0) == 0 &&
 				GetTileZ(tile) == z)
 			break;
 	}
 	return tile;
 }

changeset 2049	538e73c53f54
parent 2008	cdb444f6d43c
child 2085	876f20a0e843