Merge branch 'master' into jgrpp
# Conflicts: # src/airport_gui.cpp # src/build_vehicle_gui.cpp # src/direction_type.h # src/gfx_type.h # src/group_gui.cpp # src/misc_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/signs_gui.cpp # src/slope_func.h # src/smallmap_gui.cpp # src/terraform_gui.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/town_type.h # src/vehicle_type.h # src/widget_type.h
This commit is contained in:
@@ -71,7 +71,7 @@ inline DirDiff DirDifference(Direction d0, Direction d1)
|
||||
dbg_assert(IsValidDirection(d1));
|
||||
/* Cast to uint so compiler can use bitmask. If the difference is negative
|
||||
* and we used int instead of uint, further "+ 8" would have to be added. */
|
||||
return (DirDiff)((uint)(d0 - d1) % 8);
|
||||
return static_cast<DirDiff>((static_cast<uint>(d0) - static_cast<uint>(d1)) % 8);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -88,7 +88,7 @@ inline DirDiff DirDifference(Direction d0, Direction d1)
|
||||
inline DirDiff ChangeDirDiff(DirDiff d, DirDiff delta)
|
||||
{
|
||||
/* Cast to uint so compiler can use bitmask. Result can never be negative. */
|
||||
return (DirDiff)((uint)(d + delta) % 8);
|
||||
return static_cast<DirDiff>((static_cast<uint>(d) + static_cast<uint>(delta)) % 8);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -105,7 +105,7 @@ inline Direction ChangeDir(Direction d, DirDiff delta)
|
||||
{
|
||||
dbg_assert(IsValidDirection(d));
|
||||
/* Cast to uint so compiler can use bitmask. Result can never be negative. */
|
||||
return (Direction)((uint)(d + delta) % 8);
|
||||
return static_cast<Direction>((static_cast<uint>(d) + static_cast<uint>(delta)) % 8);
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta)
|
||||
{
|
||||
dbg_assert(IsValidDiagDirection(d));
|
||||
/* Cast to uint so compiler can use bitmask. Result can never be negative. */
|
||||
return (DiagDirection)((uint)(d + delta) % 4);
|
||||
return static_cast<DiagDirection>((static_cast<uint>(d) + static_cast<uint>(delta)) % 4);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -296,7 +296,7 @@ inline DiagDirection DirToDiagDirAlongAxis(Direction dir, Axis axis)
|
||||
* X 4, 5, 6 -> 2 0, 1, 2 -> 0
|
||||
* Y 2, 3, 4 -> 1 0, 6, 7 -> 3
|
||||
*/
|
||||
return (DiagDirection)((((dir - axis) & 4) >> 1) | axis);
|
||||
return (DiagDirection)((((static_cast<uint>(dir) - static_cast<uint>(axis)) & 4) >> 1) | axis);
|
||||
}
|
||||
|
||||
#endif /* DIRECTION_FUNC_H */
|
||||
|
Reference in New Issue
Block a user