mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix undefined left shifts

This commit is contained in:
Michał Janiszewski 2016-06-03 13:13:58 +02:00
parent 24991b03ec
commit a44cd9cb15
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/thrill/motion_simulator.c
View File

@ -62,7 +62,7 @@ static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 di
uint32 imageColourFlags = RCT2_GLOBAL(0x00F441A0, uint32);
if (imageColourFlags == 0x20000000) {
imageColourFlags = (IMAGE_TYPE_UNKNOWN | IMAGE_TYPE_USE_PALETTE) << 28;
imageColourFlags = (uint32)(IMAGE_TYPE_UNKNOWN | IMAGE_TYPE_USE_PALETTE) << 28;
imageColourFlags |= ride->vehicle_colours[0].trim_colour << 19;
imageColourFlags |= ride->vehicle_colours[0].body_colour << 24;
}

4
src/ride/track_paint.c
View File

@ -836,8 +836,8 @@ void track_paint_util_spinning_tunnel_paint(sint8 thickness, sint16 height, uint
uint32 colourFlags = RCT2_GLOBAL(0x00F4419C, uint32);
uint32 colourFlags2 = RCT2_GLOBAL(0x00F44198, uint32);
if (colourFlags2 & (IMAGE_TYPE_UNKNOWN << 28)) {
colourFlags |= colourFlags2 & (IMAGE_TYPE_UNKNOWN << 28 | 0x1F << 24);
if (colourFlags2 & ((uint32)IMAGE_TYPE_UNKNOWN << 28)) {
colourFlags |= colourFlags2 & ((uint32)IMAGE_TYPE_UNKNOWN << 28 | 0x1F << 24);
}
uint32 imageId = trackSpritesGhostTrainSpinningTunnel[direction & 1][0][frame] | colourFlags;