summaryrefslogtreecommitdiff
path: root/src/players.cpp
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2007-11-08 16:09:04 +0000
committerbelugas <belugas@openttd.org>2007-11-08 16:09:04 +0000
commit2edf7afa6c4c2417e893a9bcd946ce65d08bb4d7 (patch)
tree3b8493a7031822f4d4d985195b822a3ca694522b /src/players.cpp
parent153cba2ef35a58060edbc9a72e313f489a33ee2c (diff)
downloadopenttd-2edf7afa6c4c2417e893a9bcd946ce65d08bb4d7.tar.xz
(svn r11392) -Codechange: Remove some MSVC warnings by removing boolean typecast that can be avoided by using HASBIT instead.
Although the code is old (r2817), it is the recent changes made in macros.h that brough it up.
Diffstat (limited to 'src/players.cpp')
-rw-r--r--src/players.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/players.cpp b/src/players.cpp
index 5a06a90ae..0773bb0ab 100644
--- a/src/players.cpp
+++ b/src/players.cpp
@@ -676,11 +676,11 @@ CommandCost CmdSetAutoReplace(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
p = GetPlayer(_current_player);
switch (GB(p1, 0, 3)) {
case 0:
- if (p->engine_renew == (bool)GB(p2, 0, 1))
+ if (p->engine_renew == HASBIT(p2, 0))
return CMD_ERROR;
if (flags & DC_EXEC) {
- p->engine_renew = (bool)GB(p2, 0, 1);
+ p->engine_renew = HASBIT(p2, 0);
if (IsLocalPlayer()) {
_patches.autorenew = p->engine_renew;
InvalidateWindow(WC_GAME_OPTIONS, 0);
@@ -749,7 +749,7 @@ CommandCost CmdSetAutoReplace(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
case 4:
if (flags & DC_EXEC) {
- p->engine_renew = (bool)GB(p1, 15, 1);
+ p->engine_renew = HASBIT(p1, 15);
p->engine_renew_months = (int16)GB(p1, 16, 16);
p->engine_renew_money = (uint32)p2;
@@ -762,11 +762,11 @@ CommandCost CmdSetAutoReplace(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
}
break;
case 5:
- if (p->renew_keep_length == (bool)GB(p2, 0, 1))
+ if (p->renew_keep_length == HASBIT(p2, 0))
return CMD_ERROR;
if (flags & DC_EXEC) {
- p->renew_keep_length = (bool)GB(p2, 0, 1);
+ p->renew_keep_length = HASBIT(p2, 0);
if (IsLocalPlayer()) {
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_TRAIN);
}