Fix left shifts that may overflow

This commit is contained in:
Michał Janiszewski 2016-10-13 20:48:42 +02:00 committed by Ted John
parent 55d3ab8cc8
commit f1cbb7935d
9 changed files with 11 additions and 11 deletions

View File

@ -82,7 +82,7 @@ enum {
IMAGE_TYPE_DEFAULT = 0,
IMAGE_TYPE_REMAP = (1 << 29),
IMAGE_TYPE_TRANSPARENT = (1 << 30),
IMAGE_TYPE_REMAP_2_PLUS = (1 << 31)
IMAGE_TYPE_REMAP_2_PLUS = (1u << 31)
// REMAP_2_PLUS + REMAP = REMAP 2
// REMAP_2_PLUS = REMAP 3
};

View File

@ -891,7 +891,7 @@ enum {
TEXT_DRAW_FLAG_OUTLINE = 1 << 1,
TEXT_DRAW_FLAG_Y_OFFSET_EFFECT = 1 << 29,
TEXT_DRAW_FLAG_TTF = 1 << 30,
TEXT_DRAW_FLAG_NO_DRAW = 1 << 31
TEXT_DRAW_FLAG_NO_DRAW = 1u << 31
};
typedef struct text_draw_info {

View File

@ -100,7 +100,7 @@ enum {
GAME_COMMAND_FLAG_5 = (1 << 5),
GAME_COMMAND_FLAG_GHOST = (1 << 6),
GAME_COMMAND_FLAG_7 = (1 << 7),
GAME_COMMAND_FLAG_NETWORKED = (1 << 31) // Game command is coming from network
GAME_COMMAND_FLAG_NETWORKED = (1u << 31) // Game command is coming from network
};
enum {

View File

@ -281,7 +281,7 @@ enum PEEP_FLAGS {
PEEP_FLAGS_NICE_RIDE_DEPRECATED = (1 << 26), // Used to make the peep think "Nice ride! But not as good as the Phoenix..." on exiting a ride
PEEP_FLAGS_INTAMIN_DEPRECATED = (1 << 27), // Used to make the peep think "I'm so excited - It's an Intamin ride!" while riding on a Intamin ride.
PEEP_FLAGS_HERE_WE_ARE = (1 << 28), // Makes the peep think "...and here we are on X!" while riding a ride
PEEP_FLAGS_TWITCH = (1 << 31) // Added for twitch integration
PEEP_FLAGS_TWITCH = (1u << 31) // Added for twitch integration
};
enum PEEP_NAUSEA_TOLERANCE {

View File

@ -456,7 +456,7 @@ extern "C"
enum {
S6_SAVE_FLAG_EXPORT = 1 << 0,
S6_SAVE_FLAG_SCENARIO = 1 << 1,
S6_SAVE_FLAG_AUTOMATIC = 1 << 31,
S6_SAVE_FLAG_AUTOMATIC = 1u << 31,
};
/**

View File

@ -445,7 +445,7 @@ enum {
RIDE_ENTRY_FLAG_28 = 1 << 28, // 0x10000000
RIDE_ENTRY_FLAG_29 = 1 << 29, // 0x20000000
RIDE_ENTRY_FLAG_30 = 1 << 30, // 0x40000000
RIDE_ENTRY_FLAG_31 = 1 << 31, // 0x80000000
RIDE_ENTRY_FLAG_31 = 1u << 31, // 0x80000000
};
enum{
@ -785,7 +785,7 @@ enum {
RIDE_TYPE_FLAG_HAS_TRACK = 1 << 28,
RIDE_TYPE_FLAG_29 = 1 << 29, // used only by lift
RIDE_TYPE_FLAG_30 = 1 << 30,
RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR = 1 << 31,
RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR = 1u << 31,
};
enum {

View File

@ -159,7 +159,7 @@ typedef struct track_design_file_ref {
enum {
TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER = (1 << 1),
TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1 << 31) // Not used anymore.
TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1u << 31) // Not used anymore.
};
enum {

View File

@ -1045,7 +1045,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track
track->type == TRACK_ELEM_RIGHT_LARGE_HALF_LOOP_DOWN ||
track->type == TRACK_ELEM_LEFT_LARGE_HALF_LOOP_DOWN
) {
td6->flags |= (1 << 31);
td6->flags |= (1u << 31);
}
if (track->type == TRACK_ELEM_LOG_FLUME_REVERSER) {

View File

@ -1390,8 +1390,8 @@ static void window_guest_stats_bars_paint(int value, int x, int y, rct_window *w
gfx_fill_rect_inset(dpi, x + 0x3A, y + 1, x + 0x3A + 0x79, y + 9, w->colours[1], 0x30);
int blink_flag = colour & (1 << 0x1F); //0x80000000
colour &= ~(1 << 0x1F);
int blink_flag = colour & (1u << 0x1F); //0x80000000
colour &= ~(1u << 0x1F);
if (!blink_flag ||
game_is_paused() ||
(gCurrentTicks & 8) == 0)