mirror of https://github.com/OpenRCT2/OpenRCT2.git
Apply format on new/updated code before rebase
This commit is contained in:
parent
73a7e935c3
commit
9bfa8bdbe8
|
@ -78,16 +78,20 @@ void scrolling_text_initialise_bitmaps()
|
|||
}
|
||||
}
|
||||
|
||||
for (int32_t i = 0; i < SPR_G2_GLYPH_COUNT; i++) {
|
||||
for (int32_t i = 0; i < SPR_G2_GLYPH_COUNT; i++)
|
||||
{
|
||||
memset(drawingSurface, 0, sizeof(drawingSurface));
|
||||
gfx_draw_sprite_software(&dpi, SPR_G2_CHAR_BEGIN + (FONT_SIZE_TINY * SPR_G2_GLYPH_COUNT) + i, -1, 0, 0);
|
||||
|
||||
for (int32_t x = 0; x < 8; x++) {
|
||||
for (int32_t x = 0; x < 8; x++)
|
||||
{
|
||||
uint8_t val = 0;
|
||||
for (int32_t y = 0; y < 8; y++) {
|
||||
for (int32_t y = 0; y < 8; y++)
|
||||
{
|
||||
val >>= 1;
|
||||
uint8_t pixel = dpi.bits[x + y * 8];
|
||||
if (pixel == 1 || (gTinyFontAntiAliased && pixel == 2)) {
|
||||
if (pixel == 1 || (gTinyFontAntiAliased && pixel == 2))
|
||||
{
|
||||
val |= 0x80;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -629,7 +629,8 @@ void RideObject::ReadJson(IReadObjectContext* context, const json_t* root)
|
|||
|
||||
_legacyType.flags |= ObjectJsonHelpers::GetFlags<uint32_t>(
|
||||
properties,
|
||||
{ { "noInversions", RIDE_ENTRY_FLAG_NO_INVERSIONS },
|
||||
{
|
||||
{ "noInversions", RIDE_ENTRY_FLAG_NO_INVERSIONS },
|
||||
{ "noBanking", RIDE_ENTRY_FLAG_NO_BANKED_TRACK },
|
||||
{ "playDepartSound", RIDE_ENTRY_FLAG_PLAY_DEPART_SOUND },
|
||||
// Skipping "disallowWandering", no vehicle sets this flag.
|
||||
|
@ -640,7 +641,8 @@ void RideObject::ReadJson(IReadObjectContext* context, const json_t* root)
|
|||
{ "disableBreakdown", RIDE_ENTRY_FLAG_CANNOT_BREAK_DOWN },
|
||||
// Skipping noDoorsOverTrack, moved to ride groups.
|
||||
{ "noCollisionCrashes", RIDE_ENTRY_FLAG_DISABLE_COLLISION_CRASHES },
|
||||
{ "disablePainting", RIDE_ENTRY_FLAG_DISABLE_COLOUR_TAB } });
|
||||
{ "disablePainting", RIDE_ENTRY_FLAG_DISABLE_COLOUR_TAB },
|
||||
});
|
||||
|
||||
ObjectJsonHelpers::LoadStrings(root, GetStringTable());
|
||||
ObjectJsonHelpers::LoadImages(context, root, GetImageTable());
|
||||
|
@ -828,7 +830,8 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t* jCar)
|
|||
|
||||
car.flags |= ObjectJsonHelpers::GetFlags<uint32_t>(
|
||||
jCar,
|
||||
{ { "VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY", VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY },
|
||||
{
|
||||
{ "VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY", VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY },
|
||||
{ "VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS", VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS },
|
||||
{ "VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH", VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH },
|
||||
{ "VEHICLE_ENTRY_FLAG_MINI_GOLF", VEHICLE_ENTRY_FLAG_MINI_GOLF },
|
||||
|
@ -858,7 +861,8 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t* jCar)
|
|||
{ "VEHICLE_ENTRY_FLAG_CHAIRLIFT", VEHICLE_ENTRY_FLAG_CHAIRLIFT },
|
||||
{ "VEHICLE_ENTRY_FLAG_WATER_RIDE", VEHICLE_ENTRY_FLAG_WATER_RIDE },
|
||||
{ "VEHICLE_ENTRY_FLAG_GO_KART", VEHICLE_ENTRY_FLAG_GO_KART },
|
||||
{ "VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT", VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT } });
|
||||
{ "VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT", VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT },
|
||||
});
|
||||
return car;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue