summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-09-11 17:42:46 +0000
committerglx <glx@openttd.org>2007-09-11 17:42:46 +0000
commit7b7c66fb6b604e32dbcfb6104771b33fa6f32dc1 (patch)
tree373ae0322a5783ec7d3a33f6057ff34231349d88
parent22843caaf53d597d21d5972f49ecc8841be50c9c (diff)
downloadopenttd-7b7c66fb6b604e32dbcfb6104771b33fa6f32dc1.tar.xz
(svn r11088) -Fix (r11063, r11067): MSVC warning C4804: '>' : unsafe use of type 'bool' in operation
-rw-r--r--src/economy.cpp2
-rw-r--r--src/vehicle_gui.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index f0669be00..e471679b3 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -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) {
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 16f42465b..252293a5a 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -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);