(svn r5910) Fix some more warnings on MSVC by using (void*) casts. Followup of r5907.
This commit is contained in:
		@@ -1142,7 +1142,7 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e)
 | 
				
			|||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_DESTROY:
 | 
						case WE_DESTROY:
 | 
				
			||||||
		free(vl->sort_list);
 | 
							free((void*)vl->sort_list);
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
						case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1078,7 +1078,7 @@ static void PlayerRoadVehWndProc(Window *w, WindowEvent *e)
 | 
				
			|||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_DESTROY:
 | 
						case WE_DESTROY:
 | 
				
			||||||
		free(vl->sort_list);
 | 
							free((void*)vl->sort_list);
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
						case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1090,7 +1090,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e)
 | 
				
			|||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_DESTROY:
 | 
						case WE_DESTROY:
 | 
				
			||||||
		free(vl->sort_list);
 | 
							free((void*)vl->sort_list);
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
						case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -232,7 +232,7 @@ static void SortStationsList(plstations_d *sl)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	_internal_sort_order = sl->flags & SL_ORDER;
 | 
						_internal_sort_order = sl->flags & SL_ORDER;
 | 
				
			||||||
	_last_station = NULL; // used for "cache" in namesorting
 | 
						_last_station = NULL; // used for "cache" in namesorting
 | 
				
			||||||
	qsort(sl->sort_list, sl->list_length, sizeof(sl->sort_list[0]), _station_sorter[sl->sort_type]);
 | 
						qsort((void*)sl->sort_list, sl->list_length, sizeof(sl->sort_list[0]), _station_sorter[sl->sort_type]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 | 
						sl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 | 
				
			||||||
	sl->flags &= ~SL_RESORT;
 | 
						sl->flags &= ~SL_RESORT;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1539,7 +1539,7 @@ static void PlayerTrainsWndProc(Window *w, WindowEvent *e)
 | 
				
			|||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_DESTROY:
 | 
						case WE_DESTROY:
 | 
				
			||||||
		free(vl->sort_list);
 | 
							free((void*)vl->sort_list);
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
						case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -182,7 +182,7 @@ void SortVehicleList(vehiclelist_d *vl)
 | 
				
			|||||||
	_internal_sort_order = vl->flags & VL_DESC;
 | 
						_internal_sort_order = vl->flags & VL_DESC;
 | 
				
			||||||
	_internal_name_sorter_id = STR_SV_TRAIN_NAME;
 | 
						_internal_name_sorter_id = STR_SV_TRAIN_NAME;
 | 
				
			||||||
	_last_vehicle = NULL; // used for "cache" in namesorting
 | 
						_last_vehicle = NULL; // used for "cache" in namesorting
 | 
				
			||||||
	qsort(vl->sort_list, vl->list_length, sizeof(vl->sort_list[0]),
 | 
						qsort((void*)vl->sort_list, vl->list_length, sizeof(vl->sort_list[0]),
 | 
				
			||||||
		_vehicle_sorter[vl->sort_type]);
 | 
							_vehicle_sorter[vl->sort_type]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 | 
						vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user