openttd-mini: comparison roadveh

equal deleted inserted replaced

-:30eee9c93028
+:2de6d3a59743
 {
 	v->u.road.crashed_ctr++;
 	if (v->u.road.crashed_ctr == 2) {
 		CreateEffectVehicleRel(v, 4, 4, 8, EV_EXPLOSION_LARGE);
 	} else if (v->u.road.crashed_ctr <= 45) {
-		if ((v->tick_counter&7)==0)
+		if ((v->tick_counter & 7) == 0)
 			RoadVehSetRandomDirection(v);
 	} else if (v->u.road.crashed_ctr >= 2220) {
 		RoadVehDelete(v);
 	}
 }
 	v->vehstatus |= VS_CRASHED;
 	InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 	pass = 1;
-	if (v->cargo_type == 0)
+	if (v->cargo_type == 0) pass += v->cargo_count;
-		pass += v->cargo_count;
 	v->cargo_count = 0;
 	SetDParam(0, pass);
 	AddNewsItem(
 		(pass == 1) ?
 			STR_9031_ROAD_VEHICLE_CRASH_DRIVER : STR_9032_ROAD_VEHICLE_CRASH_DIE,
 		NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ACCIDENT, 0),
 		v->index,
 static void RoadVehCheckTrainCrash(Vehicle *v)
 {
 	TileIndex tile;
-	if (v->u.road.state == 255)
+	if (v->u.road.state == 255) return;
-		return;
 	tile = v->tile;
-	// Make sure it's a road/rail crossing
+	if (!IsTileType(tile, MP_STREET) || !IsLevelCrossing(tile)) return;
-	if (!IsTileType(tile, MP_STREET) || !IsLevelCrossing(tile))
-		return;
 	if (VehicleFromPos(tile, v, (VehicleFromPosProc*)EnumCheckRoadVehCrashTrain) != NULL)
 		RoadVehCrash(v);
 }
 		return;
 	}
 	if (order->type    == v->current_order.type &&
 			order->flags   == v->current_order.flags &&
-			order->station == v->current_order.station)
+			order->station == v->current_order.station) {
 		return;
+	}
 	v->current_order = *order;
 	v->dest_tile = 0;
 	if (order->type == OT_GOTO_STATION) {
 		if (order->station == v->last_station_visited)
 			v->last_station_visited = INVALID_STATION;
 	}
 }
 static bool RoadVehAccelerate(Vehicle *v)
 {
-	uint spd = v->cur_speed + 1 + ((v->u.road.overtaking != 0)?1:0);
+	uint spd = v->cur_speed + 1 + (v->u.road.overtaking != 0 ? 1 : 0);
 	byte t;
 	// Clamp
 	spd = min(spd, v->max_speed);
 	//updates statusbar only if speed have changed to save CPU time
 	if (spd != v->cur_speed) {
 		v->cur_speed = spd;
-		if (_patches.vehicle_speed)
+		if (_patches.vehicle_speed) {
 			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
+		}
 	}
 	// Decrease somewhat when turning
-	if (!(v->direction&1))
+	if (!(v->direction & 1)) spd = spd * 3 >> 2;
-		spd = spd * 3 >> 2;
+	if (spd == 0) return false;
-	if (spd == 0)
-		return false;
+	if ((byte)++spd == 0) return true;
-	if ((byte)++spd == 0)
-		return true;
 	v->progress = (t = v->progress) - (byte)spd;
 	return (t < v->progress);
 }
 	od.v = v;
 	od.u = u;
 	if (u->max_speed >= v->max_speed &&
-			!(u->vehstatus&VS_STOPPED) &&
+			!(u->vehstatus & VS_STOPPED) &&
-			u->cur_speed != 0)
+			u->cur_speed != 0) {
-				return;
+		return;
+	}
 	if (v->direction != u->direction || !(v->direction&1))
 		return;
 	if (v->u.road.state >= 32 || (v->u.road.state&7) > 1 )
 		return;
 	tt = GetTileTrackStatus(v->tile, TRANSPORT_ROAD) & 0x3F;
-	if ((tt & 3) == 0)
+	if ((tt & 3) == 0) return;
-		return;
+	if ((tt & 0x3C) != 0) return;
-	if ((tt & 0x3C) != 0)
-		return;
+	if (tt == 3) tt = (v->direction & 2) ? 2 : 1;
-	if (tt == 3) {
-		tt = (v->direction&2)?2:1;
-	}
 	od.tilebits = tt;
 	od.tile = v->tile;
-	if (FindRoadVehToOvertake(&od))
+	if (FindRoadVehToOvertake(&od)) return;
-		return;
 	od.tile = v->tile + TileOffsByDir(v->direction >> 1);
