(svn r11088) -Fix (r11063, r11067): MSVC warning C4804: '>' : unsafe use of type 'bool' in operation

pull/155/head
glx 17 years ago
parent a20f87e1e7
commit ccf13f3ccc

@ -1696,7 +1696,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
* if _patches.loading_indicators == 1, _local_player must be the owner or must be a spectator to show ind., so 1 > 0
* if _patches.loading_indicators == 0, do not display indicators ... 0 is never greater than anything
*/
if (_game_mode != GM_MENU && (_patches.loading_indicators > (v->owner != _local_player && _local_player != PLAYER_SPECTATOR))) {
if (_game_mode != GM_MENU && (_patches.loading_indicators > (uint)(v->owner != _local_player && _local_player != PLAYER_SPECTATOR))) {
StringID percent_up_down = STR_NULL;
int percent = CalcPercentVehicleFilled(v, &percent_up_down);
if (v->fill_percent_te_id == INVALID_TE_ID) {

@ -1245,7 +1245,7 @@ void ShowVehicleListWindow(PlayerID player, VehicleType vehicle_type)
* if _ctrl_pressed, do the opposite action (Advanced list x Normal list)
*/
if ((_patches.advanced_vehicle_list > (player != _local_player)) != _ctrl_pressed) {
if ((_patches.advanced_vehicle_list > (uint)(player != _local_player)) != _ctrl_pressed) {
ShowPlayerGroup(player, vehicle_type);
} else {
ShowVehicleListWindowLocal(player, VLW_STANDARD, vehicle_type, 0);

Loading…
Cancel
Save