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

MSVC fixes

This commit is contained in:
Michał Janiszewski 2017-10-12 00:08:40 +02:00
parent d365407384
commit a7be24b2b4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/ride/Vehicle.cpp
View File

@ -5369,7 +5369,7 @@ static void vehicle_crash_on_water(rct_vehicle * vehicle)
sprite_move(vehicle->x, vehicle->y, vehicle->z, (rct_sprite *)vehicle); sprite_move(vehicle->x, vehicle->y, vehicle->z, (rct_sprite *)vehicle);
vehicle_invalidate(vehicle); vehicle_invalidate(vehicle);
vehicle->var_4E = 0xFFFF; vehicle->var_4E = 0xFFFFu;
} }
/** /**
@ -6317,7 +6317,7 @@ static sint32 vehicle_update_motion_dodgems(rct_vehicle * vehicle)
uint8 oldC4 = vehicle->var_C4 & 0x1E; uint8 oldC4 = vehicle->var_C4 & 0x1E;
vehicle->var_C4 = 0; vehicle->var_C4 = 0;
LocationXYZ16 location = { .x = vehicle->x, .y = vehicle->y, .z = vehicle->z }; LocationXYZ16 location = { vehicle->x, vehicle->y, vehicle->z };
location.x += Unk9A36C4[oldC4].x; location.x += Unk9A36C4[oldC4].x;
location.y += Unk9A36C4[oldC4].y; location.y += Unk9A36C4[oldC4].y;

8
src/openrct2/ride/vehicle_data.h
View File

@ -19,6 +19,10 @@
#include "../common.h" #include "../common.h"
#ifdef __cplusplus
extern "C" {
#endif
extern const uint8 * Rotation1TimeToSpriteMaps[]; extern const uint8 * Rotation1TimeToSpriteMaps[];
extern const uint8 * Rotation2TimeToSpriteMaps[]; extern const uint8 * Rotation2TimeToSpriteMaps[];
extern const uint8 * Rotation3TimeToSpriteMaps[]; extern const uint8 * Rotation3TimeToSpriteMaps[];
@ -38,4 +42,8 @@ extern const sint32 dword_9A2970[];
extern const sint32 word_9A3684[]; extern const sint32 word_9A3684[];
#ifdef __cplusplus
}
#endif
#endif #endif