mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Code Issues Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Ted John
2019-07-21 22:52:53 +01:00
parent 5af3bbf971
commit 7ce2f38c92
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@@ -362,7 +362,7 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter
argPos += sizeof(rct_string_id);
argPos += banner->FormatTextTo(gMapTooltipFormatArgs + argPos);
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
argPos += sizeof(rct_string_id);
argPos += sizeof(rct_string_id);
set_map_tooltip_format_arg(argPos, rct_string_id, sceneryEntry->name);
return info->type;
}

3
src/openrct2/Game.cpp
View File

@@ -635,7 +635,8 @@ void game_fix_save_vars()
}
set_format_arg(0, uint32_t, peep->id);
auto curName = peep->GetName();
log_warning("Peep %u (%s) has invalid ride station = %u for ride %u.", spriteIndex, curName.c_str(), srcStation, rideIdx);
log_warning(
"Peep %u (%s) has invalid ride station = %u for ride %u.", spriteIndex, curName.c_str(), srcStation, rideIdx);
int8_t station = ride_get_first_valid_station_exit(get_ride(rideIdx));
if (station == -1)
{

3
src/openrct2/drawing/Drawing.h
View File

@@ -376,7 +376,8 @@ void ttf_draw_string(rct_drawpixelinfo* dpi, const_utf8string text, int32_t colo
// scrolling text
void scrolling_text_initialise_bitmaps();
void scrolling_text_invalidate();
int32_t scrolling_text_setup(struct paint_session* session, rct_string_id stringId, uint16_t scroll, uint16_t scrollingMode, colour_t colour);
int32_t scrolling_text_setup(
struct paint_session* session, rct_string_id stringId, uint16_t scroll, uint16_t scrollingMode, colour_t colour);
rct_size16 FASTCALL gfx_get_sprite_size(uint32_t image_id);
size_t g1_calculate_data_size(const rct_g1_element* g1);

4
src/openrct2/paint/tile_element/Paint.Path.cpp
View File

@@ -477,8 +477,8 @@ static void sub_6A4101(
uint16_t scroll = (gCurrentTicks / 2) % string_width;
sub_98199C(
session, scrolling_text_setup(session, STR_BANNER_TEXT_FORMAT, scroll, scrollingMode, COLOUR_BLACK), 0, 0, 1, 1, 21,
height + 7, boundBoxOffsets.x, boundBoxOffsets.y, boundBoxOffsets.z);
session, scrolling_text_setup(session, STR_BANNER_TEXT_FORMAT, scroll, scrollingMode, COLOUR_BLACK), 0, 0, 1, 1,
21, height + 7, boundBoxOffsets.x, boundBoxOffsets.y, boundBoxOffsets.z);
}
session->InteractionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH;

4
src/openrct2/paint/tile_element/Paint.Wall.cpp
View File

@@ -446,7 +446,7 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
uint16_t scroll = (gCurrentTicks / 2) % string_width;
sub_98199C(
session, scrolling_text_setup(session, STR_SCROLLING_SIGN_TEXT, scroll, scrollingMode, secondaryColour), 0, 0, 1, 1, 13, height + 8,
boundsOffset.x, boundsOffset.y, boundsOffset.z);
session, scrolling_text_setup(session, STR_SCROLLING_SIGN_TEXT, scroll, scrollingMode, secondaryColour), 0, 0, 1, 1,
13, height + 8, boundsOffset.x, boundsOffset.y, boundsOffset.z);
}
}

18
src/openrct2/peep/Peep.h
View File

@@ -539,15 +539,15 @@ struct Staff;
struct Peep : rct_sprite_common
{
char* name;
uint16_t next_x; // 0x24
uint16_t next_y; // 0x26
uint8_t next_z; // 0x28
uint8_t next_flags; // 0x29
uint8_t outside_of_park; // 0x2A
PeepState state; // 0x2B
uint8_t sub_state; // 0x2C
PeepSpriteType sprite_type; // 0x2D
PeepType type; // 0x2E
uint16_t next_x; // 0x24
uint16_t next_y; // 0x26
uint8_t next_z; // 0x28
uint8_t next_flags; // 0x29
uint8_t outside_of_park; // 0x2A
PeepState state; // 0x2B
uint8_t sub_state; // 0x2C
PeepSpriteType sprite_type; // 0x2D
PeepType type; // 0x2E
union
{
uint8_t staff_type; // 0x2F

3
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -999,7 +999,8 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
}
else
{
log_warning("Unable to allocate user string for peep #%d (%s) during S6 export.", (int)src->sprite_index, src->name);
log_warning(
"Unable to allocate user string for peep #%d (%s) during S6 export.", (int)src->sprite_index, src->name);
}
}
if (generateName)