(svn r16120) [0.7] -Backport from trunk:

- Fix: Road was removed when both the Remove button was active and Ctrl was pressed [FS#2582] (r16119)
- Fix: Connect tried to validate too much of the company ID with too little information on hand [FS#2849] (r16096)
- Fix: Insanely fast trains would not stop in time for stations/'jump' over waypoints/via stations within a tick, which would cause the order not to be processed causing the train to go in loops until (with luck) it 'hit' the tile [FS#2824] (r16079)
- Fix: Content download progress bar 'resetting' due to mathematical overflow [FS#2845] (r16071)
- Fix: Memory leak when querying a server multiple times (r16064)

src/console_cmds.cpp

@@ -782,8 +782,8 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
 		/* From a user pov 0 is a new company, internally it's different and all
 		 * companies are offset by one to ease up on users (eg companies 1-8 not 0-7) */
 		if (_network_playas != COMPANY_SPECTATOR) {
+			if (_network_playas > MAX_COMPANIES) return false;
 			_network_playas--;
-			if (!IsValidCompanyID(_network_playas)) return false;
 		}
 	}
 	if (port != NULL) {

src/network/network_content_gui.cpp

@@ -123,11 +123,11 @@ public:
 		this->DrawWidgets();
 
 		/* Draw nice progress bar :) */
-		DrawFrameRect(20, 18, 20 + (int)((this->width - 40) * this->downloaded_bytes / this->total_bytes), 28, COLOUR_MAUVE, FR_NONE);
+		DrawFrameRect(20, 18, 20 + (int)((this->width - 40LL) * this->downloaded_bytes / this->total_bytes), 28, COLOUR_MAUVE, FR_NONE);
 
 		SetDParam(0, this->downloaded_bytes);
 		SetDParam(1, this->total_bytes);
-		SetDParam(2, this->downloaded_bytes * 100 / this->total_bytes);
+		SetDParam(2, this->downloaded_bytes * 100LL / this->total_bytes);
 		DrawStringCentered(this->width / 2, 35, STR_CONTENT_DOWNLOAD_PROGRESS_SIZE, TC_GREY);
 
 		if  (this->downloaded_bytes == this->total_bytes) {

src/network/network_gamelist.cpp

@@ -44,6 +44,7 @@ static void NetworkGameListHandleDelayedInsert()
 		NetworkGameList *item = NetworkGameListAddItem(ins_item->ip, ins_item->port);
 
 		if (item != NULL) {
+			ClearGRFConfigList(&item->info.grfconfig);
 			if (StrEmpty(item->info.server_name)) {
 				memset(&item->info, 0, sizeof(item->info));
 				strecpy(item->info.server_name, ins_item->info.server_name, lastof(item->info.server_name));

src/newgrf.cpp

@@ -259,7 +259,7 @@ StringIDToGRFIDMapping _string_to_grf_mapping;
 StringID MapGRFStringID(uint32 grfid, StringID str)
 {
 	/* StringID table for TextIDs 0x4E->0x6D */
-	static StringID units_volume[] = {
+	static const StringID units_volume[] = {
 		STR_NOTHING,    STR_PASSENGERS, STR_TONS,       STR_BAGS,
 		STR_LITERS,     STR_ITEMS,      STR_CRATES,     STR_TONS,
 		STR_TONS,       STR_TONS,       STR_TONS,       STR_BAGS,

src/road_gui.cpp

@@ -602,7 +602,7 @@ struct BuildRoadToolbarWindow : Window {
 					_place_road_flag = (RoadFlags)((_place_road_flag & RF_DIR_Y) ? (_place_road_flag & 0x07) : (_place_road_flag >> 3));
 
 					DoCommandP(end_tile, start_tile, _place_road_flag | (_cur_roadtype << 3) | (_one_way_button_clicked << 5),
-						(_ctrl_pressed || _remove_button_clicked) ?
+						_remove_button_clicked ?
 						CMD_REMOVE_LONG_ROAD | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_road) :
 						CMD_BUILD_LONG_ROAD | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_road), CcPlaySound1D);
 					break;

src/station_cmd.cpp

@@ -538,17 +538,6 @@ void GetAcceptanceAroundTiles(AcceptedCargo accepts, TileIndex tile,
 	}
 }
 
-static inline void MergePoint(Rect *rect, TileIndex tile)
-{
-	int x = TileX(tile);
-	int y = TileY(tile);
-
-	if (rect->left   > x) rect->left   = x;
-	if (rect->bottom > y) rect->bottom = y;
-	if (rect->right  < x) rect->right  = x;
-	if (rect->top    < y) rect->top    = y;
-}
-
 /** Update the acceptance for a station.
  * @param st Station to update
  * @param show_msg controls whether to display a message that acceptance was changed.
@@ -558,56 +547,17 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
 	/* Don't update acceptance for a buoy */
 	if (st->IsBuoy()) return;
 
-	Rect rect;
-	rect.left   = MapSizeX();
-	rect.bottom = MapSizeY();
-	rect.right  = 0;
-	rect.top    = 0;
-
 	/* old accepted goods types */
 	uint old_acc = GetAcceptanceMask(st);
 
-	/* Put all the tiles that span an area in the table. */
-	if (st->train_tile != INVALID_TILE) {
-		MergePoint(&rect, st->train_tile);
-		MergePoint(&rect, st->train_tile + TileDiffXY(st->trainst_w - 1, st->trainst_h - 1));
-	}
-
-	if (st->airport_tile != INVALID_TILE) {
-		const AirportFTAClass *afc = st->Airport();
-
-		MergePoint(&rect, st->airport_tile);
-		MergePoint(&rect, st->airport_tile + TileDiffXY(afc->size_x - 1, afc->size_y - 1));
-	}
-
-	if (st->dock_tile != INVALID_TILE) {
-		MergePoint(&rect, st->dock_tile);
-		if (IsDockTile(st->dock_tile)) {
-			MergePoint(&rect, st->dock_tile + TileOffsByDiagDir(GetDockDirection(st->dock_tile)));
-		} // else OilRig
-	}
-
-	for (const RoadStop *rs = st->bus_stops; rs != NULL; rs = rs->next) {
-		MergePoint(&rect, rs->xy);
-	}
-
-	for (const RoadStop *rs = st->truck_stops; rs != NULL; rs = rs->next) {
-		MergePoint(&rect, rs->xy);
-	}
-
 	/* And retrieve the acceptance. */
 	AcceptedCargo accepts;
-	assert((rect.right >= rect.left) == !st->rect.IsEmpty());
+	if (!st->rect.IsEmpty()) {
-	if (rect.right >= rect.left) {
-		assert(rect.left == st->rect.left);
-		assert(rect.top == st->rect.bottom);
-		assert(rect.right == st->rect.right);
-		assert(rect.bottom == st->rect.top);
 		GetAcceptanceAroundTiles(
 			accepts,
-			TileXY(rect.left, rect.bottom),
+			TileXY(st->rect.left, st->rect.top),
-			rect.right - rect.left   + 1,
+			st->rect.right  - st->rect.left + 1,
-			rect.top   - rect.bottom + 1,
+			st->rect.bottom - st->rect.top  + 1,
 			st->GetCatchmentRadius()
 		);
 	} else {

src/town_cmd.cpp

@@ -2603,7 +2603,6 @@ Town *ClosestTownFromTile(TileIndex tile, uint threshold)
 
 				Town *town = GetTown(tid);
 				assert(town->IsValid());
-				assert(town == CalcClosestTownFromTile(tile));
 
 				if (DistanceManhattan(tile, town->xy) >= threshold) town = NULL;
 

src/train_cmd.cpp

@@ -4325,14 +4325,28 @@ static void TrainLocoHandler(Vehicle *v, bool mode)
 	} else {
 		TrainCheckIfLineEnds(v);
 		/* Loop until the train has finished moving. */
-		do {
+		for (;;) {
 			j -= adv_spd;
 			TrainController(v, NULL);
 			/* Don't continue to move if the train crashed. */
 			if (CheckTrainCollision(v)) break;
 			/* 192 spd used for going straight, 256 for going diagonally. */
 			adv_spd = (v->direction & 1) ? 192 : 256;
-		} while (j >= adv_spd);
+
+			/* No more moving this tick */
+			if (j < adv_spd || v->cur_speed == 0) break;
+
+			OrderType order_type = v->current_order.GetType();
+			/* Do not skip waypoints (incl. 'via' stations) when passing through at full speed. */
+			if ((order_type == OT_GOTO_WAYPOINT &&
+						v->dest_tile == v->tile) ||
+					(order_type == OT_GOTO_STATION &&
+						(v->current_order.GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) &&
+						IsTileType(v->tile, MP_STATION) &&
+						v->current_order.GetDestination() == GetStationIndex(v->tile))) {
+				ProcessOrders(v);
+			}
+		}
 		SetLastSpeed(v, v->cur_speed);
 	}
 

src/vehicle.cpp

@@ -1514,6 +1514,7 @@ void Vehicle::BeginLoading()
 	InvalidateWindow(WC_STATION_VIEW, this->last_station_visited);
 
 	GetStation(this->last_station_visited)->MarkTilesDirty(true);
+	this->cur_speed = 0;
 	this->MarkDirty();
 }