-	if (FindRoadVehToOvertake(&od))
+	if (FindRoadVehToOvertake(&od)) return;
-		return;
 	if (od.u->cur_speed == 0 || od.u->vehstatus&VS_STOPPED) {
 		v->u.road.overtaking_ctr = 0x11;
 		v->u.road.overtaking = 0x10;
 	} else {
-//		if (FindRoadVehToOvertake(&od))
+//		if (FindRoadVehToOvertake(&od)) return;
-//			return;
 		v->u.road.overtaking_ctr = 0;
 		v->u.road.overtaking = 0x10;
 	}
 }
 	uint num = 0;
 	uint b = bits;
 	uint i;
 	do {
-		if (b & 1)
+		if (b & 1) num++;
-			num++;
 	} while (b >>= 1);
 	num = RandomRange(num);
 	for(i=0; !((bits & 1) && ((int)--num) < 0); bits>>=1,i++);
 			return;
 		}
 		v->breakdown_ctr--;
 	}
-	// exit if vehicle is stopped
+	if (v->vehstatus & VS_STOPPED) return;
-	if (v->vehstatus & VS_STOPPED)
-		return;
 	ProcessRoadVehOrder(v);
 	HandleRoadVehLoading(v);
-	if (v->current_order.type == OT_LOADING)
+	if (v->current_order.type == OT_LOADING) return;
-		return;
 	if (v->u.road.state == 254) {
 		int dir;
 		const RoadDriveEntry*rdp;
 		byte rd2;
 		rdp = _road_drive_data[(_opt.road_side<<4) + rd2];
 		x = TileX(v->tile) * 16 + (rdp[6].x & 0xF);
 		y = TileY(v->tile) * 16 + (rdp[6].y & 0xF);
-		if (RoadVehFindCloseTo(v,x,y,v->direction))
+		if (RoadVehFindCloseTo(v,x,y,v->direction)) return;
-			return;
 		VehicleServiceInDepot(v);
 		StartRoadVehSound(v);
 		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 		return;
 	}
-	if (!RoadVehAccelerate(v))
+	if (!RoadVehAccelerate(v)) return;
-		return;
 	if (v->u.road.overtaking != 0)  {
 		if (++v->u.road.overtaking_ctr >= 35)
 			/* If overtaking just aborts at a random moment, we can have a out-of-bound problem,
 			 *  if the vehicle started a corner. To protect that, only allow an abort of
 		RoadStopType type = (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK;
 		st = GetStation(v->current_order.station);
 		//Current slot has expired
-		if ( (v->u.road.slot_age++ <= 0) && (v->u.road.slot != NULL))
+		if (v->u.road.slot_age++ <= 0 && v->u.road.slot != NULL) {
 			ClearSlot(v, v->u.road.slot);
+		}
 		//We do not have a slot, so make one
 		if (v->u.road.slot == NULL) {
 			RoadStop *rs = GetPrimaryRoadStop(st, type);
 			RoadStop *first_stop = rs;
 			RoadStop *best_stop = NULL;
 			uint32 mindist = 12, dist; // 12 is threshold distance.
 		//first we need to find out how far our stations are away.
 			DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d at station %d (0x%x)", v->unitnumber, st->index, st->xy);
-			for(; rs != NULL; rs = rs->next) {
+			for (; rs != NULL; rs = rs->next) {
 				// Only consider those with at least a free slot.
 				if (!(rs->slot[0] == INVALID_SLOT || rs->slot[1] == INVALID_SLOT))
 					continue;
 				// Previously the NPF pathfinder was used here even if NPF is OFF.. WTF?
 				assert(NUM_SLOTS == 2);
 				dist = DistanceManhattan(v->tile, rs->xy);
 				// Check if the station is located BEHIND the vehicle..
 				// In that case, add penalty.
-				switch(v->direction) {
+				switch (v->direction) {
-				case 1: // going north east,x position decreasing
+					case 1: // going north east,x position decreasing
-					if (v->x_pos <= (int32)TileX(rs->xy) * 16 + 15)
+						if (v->x_pos <= (int32)TileX(rs->xy) * 16 + 15) dist += 6;
-						dist += 6;
+						break;
-					break;
+					case 3: // Going south east, y position increasing
-				case 3: // Going south east, y position increasing
+						if (v->y_pos >= (int32)TileY(rs->xy) * 16) dist += 6;
-					if (v->y_pos >= (int32)TileY(rs->xy) * 16)
+						break;
-						dist += 6;
+					case 5: // Going south west, x position increasing
-					break;
+						if (v->x_pos >= (int32)TileX(rs->xy) * 16) dist += 6;
-				case 5: // Going south west, x position increasing
+						break;
-					if (v->x_pos >= (int32)TileX(rs->xy) * 16)
+					case 7: // Going north west, y position decrasing.
-						dist += 6;
+						if (v->y_pos <= (int32)TileY(rs->xy) * 16 + 15) dist += 6;
-					break;
+						break;
-				case 7: // Going north west, y position decrasing.
-					if (v->y_pos <= (int32)TileY(rs->xy) * 16 + 15)
-						dist += 6;
-					break;
 				}
 				// Remember the one with the shortest distance
 				if (dist < mindist) {
 					mindist = dist;

changeset 2951	2de6d3a59743
parent 2933	df6248fd77a7
child 2952	58522ed8f0f1