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

Use named casts on openrct2-ui/windows (#11136)

This commit is contained in:
Tulio Leao 2020-04-18 08:32:48 -03:00 committed by GitHub
parent b71062ce1b
commit 935cfe90fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 326 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Changelog.cpp
View File

@ -163,7 +163,7 @@ static void window_changelog_scrollgetsize(
*width = _changelogLongestLineWidth + 4;
const int32_t lineHeight = font_get_line_height(gCurrentFontSpriteBase);
*height = (int32_t)(_changelogLines.size() * lineHeight);
*height = static_cast<int32_t>(_changelogLines.size() * lineHeight);
}
static void window_changelog_invalidate(rct_window* w)
@ -243,7 +243,7 @@ static bool window_changelog_read_file()
}
// Non-const cast required until C++17 is enabled
auto* start = (char*)_changelogText.data();
auto* start = static_cast<char*>(_changelogText.data());
if (_changelogText.size() >= 3 && utf8_is_bom(start))
{
start += 3;

34
src/openrct2-ui/windows/Cheats.cpp
View File

@ -188,17 +188,17 @@ constexpr int32_t OPTW = 220; // Opti
constexpr int32_t OPTH = 10; // Option (checkbox) height (two columns)
constexpr int32_t GROUP_SPACE = 6;
#define YPL(ROW) ((int16_t)(YOS + ((BTNH + YSPA) * ROW)))
#define HPL(ROW) ((int16_t)(YPL(ROW) + BTNH))
#define OHPL(ROW) ((int16_t)(YPL(ROW) + OPTH))
#define XPL(COL) ((int16_t)(XOS + ((BTNW + XSPA) * COL)))
#define WPL(COL) ((int16_t)(XPL(COL) + BTNW))
#define OWPL ((int16_t)(XPL(0) + OPTW))
#define YPL(ROW) (static_cast<int16_t>((YOS + ((BTNH + YSPA) * ROW))))
#define HPL(ROW) (static_cast<int16_t>(YPL(ROW) + BTNH))
#define OHPL(ROW) (static_cast<int16_t>(YPL(ROW) + OPTH))
#define XPL(COL) (static_cast<int16_t>(XOS + ((BTNW + XSPA) * COL)))
#define WPL(COL) (static_cast<int16_t>(XPL(COL) + BTNW))
#define OWPL (static_cast<int16_t>(XPL(0) + OPTW))
#define MIN_BTN_LEFT ((int16_t)(XPL(1)))
#define MIN_BTN_RIGHT ((int16_t)(WPL(1) - (BTNW / 2)))
#define MAX_BTN_LEFT ((int16_t)(XPL(1.5)))
#define MAX_BTN_RIGHT ((int16_t)(WPL(1)))
#define MIN_BTN_LEFT (static_cast<int16_t>(XPL(1)))
#define MIN_BTN_RIGHT (static_cast<int16_t>(WPL(1) - (BTNW / 2)))
#define MAX_BTN_LEFT (static_cast<int16_t>(XPL(1.5)))
#define MAX_BTN_RIGHT (static_cast<int16_t>(WPL(1)))
constexpr int32_t TXTO = 3; // Text horizontal offset from button left (for button text)
#pragma endregion
@ -658,26 +658,26 @@ static void window_cheats_money_mousedown(rct_window* w, rct_widgetindex widgetI
break;
case WIDX_MONTH_UP:
_monthSpinnerValue++;
_monthSpinnerValue = std::clamp(_monthSpinnerValue, 1, (int)MONTH_COUNT);
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, (int)days_in_month[_monthSpinnerValue - 1]);
_monthSpinnerValue = std::clamp(_monthSpinnerValue, 1, static_cast<int32_t>(MONTH_COUNT));
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, static_cast<int32_t>(days_in_month[_monthSpinnerValue - 1]));
widget_invalidate(w, WIDX_MONTH_BOX);
widget_invalidate(w, WIDX_DAY_BOX);
break;
case WIDX_MONTH_DOWN:
_monthSpinnerValue--;
_monthSpinnerValue = std::clamp(_monthSpinnerValue, 1, (int)MONTH_COUNT);
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, (int)days_in_month[_monthSpinnerValue - 1]);
_monthSpinnerValue = std::clamp(_monthSpinnerValue, 1, static_cast<int32_t>(MONTH_COUNT));
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, static_cast<int32_t>(days_in_month[_monthSpinnerValue - 1]));
widget_invalidate(w, WIDX_MONTH_BOX);
widget_invalidate(w, WIDX_DAY_BOX);
break;
case WIDX_DAY_UP:
_daySpinnerValue++;
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, (int)days_in_month[_monthSpinnerValue - 1]);
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, static_cast<int32_t>(days_in_month[_monthSpinnerValue - 1]));
widget_invalidate(w, WIDX_DAY_BOX);
break;
case WIDX_DAY_DOWN:
_daySpinnerValue--;
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, (int)days_in_month[_monthSpinnerValue - 1]);
_daySpinnerValue = std::clamp(_daySpinnerValue, 1, static_cast<int32_t>(days_in_month[_monthSpinnerValue - 1]));
widget_invalidate(w, WIDX_DAY_BOX);
break;
case WIDX_DATE_SET:
@ -1304,7 +1304,7 @@ static void window_cheats_set_page(rct_window* w, int32_t page)
rct_widget* widget = &w->widgets[WIDX_TAB_CONTENT];
while (widget->type != WWT_LAST)
{
maxY = std::max(maxY, (int32_t)widget->bottom);
maxY = std::max(maxY, static_cast<int32_t>(widget->bottom));
widget++;
}
maxY += 6;

2
src/openrct2-ui/windows/CustomCurrency.cpp
View File

@ -167,7 +167,7 @@ static void custom_currency_window_mouseup(rct_window* w, rct_widgetindex widget
case WIDX_RATE:
window_text_input_open(
w, WIDX_RATE, STR_RATE_INPUT_TITLE, STR_RATE_INPUT_DESC, STR_FORMAT_INTEGER,
(uint32_t)CurrencyDescriptors[CURRENCY_CUSTOM].rate, CURRENCY_RATE_MAX_NUM_DIGITS);
static_cast<uint32_t>(CurrencyDescriptors[CURRENCY_CUSTOM].rate), CURRENCY_RATE_MAX_NUM_DIGITS);
break;
}
}

21
src/openrct2-ui/windows/Dropdown.cpp
View File

@ -32,7 +32,7 @@ enum
};
static rct_widget window_dropdown_widgets[] = {
{ WWT_IMGBTN, 0, 0, 0, 0, 0, (uint32_t)SPR_NONE, STR_NONE },
{ WWT_IMGBTN, 0, 0, 0, 0, 0, static_cast<uint32_t>(SPR_NONE), STR_NONE },
{ WIDGETS_END },
};
@ -54,7 +54,7 @@ int32_t gDropdownDefaultIndex;
bool dropdown_is_checked(int32_t index)
{
if (index < 0 || index >= (int32_t)std::size(_dropdownItemsDisabled))
if (index < 0 || index >= static_cast<int32_t>(std::size(_dropdownItemsDisabled)))
{
return false;
}
@ -63,7 +63,7 @@ bool dropdown_is_checked(int32_t index)
bool dropdown_is_disabled(int32_t index)
{
if (index < 0 || index >= (int32_t)std::size(_dropdownItemsDisabled))
if (index < 0 || index >= static_cast<int32_t>(std::size(_dropdownItemsDisabled)))
{
return true;
}
@ -72,7 +72,7 @@ bool dropdown_is_disabled(int32_t index)
void dropdown_set_checked(int32_t index, bool value)
{
if (index < 0 || index >= (int32_t)std::size(_dropdownItemsDisabled))
if (index < 0 || index >= static_cast<int32_t>(std::size(_dropdownItemsDisabled)))
{
return;
}
@ -81,7 +81,7 @@ void dropdown_set_checked(int32_t index, bool value)
void dropdown_set_disabled(int32_t index, bool value)
{
if (index < 0 || index >= (int32_t)std::size(_dropdownItemsDisabled))
if (index < 0 || index >= static_cast<int32_t>(std::size(_dropdownItemsDisabled)))
{
return;
}
@ -143,7 +143,7 @@ void window_dropdown_show_text(int32_t x, int32_t y, int32_t extray, uint8_t col
max_string_width = 0;
for (size_t i = 0; i < num_items; i++)
{
format_string(buffer, 256, gDropdownItemsFormat[i], (void*)(&gDropdownItemsArgs[i]));
format_string(buffer, 256, gDropdownItemsFormat[i], static_cast<void*>(&gDropdownItemsArgs[i]));
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
string_width = gfx_get_string_width(buffer);
max_string_width = std::max(string_width, max_string_width);
@ -178,7 +178,7 @@ void window_dropdown_show_text_custom_width(
// Set and calculate num items, rows and columns
_dropdown_item_width = width;
_dropdown_item_height = (flags & DROPDOWN_FLAG_CUSTOM_HEIGHT) ? custom_height : DROPDOWN_ITEM_HEIGHT;
gDropdownNumItems = (int32_t)num_items;
gDropdownNumItems = static_cast<int32_t>(num_items);
// There must always be at least one column to prevent dividing by zero
if (gDropdownNumItems == 0)
{
@ -365,7 +365,7 @@ static void window_dropdown_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (item == DROPDOWN_FORMAT_LAND_PICKER || item == DROPDOWN_FORMAT_COLOUR_PICKER)
{
// Image item
image = (uint32_t)gDropdownItemsArgs[i];
image = static_cast<uint32_t>(gDropdownItemsArgs[i]);
if (item == DROPDOWN_FORMAT_COLOUR_PICKER && highlightedIndex == i)
image++;
@ -394,8 +394,9 @@ static void window_dropdown_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Draw item string
gfx_draw_string_left_clipped(
dpi, item, (void*)(&gDropdownItemsArgs[i]), colour, w->windowPos.x + 2 + (cell_x * _dropdown_item_width),
w->windowPos.y + 2 + (cell_y * _dropdown_item_height), w->width - 5);
dpi, item, static_cast<void*>(&gDropdownItemsArgs[i]), colour,
w->windowPos.x + 2 + (cell_x * _dropdown_item_width), w->windowPos.y + 2 + (cell_y * _dropdown_item_height),
w->width - 5);
}
}
}

7
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -409,11 +409,11 @@ static void window_editor_inventions_list_scrollgetheight(rct_window* w, int32_t
*height = 0;
if (scrollIndex == 0)
{
*height += (int32_t)gResearchItemsInvented.size() * SCROLLABLE_ROW_HEIGHT;
*height += static_cast<int32_t>(gResearchItemsInvented.size()) * SCROLLABLE_ROW_HEIGHT;
}
else
{
*height += (int32_t)gResearchItemsUninvented.size() * SCROLLABLE_ROW_HEIGHT;
*height += static_cast<int32_t>(gResearchItemsUninvented.size()) * SCROLLABLE_ROW_HEIGHT;
}
}
@ -696,7 +696,8 @@ static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpix
const auto rideEntry = get_ride_entry(researchItem.entryIndex);
const rct_string_id rideGroupName = get_ride_naming(researchItem.baseRideType, rideEntry).name;
format_string(
groupNamePtr, std::size(groupNameBuffer), STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME, (void*)&rideGroupName);
groupNamePtr, std::size(groupNameBuffer), STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME,
static_cast<const void*>(&rideGroupName));
format_string(vehicleNamePtr, std::size(vehicleNameBuffer), itemNameId, nullptr);
}
else

34
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -296,7 +296,7 @@ static bool visible_list_sort_ride_type(const list_item& a, const list_item& b)
static void visible_list_refresh(rct_window* w)
{
int32_t numObjects = (int32_t)object_repository_get_items_count();
int32_t numObjects = static_cast<int32_t>(object_repository_get_items_count());
visible_list_dispose();
w->selected_list_item = -1;
@ -317,7 +317,7 @@ static void visible_list_refresh(rct_window* w)
list_item currentListItem;
currentListItem.repositoryItem = item;
currentListItem.entry = (rct_object_entry*)&item->ObjectEntry;
currentListItem.entry = const_cast<rct_object_entry*>(&item->ObjectEntry);
currentListItem.filter = filter;
currentListItem.flags = &_objectSelectionFlags[i];
_listItems.push_back(std::move(currentListItem));
@ -391,7 +391,7 @@ rct_window* window_editor_object_selection_open()
window->enabled_widgets = (1 << WIDX_ADVANCED) | (1 << WIDX_INSTALL_TRACK) | (1 << WIDX_FILTER_DROPDOWN)
| (1 << WIDX_FILTER_STRING_BUTTON) | (1 << WIDX_FILTER_CLEAR_BUTTON) | (1 << WIDX_CLOSE) | (1 << WIDX_LIST_SORT_TYPE)
| (((uint32_t)1) << WIDX_LIST_SORT_RIDE);
| (1UL << WIDX_LIST_SORT_RIDE);
_filter_flags = gConfigInterface.object_selection_filter_flags;
std::fill_n(_filter_string, sizeof(_filter_string), 0x00);
@ -560,7 +560,7 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde
visible_list_refresh(w);
break;
default:
if (widgetIndex >= WIDX_TAB_1 && (size_t)widgetIndex < WIDX_TAB_1 + std::size(ObjectSelectionPages))
if (widgetIndex >= WIDX_TAB_1 && static_cast<size_t>(widgetIndex) < WIDX_TAB_1 + std::size(ObjectSelectionPages))
{
window_editor_object_set_page(w, widgetIndex - WIDX_TAB_1);
}
@ -672,7 +672,7 @@ static void window_editor_object_selection_dropdown(rct_window* w, rct_widgetind
*/
static void window_editor_object_selection_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
{
*height = (int32_t)(_listItems.size() * 12);
*height = static_cast<int32_t>(_listItems.size() * 12);
}
/**
@ -786,7 +786,7 @@ static void window_editor_object_selection_scroll_mouseover(
*/
static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
if (widgetIndex >= WIDX_TAB_1 && (size_t)widgetIndex < WIDX_TAB_1 + std::size(ObjectSelectionPages))
if (widgetIndex >= WIDX_TAB_1 && static_cast<size_t>(widgetIndex) < WIDX_TAB_1 + std::size(ObjectSelectionPages))
{
set_format_arg(0, rct_string_id, ObjectSelectionPages[(widgetIndex - WIDX_TAB_1)].Caption);
}
@ -909,7 +909,7 @@ static void window_editor_object_selection_invalidate(rct_window* w)
for (int32_t i = 0; i < 6; i++)
{
if (_filter_flags & (1 << (_numSourceGameItems + i)))
w->pressed_widgets |= (uint64_t)(1ULL << (WIDX_FILTER_RIDE_TAB_TRANSPORT + i));
w->pressed_widgets |= 1ULL << (WIDX_FILTER_RIDE_TAB_TRANSPORT + i);
}
}
@ -1027,8 +1027,8 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
widget = &w->widgets[WIDX_LIST_SORT_TYPE];
if (widget->type != WWT_EMPTY)
{
stringId = _listSortType == RIDE_SORT_TYPE ? (rct_string_id)(_listSortDescending ? STR_DOWN : STR_UP)
: (rct_string_id)STR_NONE;
stringId = _listSortType == RIDE_SORT_TYPE ? static_cast<rct_string_id>(_listSortDescending ? STR_DOWN : STR_UP)
: static_cast<rct_string_id>(STR_NONE);
gfx_draw_string_left_clipped(
dpi, STR_OBJECTS_SORT_TYPE, &stringId, w->colours[1], w->windowPos.x + widget->left + 1,
w->windowPos.y + widget->top + 1, widget->right - widget->left);
@ -1036,8 +1036,8 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
widget = &w->widgets[WIDX_LIST_SORT_RIDE];
if (widget->type != WWT_EMPTY)
{
stringId = _listSortType == RIDE_SORT_RIDE ? (rct_string_id)(_listSortDescending ? STR_DOWN : STR_UP)
: (rct_string_id)STR_NONE;
stringId = _listSortType == RIDE_SORT_RIDE ? static_cast<rct_string_id>(_listSortDescending ? STR_DOWN : STR_UP)
: static_cast<rct_string_id>(STR_NONE);
gfx_draw_string_left_clipped(
dpi, STR_OBJECTS_SORT_RIDE, &stringId, w->colours[1], w->windowPos.x + widget->left + 1,
w->windowPos.y + widget->top + 1, widget->right - widget->left);
@ -1237,7 +1237,7 @@ static void window_editor_object_selection_set_pressed_tab(rct_window* w)
static int32_t get_object_from_object_selection(uint8_t object_type, int32_t y)
{
int32_t listItemIndex = y / 12;
if (listItemIndex < 0 || (size_t)listItemIndex >= _listItems.size())
if (listItemIndex < 0 || static_cast<size_t>(listItemIndex) >= _listItems.size())
return -1;
return listItemIndex;
@ -1273,7 +1273,7 @@ static void window_editor_object_selection_manage_tracks()
*/
static void editor_load_selected_objects()
{
int32_t numItems = (int32_t)object_repository_get_items_count();
int32_t numItems = static_cast<int32_t>(object_repository_get_items_count());
const ObjectRepositoryItem* items = object_repository_get_items();
for (int32_t i = 0; i < numItems; i++)
{
@ -1395,13 +1395,13 @@ static bool filter_string(const ObjectRepositoryItem* item)
// Make use of lowercase characters only
for (int32_t i = 0; name_lower[i] != '\0'; i++)
name_lower[i] = (char)tolower(name_lower[i]);
name_lower[i] = static_cast<char>(tolower(name_lower[i]));
for (int32_t i = 0; type_lower[i] != '\0'; i++)
type_lower[i] = (char)tolower(type_lower[i]);
type_lower[i] = static_cast<char>(tolower(type_lower[i]));
for (int32_t i = 0; object_path[i] != '\0'; i++)
object_path[i] = (char)tolower(object_path[i]);
object_path[i] = static_cast<char>(tolower(object_path[i]));
for (int32_t i = 0; filter_lower[i] != '\0'; i++)
filter_lower[i] = (char)tolower(filter_lower[i]);
filter_lower[i] = static_cast<char>(tolower(filter_lower[i]));
// Check if the searched string exists in the name, ride type, or filename
bool inName = strstr(name_lower, filter_lower) != nullptr;

6
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -716,14 +716,14 @@ static void window_editor_objective_options_main_dropdown(rct_window* w, rct_wid
{
case WIDX_OBJECTIVE_DROPDOWN:
// TODO: Don't rely on string ID order
newObjectiveType = (uint8_t)(gDropdownItemsArgs[dropdownIndex] - STR_OBJECTIVE_DROPDOWN_NONE);
newObjectiveType = static_cast<uint8_t>(gDropdownItemsArgs[dropdownIndex] - STR_OBJECTIVE_DROPDOWN_NONE);
if (gScenarioObjectiveType != newObjectiveType)
window_editor_objective_options_set_objective(w, newObjectiveType);
break;
case WIDX_CATEGORY_DROPDOWN:
if (gS6Info.category != (uint8_t)dropdownIndex)
if (gS6Info.category != static_cast<uint8_t>(dropdownIndex))
{
gS6Info.category = (uint8_t)dropdownIndex;
gS6Info.category = static_cast<uint8_t>(dropdownIndex);
w->Invalidate();
}
break;

4
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -787,7 +787,7 @@ static void window_editor_scenario_options_financial_paint(rct_window* w, rct_dr
x = w->windowPos.x + w->widgets[WIDX_INTEREST_RATE].left + 1;
y = w->windowPos.y + w->widgets[WIDX_INTEREST_RATE].top;
int16_t interestRate = std::clamp<int16_t>((int16_t)gBankLoanInterestRate, INT16_MIN, INT16_MAX);
int16_t interestRate = std::clamp<int16_t>(static_cast<int16_t>(gBankLoanInterestRate), INT16_MIN, INT16_MAX);
gfx_draw_string_left(dpi, STR_PERCENT_FORMAT_LABEL, &interestRate, COLOUR_BLACK, x, y);
}
}
@ -1284,7 +1284,7 @@ static void window_editor_scenario_options_park_dropdown(rct_window* w, rct_widg
break;
}
case WIDX_CLIMATE_DROPDOWN:
if (gClimate != (uint8_t)dropdownIndex)
if (gClimate != static_cast<uint8_t>(dropdownIndex))
{
auto gameAction = ClimateSetAction(dropdownIndex);
GameActions::Execute(&gameAction);

2
src/openrct2-ui/windows/Finances.cpp
View File

@ -1146,7 +1146,7 @@ static void window_finances_marketing_invalidate(rct_window* w)
window_finances_set_pressed_tab(w);
// Count number of active campaigns
int32_t numActiveCampaigns = (int32_t)gMarketingCampaigns.size();
int32_t numActiveCampaigns = static_cast<int32_t>(gMarketingCampaigns.size());
int32_t y = std::max(1, numActiveCampaigns) * LIST_ROW_HEIGHT + 92;
// Update group box positions

4
src/openrct2-ui/windows/Footpath.cpp
View File

@ -575,8 +575,8 @@ static void window_footpath_invalidate(rct_window* w)
: WWT_EMPTY;
// Set footpath and queue type button images
auto pathImage = (uint32_t)SPR_NONE;
auto queueImage = (uint32_t)SPR_NONE;
auto pathImage = static_cast<uint32_t>(SPR_NONE);
auto queueImage = static_cast<uint32_t>(SPR_NONE);
auto pathEntry = get_path_surface_entry(gFootpathSelectedId);
if (pathEntry != nullptr)
{

4
src/openrct2-ui/windows/GuestList.cpp
View File

@ -383,7 +383,7 @@ static void window_guest_list_mouseup(rct_window* w, rct_widgetindex widgetIndex
{
window_text_input_open(
w, WIDX_FILTER_BY_NAME, STR_GUESTS_FILTER_BY_NAME, STR_GUESTS_ENTER_NAME_TO_SEARCH, STR_STRING,
(uintptr_t)&_window_guest_list_filter_name, sizeof(_window_guest_list_filter_name));
reinterpret_cast<uintptr_t>(&_window_guest_list_filter_name), sizeof(_window_guest_list_filter_name));
}
break;
}
@ -451,7 +451,7 @@ static void window_guest_list_mousedown(rct_window* w, rct_widgetindex widgetInd
for (i = 0; i < _window_guest_list_num_pages; i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
uint16_t* args = (uint16_t*)&gDropdownItemsArgs[i];
uint16_t* args = reinterpret_cast<uint16_t*>(&gDropdownItemsArgs[i]);
args[0] = STR_PAGE_X;
args[1] = i + 1;
}

4
src/openrct2-ui/windows/Land.cpp
View File

@ -294,8 +294,8 @@ static void window_land_update(rct_window* w)
*/
static void window_land_invalidate(rct_window* w)
{
auto surfaceImage = (uint32_t)SPR_NONE;
auto edgeImage = (uint32_t)SPR_NONE;
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
auto& objManager = GetContext()->GetObjectManager();
const auto surfaceObj = static_cast<TerrainSurfaceObject*>(

3
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -463,7 +463,8 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_NEW_FILE:
window_text_input_open(
w, WIDX_NEW_FILE, STR_NONE, STR_FILEBROWSER_FILE_NAME_PROMPT, STR_STRING, (uintptr_t)&_defaultName, 64);
w, WIDX_NEW_FILE, STR_NONE, STR_FILEBROWSER_FILE_NAME_PROMPT, STR_STRING,
reinterpret_cast<uintptr_t>(&_defaultName), 64);
break;
case WIDX_NEW_FOLDER:

4
src/openrct2-ui/windows/Map.cpp
View File

@ -86,7 +86,7 @@ static rct_widget window_map_widgets[] = {
SPINNER_WIDGETS (1, 104, 198, 229, 240, STR_MAP_SIZE_VALUE, STR_NONE), // NB: 3 widgets
{ WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_BUY_LAND_RIGHTS, STR_SELECT_PARK_OWNED_LAND_TIP },
{ WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_PARK_ENTRANCE, STR_BUILD_PARK_ENTRANCE_TIP },
{ WWT_FLATBTN, 1, 28, 51, 1, 24, (uint32_t) SPR_NONE, STR_SET_STARTING_POSITIONS_TIP },
{ WWT_FLATBTN, 1, 28, 51, 1, 24, static_cast<uint32_t>(SPR_NONE), STR_SET_STARTING_POSITIONS_TIP },
{ WWT_IMGBTN, 1, 4, 47, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE },
{ WWT_TRNBTN, 1, 5, 20, 18, 33, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP },
{ WWT_TRNBTN, 1, 31, 46, 32, 47, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP },
@ -1552,7 +1552,7 @@ static uint16_t map_window_get_pixel_colour_peep(const CoordsXY& c)
if (!(surfaceElement->GetOwnership() & OWNERSHIP_OWNED))
colour = MAP_COLOUR_UNOWNED(colour);
const int32_t maxSupportedTileElementType = (int32_t)std::size(ElementTypeAddColour);
const int32_t maxSupportedTileElementType = static_cast<int32_t>(std::size(ElementTypeAddColour));
auto tileElement = reinterpret_cast<TileElement*>(surfaceElement);
while (!(tileElement++)->IsLastForTile())
{

20
src/openrct2-ui/windows/MapGen.cpp
View File

@ -596,14 +596,14 @@ static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetInde
window_text_input_open(w, WIDX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, STR_FORMAT_INTEGER, _mapSize - 2, 4);
break;
case WIDX_BASE_HEIGHT:
TextInputDescriptionArgs[0] = (uint16_t)((BASESIZE_MIN - 12) / 2);
TextInputDescriptionArgs[1] = (uint16_t)((BASESIZE_MAX - 12) / 2);
TextInputDescriptionArgs[0] = static_cast<uint16_t>((BASESIZE_MIN - 12) / 2);
TextInputDescriptionArgs[1] = static_cast<uint16_t>((BASESIZE_MAX - 12) / 2);
window_text_input_open(
w, WIDX_BASE_HEIGHT, STR_BASE_HEIGHT, STR_ENTER_BASE_HEIGHT, STR_FORMAT_INTEGER, (_baseHeight - 12) / 2, 3);
break;
case WIDX_WATER_LEVEL:
TextInputDescriptionArgs[0] = (uint16_t)((WATERLEVEL_MIN - 12) / 2);
TextInputDescriptionArgs[1] = (uint16_t)((WATERLEVEL_MAX - 12) / 2);
TextInputDescriptionArgs[0] = static_cast<uint16_t>((WATERLEVEL_MIN - 12) / 2);
TextInputDescriptionArgs[1] = static_cast<uint16_t>((WATERLEVEL_MAX - 12) / 2);
window_text_input_open(
w, WIDX_WATER_LEVEL, STR_WATER_LEVEL, STR_ENTER_WATER_LEVEL, STR_FORMAT_INTEGER, (_waterLevel - 12) / 2, 3);
break;
@ -734,8 +734,8 @@ static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex,
static void window_mapgen_base_invalidate(rct_window* w)
{
auto surfaceImage = (uint32_t)SPR_NONE;
auto edgeImage = (uint32_t)SPR_NONE;
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
auto& objManager = GetContext()->GetObjectManager();
const auto surfaceObj = static_cast<TerrainSurfaceObject*>(
@ -906,7 +906,7 @@ static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetI
mapgenSettings.simplex_low = _simplex_low;
mapgenSettings.simplex_high = _simplex_high;
mapgenSettings.simplex_base_freq = ((float)_simplex_base_freq) / 100.00f;
mapgenSettings.simplex_base_freq = (static_cast<float>(_simplex_base_freq) / 100.00f);
mapgenSettings.simplex_octaves = _simplex_octaves;
mapgen_generate(&mapgenSettings);
@ -1037,8 +1037,8 @@ static void window_mapgen_simplex_update(rct_window* w)
static void window_mapgen_simplex_invalidate(rct_window* w)
{
auto surfaceImage = (uint32_t)SPR_NONE;
auto edgeImage = (uint32_t)SPR_NONE;
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
auto& objManager = GetContext()->GetObjectManager();
const auto surfaceObj = static_cast<TerrainSurfaceObject*>(
@ -1239,7 +1239,7 @@ static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widge
{
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_HEIGHTMAP);
intent.putExtra(INTENT_EXTRA_CALLBACK, (void*)window_mapgen_heightmap_loadsave_callback);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_mapgen_heightmap_loadsave_callback));
context_open_intent(&intent);
return;
}

2
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -196,7 +196,7 @@ static void window_maze_construction_entrance_mouseup(rct_window* w, rct_widgeti
return;
gRideEntranceExitPlaceType = widgetIndex == WIDX_MAZE_ENTRANCE ? ENTRANCE_TYPE_RIDE_ENTRANCE : ENTRANCE_TYPE_RIDE_EXIT;
gRideEntranceExitPlaceRideIndex = (uint8_t)w->number;
gRideEntranceExitPlaceRideIndex = static_cast<uint8_t>(w->number);
gRideEntranceExitPlaceStationIndex = 0;
input_set_flag(INPUT_FLAG_6, true);

14
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -373,7 +373,7 @@ static void window_multiplayer_groups_show_group_dropdown(rct_window* w, rct_wid
for (i = 0; i < network_get_num_groups(); i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)network_get_group_name(i);
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(network_get_group_name(i));
}
if (widget == &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP_DROPDOWN])
{
@ -456,7 +456,7 @@ static ScreenCoordsXY window_multiplayer_information_get_size()
}
_windowInformationSizeDirty = false;
_windowInformationSize = { (int16_t)width, (int16_t)height };
_windowInformationSize = { static_cast<int16_t>(width), static_cast<int16_t>(height) };
return _windowInformationSize;
}
@ -495,35 +495,35 @@ static void window_multiplayer_information_paint(rct_window* w, rct_drawpixelinf
const utf8* name = network_get_server_name();
{
y += gfx_draw_string_left_wrapped(dpi, (void*)&name, x, y, width, STR_STRING, w->colours[1]);
y += gfx_draw_string_left_wrapped(dpi, static_cast<void*>(&name), x, y, width, STR_STRING, w->colours[1]);
y += LIST_ROW_HEIGHT / 2;
}
const utf8* description = network_get_server_description();
if (!str_is_null_or_empty(description))
{
y += gfx_draw_string_left_wrapped(dpi, (void*)&description, x, y, width, STR_STRING, w->colours[1]);
y += gfx_draw_string_left_wrapped(dpi, static_cast<void*>(&description), x, y, width, STR_STRING, w->colours[1]);
y += LIST_ROW_HEIGHT / 2;
}
const utf8* providerName = network_get_server_provider_name();
if (!str_is_null_or_empty(providerName))
{
gfx_draw_string_left(dpi, STR_PROVIDER_NAME, (void*)&providerName, COLOUR_BLACK, x, y);
gfx_draw_string_left(dpi, STR_PROVIDER_NAME, static_cast<void*>(&providerName), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
}
const utf8* providerEmail = network_get_server_provider_email();
if (!str_is_null_or_empty(providerEmail))
{
gfx_draw_string_left(dpi, STR_PROVIDER_EMAIL, (void*)&providerEmail, COLOUR_BLACK, x, y);
gfx_draw_string_left(dpi, STR_PROVIDER_EMAIL, static_cast<void*>(&providerEmail), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
}
const utf8* providerWebsite = network_get_server_provider_website();
if (!str_is_null_or_empty(providerWebsite))
{
gfx_draw_string_left(dpi, STR_PROVIDER_WEBSITE, (void*)&providerWebsite, COLOUR_BLACK, x, y);
gfx_draw_string_left(dpi, STR_PROVIDER_WEBSITE, static_cast<void*>(&providerWebsite), COLOUR_BLACK, x, y);
}
}
}

22
src/openrct2-ui/windows/Network.cpp
View File

@ -266,8 +266,8 @@ static void window_network_information_update(rct_window* w)
const NetworkHistory_t& history = _networkHistory[i];
for (int n = 1; n < NETWORK_STATISTICS_GROUP_MAX; n++)
{
graphMaxIn = (float)std::max<uint32_t>(history.deltaBytesReceived[n], graphMaxIn);
graphMaxOut = (float)std::max<uint32_t>(history.deltaBytesSent[n], graphMaxOut);
graphMaxIn = static_cast<float>(std::max<uint32_t>(history.deltaBytesReceived[n], graphMaxIn));
graphMaxOut = static_cast<float>(std::max<uint32_t>(history.deltaBytesSent[n], graphMaxOut));
}
}
@ -282,8 +282,8 @@ static void window_network_information_update(rct_window* w)
_bytesIn = _networkAccumulatedStats.deltaBytesReceived[NETWORK_STATISTICS_GROUP_TOTAL];
_bytesOut = _networkAccumulatedStats.deltaBytesSent[NETWORK_STATISTICS_GROUP_TOTAL];
_bytesInSec = (double)_bytesIn / statsTimeElapsed;
_bytesOutSec = (double)_bytesOut / statsTimeElapsed;
_bytesInSec = static_cast<double>(_bytesIn) / statsTimeElapsed;
_bytesOutSec = static_cast<double>(_bytesOut) / statsTimeElapsed;
_networkAccumulatedStats = {};
}
@ -334,15 +334,15 @@ static void window_network_draw_graph(
// std::sort(history.deltaBytesReceived.begin(), history.deltaBytesReceived.end(), std::greater<uint16_t>());
// NOTE: Capacity is not a mistake, we always want the full length.
uint32_t curX = std::round(((float)i / (float)_networkHistory.capacity()) * barWidth * width);
uint32_t curX = std::round((static_cast<float>(i) / static_cast<float>(_networkHistory.capacity()) * barWidth * width));
float totalSum = 0.0f;
for (int n = 1; n < NETWORK_STATISTICS_GROUP_MAX; n++)
{
if (received)
totalSum += (float)history.deltaBytesReceived[n];
totalSum += static_cast<float>(history.deltaBytesReceived[n]);
else
totalSum += (float)history.deltaBytesSent[n];
totalSum += static_cast<float>(history.deltaBytesSent[n]);
}
int32_t yOffset = height;
@ -353,13 +353,13 @@ static void window_network_draw_graph(
if (received)
{
totalHeight = ((float)history.deltaBytesReceived[n] / dataMax) * height;
singleHeight = ((float)history.deltaBytesReceived[n] / totalSum) * totalHeight;
totalHeight = (static_cast<float>(history.deltaBytesReceived[n]) / dataMax) * height;
singleHeight = (static_cast<float>(history.deltaBytesReceived[n]) / totalSum) * totalHeight;
}
else
{
totalHeight = ((float)history.deltaBytesSent[n] / dataMax) * height;
singleHeight = ((float)history.deltaBytesSent[n] / totalSum) * totalHeight;
totalHeight = (static_cast<float>(history.deltaBytesSent[n]) / dataMax) * height;
singleHeight = (static_cast<float>(history.deltaBytesSent[n]) / totalSum) * totalHeight;
}
uint32_t lineHeight = std::ceil(singleHeight);

13
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -95,12 +95,12 @@ static uint8_t window_new_campaign_shop_items[64];
static int32_t ride_value_compare(const void* a, const void* b)
{
auto valueA = 0;
auto rideA = get_ride(*((uint8_t*)a));
auto rideA = get_ride(*(static_cast<const uint8_t*>(a)));
if (rideA != nullptr)
valueA = rideA->value;
auto valueB = 0;
auto rideB = get_ride(*((uint8_t*)b));
auto rideB = get_ride(*(static_cast<const uint8_t*>(b)));
if (rideB != nullptr)
valueB = rideB->value;
@ -110,12 +110,12 @@ static int32_t ride_value_compare(const void* a, const void* b)
static int32_t ride_name_compare(const void* a, const void* b)
{
std::string rideAName;
auto rideA = get_ride(*((uint8_t*)a));
auto rideA = get_ride(*(static_cast<const uint8_t*>(a)));
if (rideA != nullptr)
rideAName = rideA->GetName();
std::string rideBName;
auto rideB = get_ride(*((uint8_t*)b));
auto rideB = get_ride(*(static_cast<const uint8_t*>(b)));
if (rideB != nullptr)
rideBName = rideB->GetName();
@ -294,7 +294,8 @@ static void window_new_campaign_mousedown(rct_window* w, rct_widgetindex widgetI
{
gDropdownItemsFormat[numItems] = STR_OPTIONS_DROPDOWN_ITEM;
set_format_arg_on(
(uint8_t*)&gDropdownItemsArgs[numItems], 0, const char*, ride->custom_name.c_str());
reinterpret_cast<uint8_t*>(&gDropdownItemsArgs[numItems]), 0, const char*,
ride->custom_name.c_str());
}
numItems++;
}
@ -327,7 +328,7 @@ static void window_new_campaign_dropdown(rct_window* w, rct_widgetindex widgetIn
if (widgetIndex != WIDX_RIDE_DROPDOWN_BUTTON)
return;
if (dropdownIndex < 0 || (size_t)dropdownIndex >= window_new_campaign_rides.size())
if (dropdownIndex < 0 || static_cast<size_t>(dropdownIndex) >= window_new_campaign_rides.size())
return;
if (w->campaign.campaign_type == ADVERTISING_CAMPAIGN_FOOD_OR_DRINK_FREE)

10
src/openrct2-ui/windows/NewRide.cpp
View File

@ -313,7 +313,7 @@ static void window_new_ride_populate_list()
ride_list_item* nextListItem = _windowNewRideListItems;
// For each ride type in the view order list
for (int32_t i = 0; i < (int32_t)std::size(RideTypeViewOrder); i++)
for (int32_t i = 0; i < static_cast<int32_t>(std::size(RideTypeViewOrder)); i++)
{
uint8_t rideType = RideTypeViewOrder[i];
if (rideType == RIDE_TYPE_NULL)
@ -870,9 +870,9 @@ static void window_new_ride_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i
rct_ride_entry* rideEntry;
// Draw flat button rectangle
int32_t flags = 0;
if (w->new_ride.selected_ride_id == *((int16_t*)listItem))
if (w->new_ride.selected_ride_id == *(reinterpret_cast<int16_t*>(listItem)))
flags |= INSET_RECT_FLAG_BORDER_INSET;
if (w->new_ride.highlighted_ride_id == *((int16_t*)listItem) || flags != 0)
if (w->new_ride.highlighted_ride_id == *(reinterpret_cast<int16_t*>(listItem)) || flags != 0)
gfx_fill_rect_inset(dpi, x, y, x + 115, y + 115, w->colours[1], INSET_RECT_FLAG_FILL_MID_LIGHT | flags);
// Draw ride image with feathered border
@ -953,10 +953,10 @@ static int32_t get_num_track_designs(ride_list_item item)
auto rideGroup = RideGroupManager::GetRideGroup(item.type, rideEntry);
if (rideGroup != nullptr)
{
return (int32_t)repo->GetCountForRideGroup(item.type, rideGroup);
return static_cast<int32_t>(repo->GetCountForRideGroup(item.type, rideGroup));
}
}
return (int32_t)repo->GetCountForObjectEntry(item.type, entryName);
return static_cast<int32_t>(repo->GetCountForObjectEntry(item.type, entryName));
}
/**

2
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -303,6 +303,6 @@ static void window_news_options_draw_tab_images(rct_window* w, rct_drawpixelinfo
static bool* get_notification_value_ptr(const notification_def* ndef)
{
bool* configValue = (bool*)((size_t)&gConfigNotifications + ndef->config_offset);
bool* configValue = reinterpret_cast<bool*>(reinterpret_cast<size_t>(&gConfigNotifications) + ndef->config_offset);
return configValue;
}

18
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@ -114,8 +114,8 @@ private:
uint8_t args[32]{};
if (_downloadStatusInfo.Source.empty())
{
set_format_arg_on(args, 0, int16_t, (int16_t)_downloadStatusInfo.Count);
set_format_arg_on(args, 2, int16_t, (int16_t)_downloadStatusInfo.Total);
set_format_arg_on(args, 0, int16_t, static_cast<int16_t>(_downloadStatusInfo.Count));
set_format_arg_on(args, 2, int16_t, static_cast<int16_t>(_downloadStatusInfo.Total));
set_format_arg_on(args, 4, char*, _downloadStatusInfo.Name.c_str());
format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS, args);
}
@ -123,9 +123,11 @@ private:
{
set_format_arg_on(args, 0, char*, _downloadStatusInfo.Name.c_str());
set_format_arg_on(args, sizeof(char*), char*, _downloadStatusInfo.Source.c_str());
set_format_arg_on(args, sizeof(char*) + sizeof(char*), int16_t, (int16_t)_downloadStatusInfo.Count);
set_format_arg_on(
args, sizeof(char*) + sizeof(char*) + sizeof(int16_t), int16_t, (int16_t)_downloadStatusInfo.Total);
args, sizeof(char*) + sizeof(char*), int16_t, static_cast<int16_t>(_downloadStatusInfo.Count));
set_format_arg_on(
args, sizeof(char*) + sizeof(char*) + sizeof(int16_t), int16_t,
static_cast<int16_t>(_downloadStatusInfo.Total));
format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS_FROM, args);
}
@ -163,7 +165,7 @@ private:
// Check that download operation hasn't been cancelled
if (_downloadingObjects)
{
auto data = (uint8_t*)response.body.data();
auto data = reinterpret_cast<uint8_t*>(response.body.data());
auto dataLen = response.body.size();
auto& objRepo = OpenRCT2::GetContext()->GetObjectRepository();
@ -232,7 +234,7 @@ private:
}
else
{
std::printf(" %s query failed (status %d)\n", name.c_str(), (int32_t)response.status);
std::printf(" %s query failed (status %d)\n", name.c_str(), static_cast<int32_t>(response.status));
QueueNextDownload();
}
});
@ -441,7 +443,7 @@ rct_window* window_object_load_error_open(utf8* path, size_t numMissingObjects,
}
// Refresh list items and path
window->no_list_items = (uint16_t)numMissingObjects;
window->no_list_items = static_cast<uint16_t>(numMissingObjects);
file_path = path;
window->Invalidate();
@ -626,7 +628,7 @@ static void window_object_load_error_update_list(rct_window* w)
_invalid_entries.begin(), _invalid_entries.end(),
[de](const rct_object_entry& e) { return std::memcmp(de.name, e.name, sizeof(e.name)) == 0; }),
_invalid_entries.end());
w->no_list_items = (uint16_t)_invalid_entries.size();
w->no_list_items = static_cast<uint16_t>(_invalid_entries.size());
}
}

60
src/openrct2-ui/windows/Options.cpp
View File

@ -1068,7 +1068,7 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
uint16_t* args = (uint16_t*)&gDropdownItemsArgs[i];
uint16_t* args = reinterpret_cast<uint16_t*>(&gDropdownItemsArgs[i]);
args[0] = STR_RESOLUTION_X_BY_Y;
args[1] = resolution.Width;
args[2] = resolution.Height;
@ -1080,7 +1080,7 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
}
}
window_options_show_dropdown(w, widget, (int32_t)resolutions.size());
window_options_show_dropdown(w, widget, static_cast<int32_t>(resolutions.size()));
if (selectedResolution != -1 && selectedResolution < 32)
{
@ -1231,7 +1231,7 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
for (size_t i = 1; i < LANGUAGE_COUNT; i++)
{
gDropdownItemsFormat[i - 1] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i - 1] = (uintptr_t)LanguagesDescriptors[i].native_name;
gDropdownItemsArgs[i - 1] = reinterpret_cast<uintptr_t>(LanguagesDescriptors[i].native_name);
}
window_options_show_dropdown(w, widget, LANGUAGE_COUNT - 1);
dropdown_set_checked(LocalisationService_GetCurrentLanguage() - 1, true);
@ -1258,7 +1258,7 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
for (size_t i = 0; (int32_t)i < gAudioDeviceCount; i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)gAudioDevices[i].name;
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(gAudioDevices[i].name);
}
window_options_show_dropdown(w, widget, gAudioDeviceCount);
@ -1285,19 +1285,19 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
switch (widgetIndex)
{
case WIDX_THEMES_DROPDOWN:
num_items = (uint32_t)theme_manager_get_num_available_themes();
num_items = static_cast<uint32_t>(theme_manager_get_num_available_themes());
for (size_t i = 0; i < num_items; i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)theme_manager_get_available_theme_name(i);
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(theme_manager_get_available_theme_name(i));
}
window_dropdown_show_text_custom_width(
w->windowPos.x + widget->left, w->windowPos.y + widget->top, widget->bottom - widget->top + 1,
w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, num_items, widget->right - widget->left - 3);
dropdown_set_checked((int32_t)theme_manager_get_active_available_theme_index(), true);
dropdown_set_checked(static_cast<int32_t>(theme_manager_get_active_available_theme_index()), true);
widget_invalidate(w, WIDX_THEMES_DROPDOWN);
break;
}
@ -1307,18 +1307,18 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
switch (widgetIndex)
{
case WIDX_TITLE_SEQUENCE_DROPDOWN:
num_items = (int32_t)title_sequence_manager_get_count();
num_items = static_cast<int32_t>(title_sequence_manager_get_count());
for (size_t i = 0; i < num_items; i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)title_sequence_manager_get_name(i);
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(title_sequence_manager_get_name(i));
}
window_dropdown_show_text(
w->windowPos.x + widget->left, w->windowPos.y + widget->top, widget->bottom - widget->top + 1,
w->colours[1], DROPDOWN_FLAG_STAY_OPEN, num_items);
dropdown_set_checked((int32_t)title_get_current_sequence(), true);
dropdown_set_checked(static_cast<int32_t>(title_get_current_sequence()), true);
break;
case WIDX_SCENARIO_GROUPING_DROPDOWN:
num_items = 2;
@ -1422,7 +1422,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
{
context_set_fullscreen_mode(dropdownIndex);
gConfigGeneral.fullscreen_mode = (uint8_t)dropdownIndex;
gConfigGeneral.fullscreen_mode = static_cast<uint8_t>(dropdownIndex);
config_save_default();
gfx_invalidate_screen();
}
@ -1433,7 +1433,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
int32_t srcEngine = drawing_engine_get_type();
int32_t dstEngine = dropdownIndex;
gConfigGeneral.drawing_engine = (uint8_t)dstEngine;
gConfigGeneral.drawing_engine = static_cast<uint8_t>(dstEngine);
bool recreate_window = drawing_engine_requires_new_window(srcEngine, dstEngine);
platform_refresh_video(recreate_window);
config_save_default();
@ -1444,7 +1444,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
// Note: offset by one to compensate for lack of NN option.
if ((dropdownIndex + 1) != gConfigGeneral.scale_quality)
{
gConfigGeneral.scale_quality = (uint8_t)dropdownIndex + 1;
gConfigGeneral.scale_quality = static_cast<uint8_t>(dropdownIndex) + 1;
config_save_default();
gfx_invalidate_screen();
context_trigger_resize();
@ -1480,25 +1480,25 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
case WIDX_CURRENCY_DROPDOWN:
if (dropdownIndex == CURRENCY_CUSTOM + 1)
{ // Add 1 because the separator occupies a position
gConfigGeneral.currency_format = (int8_t)dropdownIndex - 1;
gConfigGeneral.currency_format = static_cast<int8_t>(dropdownIndex) - 1;
context_open_window(WC_CUSTOM_CURRENCY_CONFIG);
}
else
{
gConfigGeneral.currency_format = (int8_t)dropdownIndex;
gConfigGeneral.currency_format = static_cast<int8_t>(dropdownIndex);
}
config_save_default();
gfx_invalidate_screen();
break;
case WIDX_DISTANCE_DROPDOWN:
gConfigGeneral.measurement_format = (int8_t)dropdownIndex;
gConfigGeneral.measurement_format = static_cast<int8_t>(dropdownIndex);
config_save_default();
window_options_update_height_markers();
break;
case WIDX_TEMPERATURE_DROPDOWN:
if (dropdownIndex != gConfigGeneral.temperature_format)
{
gConfigGeneral.temperature_format = (int8_t)dropdownIndex;
gConfigGeneral.temperature_format = static_cast<int8_t>(dropdownIndex);
config_save_default();
gfx_invalidate_screen();
}
@ -1533,7 +1533,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
case WIDX_DATE_FORMAT_DROPDOWN:
if (dropdownIndex != gConfigGeneral.date_format)
{
gConfigGeneral.date_format = (uint8_t)dropdownIndex;
gConfigGeneral.date_format = static_cast<uint8_t>(dropdownIndex);
config_save_default();
gfx_invalidate_screen();
}
@ -1573,7 +1573,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
}
else
{
gConfigSound.title_music = (int8_t)dropdownIndex;
gConfigSound.title_music = static_cast<int8_t>(dropdownIndex);
config_save_default();
w->Invalidate();
}
@ -1604,7 +1604,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
case WIDX_TITLE_SEQUENCE_DROPDOWN:
if (dropdownIndex != (int32_t)title_get_current_sequence())
{
title_sequence_change_preset((size_t)dropdownIndex);
title_sequence_change_preset(static_cast<size_t>(dropdownIndex));
config_save_default();
w->Invalidate();
}
@ -1612,7 +1612,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
case WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN:
if (dropdownIndex != gConfigGeneral.default_inspection_interval)
{
gConfigGeneral.default_inspection_interval = (uint8_t)dropdownIndex;
gConfigGeneral.default_inspection_interval = static_cast<uint8_t>(dropdownIndex);
config_save_default();
w->Invalidate();
}
@ -1636,7 +1636,7 @@ static void window_options_dropdown(rct_window* w, rct_widgetindex widgetIndex,
case WIDX_AUTOSAVE_DROPDOWN:
if (dropdownIndex != gConfigGeneral.autosave_frequency)
{
gConfigGeneral.autosave_frequency = (uint8_t)dropdownIndex;
gConfigGeneral.autosave_frequency = static_cast<uint8_t>(dropdownIndex);
config_save_default();
w->Invalidate();
}
@ -1686,8 +1686,8 @@ static void window_options_invalidate(rct_window* w)
case WINDOW_OPTIONS_PAGE_DISPLAY:
{
// Resolution dropdown caption.
set_format_arg(16, uint16_t, (uint16_t)gConfigGeneral.fullscreen_width);
set_format_arg(18, uint16_t, (uint16_t)gConfigGeneral.fullscreen_height);
set_format_arg(16, uint16_t, static_cast<uint16_t>(gConfigGeneral.fullscreen_width));
set_format_arg(18, uint16_t, static_cast<uint16_t>(gConfigGeneral.fullscreen_height));
// Disable resolution dropdown on "Windowed" and "Fullscreen (desktop)"
if (gConfigGeneral.fullscreen_mode != static_cast<int32_t>(OpenRCT2::Ui::FULLSCREEN_MODE::FULLSCREEN))
@ -1911,7 +1911,7 @@ static void window_options_invalidate(rct_window* w)
size_t activeAvailableThemeIndex = theme_manager_get_active_available_theme_index();
const utf8* activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
set_format_arg(0, uintptr_t, (uintptr_t)activeThemeName);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(activeThemeName));
break;
}
@ -1919,7 +1919,7 @@ static void window_options_invalidate(rct_window* w)
case WINDOW_OPTIONS_PAGE_MISC:
{
const utf8* name = title_sequence_manager_get_name(title_get_config_sequence());
set_format_arg(0, uintptr_t, (uintptr_t)name);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(name));
// The real name setting of clients is fixed to that of the server
// and the server cannot change the setting during gameplay to prevent desyncs
@ -2001,7 +2001,7 @@ static void window_options_invalidate(rct_window* w)
static uint8_t get_scroll_percentage(rct_widget* widget, rct_scroll* scroll)
{
uint8_t width = widget->right - widget->left - 1;
return (float)scroll->h_left / (scroll->h_right - width) * 100;
return static_cast<float>(scroll->h_left / (scroll->h_right - width) * 100);
}
static void window_options_update(rct_window* w)
@ -2077,7 +2077,7 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
dpi, STR_DRAWING_ENGINE, w, w->colours[1], w->windowPos.x + 10,
w->windowPos.y + window_options_display_widgets[WIDX_DRAWING_ENGINE].top + 1);
int32_t scale = (int32_t)(gConfigGeneral.window_scale * 100);
int32_t scale = static_cast<int32_t>((gConfigGeneral.window_scale * 100));
gfx_draw_string_left(
dpi, STR_WINDOW_OBJECTIVE_VALUE_RATING, &scale, w->colours[1], w->windowPos.x + w->widgets[WIDX_SCALE].left + 1,
w->windowPos.y + w->widgets[WIDX_SCALE].top + 1);
@ -2152,7 +2152,7 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
gfx_draw_string_left(
dpi, STR_AUTOSAVE_AMOUNT, w, w->colours[1], w->windowPos.x + 24,
w->windowPos.y + window_options_advanced_widgets[WIDX_AUTOSAVE_AMOUNT].top + 1);
int32_t autosavesToKeep = (int32_t)(gConfigGeneral.autosave_amount);
int32_t autosavesToKeep = static_cast<int32_t>((gConfigGeneral.autosave_amount));
gfx_draw_string_left(
dpi, STR_WINDOW_OBJECTIVE_VALUE_GUEST_COUNT, &autosavesToKeep, w->colours[1],
w->windowPos.x + w->widgets[WIDX_AUTOSAVE_AMOUNT].left + 1,
@ -2235,7 +2235,7 @@ static void window_options_tooltip(rct_window* w, rct_widgetindex widgetIndex, r
}
else
{
set_format_arg(0, uintptr_t, (uintptr_t)gConfigGeneral.rct1_path);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(gConfigGeneral.rct1_path));
}
}
}

4
src/openrct2-ui/windows/Park.cpp
View File

@ -1431,7 +1431,7 @@ static void window_park_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
y += LIST_ROW_HEIGHT;
// Draw number of rides / attractions
if (w->list_information_type != (uint16_t)-1)
if (w->list_information_type != 0xFFFF)
{
set_format_arg(0, uint32_t, w->list_information_type);
gfx_draw_string_left(dpi, STR_NUMBER_OF_RIDES_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
@ -1613,7 +1613,7 @@ static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Objective outcome
if (gScenarioCompletedCompanyValue != MONEY32_UNDEFINED)
{
if ((uint32_t)gScenarioCompletedCompanyValue == 0x80000001)
if (static_cast<uint32_t>(gScenarioCompletedCompanyValue) == 0x80000001)
{
// Objective failed
gfx_draw_string_left_wrapped(dpi, nullptr, x, y, 222, STR_OBJECTIVE_FAILED, COLOUR_BLACK);

22
src/openrct2-ui/windows/Player.cpp
View File

@ -228,7 +228,7 @@ static void window_player_overview_show_group_dropdown(rct_window* w, rct_widget
{
rct_widget* dropdownWidget;
int32_t numItems, i;
int32_t player = network_get_player_index((uint8_t)w->number);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
{
return;
@ -245,7 +245,7 @@ static void window_player_overview_show_group_dropdown(rct_window* w, rct_widget
for (i = 0; i < network_get_num_groups(); i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)network_get_group_name(i);
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(network_get_group_name(i));
}
dropdown_set_checked(network_get_group_index(network_get_player_group(player)), true);
@ -271,7 +271,7 @@ void window_player_overview_mouse_up(rct_window* w, rct_widgetindex widgetIndex)
rct_window* mainWindow = window_get_main();
if (mainWindow != nullptr)
{
int32_t player = network_get_player_index((uint8_t)w->number);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
{
return;
@ -305,7 +305,7 @@ void window_player_overview_mouse_down(rct_window* w, rct_widgetindex widgetInde
void window_player_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
int32_t player = network_get_player_index((uint8_t)w->number);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
{
return;
@ -335,7 +335,7 @@ void window_player_overview_update(rct_window* w)
w->frame_no++;
widget_invalidate(w, WIDX_TAB_1 + w->page);
if (network_get_player_index((uint8_t)w->number) == -1)
if (network_get_player_index(static_cast<uint8_t>(w->number)) == -1)
{
window_close(w);
return;
@ -358,7 +358,7 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
window_draw_widgets(w, dpi);
window_player_draw_tab_images(dpi, w);
int32_t player = network_get_player_index((uint8_t)w->number);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
{
return;
@ -411,7 +411,7 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
void window_player_overview_invalidate(rct_window* w)
{
int32_t playerIndex = network_get_player_index((uint8_t)w->number);
int32_t playerIndex = network_get_player_index(static_cast<uint8_t>(w->number));
if (playerIndex == -1)
{
return;
@ -502,7 +502,7 @@ void window_player_statistics_update(rct_window* w)
w->frame_no++;
widget_invalidate(w, WIDX_TAB_1 + w->page);
if (network_get_player_index((uint8_t)w->number) == -1)
if (network_get_player_index(static_cast<uint8_t>(w->number)) == -1)
{
window_close(w);
}
@ -538,7 +538,7 @@ void window_player_statistics_paint(rct_window* w, rct_drawpixelinfo* dpi)
window_draw_widgets(w, dpi);
window_player_draw_tab_images(dpi, w);
int32_t player = network_get_player_index((uint8_t)w->number);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
{
return;
@ -636,7 +636,7 @@ static void window_player_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void window_player_update_viewport(rct_window* w, bool scroll)
{
int32_t playerIndex = network_get_player_index((uint8_t)w->number);
int32_t playerIndex = network_get_player_index(static_cast<uint8_t>(w->number));
if (playerIndex == -1)
{
return;
@ -683,7 +683,7 @@ static void window_player_update_viewport(rct_window* w, bool scroll)
static void window_player_update_title(rct_window* w)
{
int32_t player = network_get_player_index((uint8_t)w->number);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player != -1)
{
set_format_arg(0, const char*, network_get_player_name(player)); // set title caption to player name

46
src/openrct2-ui/windows/Ride.cpp
View File

@ -1526,7 +1526,7 @@ static void window_ride_update_overall_view(Ride* ride)
int32_t dy = maxy - miny;
int32_t dz = maxz - minz;
int32_t size = (int32_t)std::sqrt(dx * dx + dy * dy + dz * dz);
int32_t size = static_cast<int32_t>(std::sqrt(dx * dx + dy * dy + dz * dz));
if (size >= 80)
{
@ -2782,7 +2782,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window* w, void* argumen
{
if (track_piece_is_available_for_ride_type(ride->type, TRACK_BLOCK_BRAKES) && vehicle->velocity == 0)
{
*(rct_string_id*)(uintptr_t)arguments = STR_STOPPED_BY_BLOCK_BRAKES;
*reinterpret_cast<rct_string_id*>(reinterpret_cast<uintptr_t>(arguments)) = STR_STOPPED_BY_BLOCK_BRAKES;
return STR_BLACK_STRING;
}
}
@ -2791,7 +2791,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window* w, void* argumen
stringId = VehicleStatusNames[vehicle->status];
// Get speed in mph
*((uint16_t*)((uintptr_t)arguments + 2)) = (abs(vehicle->velocity) * 9) >> 18;
*(reinterpret_cast<uint16_t*>(reinterpret_cast<uintptr_t>(arguments) + 2)) = (abs(vehicle->velocity) * 9) >> 18;
if (ride->type == RIDE_TYPE_MINI_GOLF)
return 0;
@ -2803,9 +2803,11 @@ static rct_string_id window_ride_get_status_vehicle(rct_window* w, void* argumen
}
const RideComponentName stationName = RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.station];
*(rct_string_id*)((uintptr_t)arguments + 4) = (ride->num_stations > 1) ? stationName.number : stationName.singular;
*((uint16_t*)((uintptr_t)arguments + 6)) = vehicle->current_station + 1;
*(rct_string_id*)((uintptr_t)arguments + 0) = stringId;
*reinterpret_cast<rct_string_id*>(reinterpret_cast<uintptr_t>(arguments) + 4) = (ride->num_stations > 1)
? stationName.number
: stationName.singular;
*(reinterpret_cast<uint16_t*>(reinterpret_cast<uintptr_t>(arguments) + 6)) = vehicle->current_station + 1;
*reinterpret_cast<rct_string_id*>(reinterpret_cast<uintptr_t>(arguments) + 0) = stringId;
return stringId != STR_CRASHING && stringId != STR_CRASHED_0 ? STR_BLACK_STRING : STR_RED_OUTLINED_STRING;
}
@ -2833,14 +2835,14 @@ static rct_string_id window_ride_get_status_station(rct_window* w, void* argumen
// Entrance / exit
if (ride->status == RIDE_STATUS_CLOSED)
{
if (ride_get_entrance_location(ride, (uint8_t)stationIndex).isNull())
if (ride_get_entrance_location(ride, static_cast<uint8_t>(stationIndex)).isNull())
stringId = STR_NO_ENTRANCE;
else if (ride_get_exit_location(ride, (uint8_t)stationIndex).isNull())
else if (ride_get_exit_location(ride, static_cast<uint8_t>(stationIndex)).isNull())
stringId = STR_NO_EXIT;
}
else
{
if (ride_get_entrance_location(ride, (uint8_t)stationIndex).isNull())
if (ride_get_entrance_location(ride, static_cast<uint8_t>(stationIndex)).isNull())
stringId = STR_EXIT_ONLY;
}
@ -2848,7 +2850,7 @@ static rct_string_id window_ride_get_status_station(rct_window* w, void* argumen
if (stringId == 0)
{
int32_t queueLength = ride->stations[stationIndex].QueueLength;
set_format_arg_body(static_cast<uint8_t*>(arguments), 2, (uintptr_t)queueLength, sizeof(uint16_t));
set_format_arg_body(static_cast<uint8_t*>(arguments), 2, static_cast<uintptr_t>(queueLength), sizeof(uint16_t));
stringId = STR_QUEUE_EMPTY;
if (queueLength == 1)
stringId = STR_QUEUE_ONE_PERSON;
@ -2856,7 +2858,7 @@ static rct_string_id window_ride_get_status_station(rct_window* w, void* argumen
stringId = STR_QUEUE_PEOPLE;
}
set_format_arg_body(static_cast<uint8_t*>(arguments), 0, (uintptr_t)stringId, sizeof(rct_string_id));
set_format_arg_body(static_cast<uint8_t*>(arguments), 0, static_cast<uintptr_t>(stringId), sizeof(rct_string_id));
return STR_BLACK_STRING;
}
@ -3172,7 +3174,7 @@ static void window_ride_vehicle_paint(rct_window* w, rct_drawpixelinfo* dpi)
gfx_draw_string_left(dpi, STR_CAPACITY, &rideEntry->capacity, COLOUR_BLACK, x, y);
// Excitement Factor
auto factor = (int16_t)rideEntry->excitement_multiplier;
auto factor = static_cast<int16_t>(rideEntry->excitement_multiplier);
if (factor > 0)
{
y += LIST_ROW_HEIGHT;
@ -4018,7 +4020,7 @@ static void window_ride_maintenance_mousedown(rct_window* w, rct_widgetindex wid
for (int32_t i = 0; i < 8; i++)
{
assert(j < (int32_t)std::size(rideEntry->ride_type));
if (RideAvailableBreakdowns[rideEntry->ride_type[j]] & (uint8_t)(1 << i))
if (RideAvailableBreakdowns[rideEntry->ride_type[j]] & static_cast<uint8_t>(1 << i))
{
if (i == BREAKDOWN_BRAKES_FAILURE
&& (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED
@ -4048,7 +4050,7 @@ static void window_ride_maintenance_mousedown(rct_window* w, rct_widgetindex wid
{
for (int32_t i = 0; i < 8; i++)
{
if (RideAvailableBreakdowns[rideEntry->ride_type[j]] & (uint8_t)(1 << i))
if (RideAvailableBreakdowns[rideEntry->ride_type[j]] & static_cast<uint8_t>(1 << i))
{
if (i == BREAKDOWN_BRAKES_FAILURE
&& (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED
@ -4161,7 +4163,7 @@ static void window_ride_maintenance_dropdown(rct_window* w, rct_widgetindex widg
for (i = 0; i < BREAKDOWN_COUNT; i++)
{
assert(j < (int32_t)std::size(rideEntry->ride_type));
if (RideAvailableBreakdowns[rideEntry->ride_type[j]] & (uint8_t)(1 << i))
if (RideAvailableBreakdowns[rideEntry->ride_type[j]] & static_cast<uint8_t>(1 << i))
{
if (i == BREAKDOWN_BRAKES_FAILURE
&& (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED
@ -4405,7 +4407,7 @@ static void window_ride_set_track_colour_scheme(rct_window* w, int32_t x, int32_
uint8_t newColourScheme;
int32_t interactionType, z, direction;
newColourScheme = (uint8_t)w->ride_colour;
newColourScheme = static_cast<uint8_t>(w->ride_colour);
CoordsXY mapCoord = {};
get_map_coordinates_from_pos({ x, y }, VIEWPORT_INTERACTION_MASK_RIDE, mapCoord, &interactionType, &tileElement, nullptr);
@ -4595,7 +4597,7 @@ static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIn
for (i = 0; i < std::min(numItems, DROPDOWN_ITEMS_MAX_SIZE); i++)
{
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = ((int64_t)(i + 1) << 32)
gDropdownItemsArgs[i] = (static_cast<int64_t>(i + 1) << 32)
| ((RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].capitalised) << 16)
| stringId;
}
@ -4634,7 +4636,7 @@ static void window_ride_colour_dropdown(rct_window* w, rct_widgetindex widgetInd
switch (widgetIndex)
{
case WIDX_TRACK_COLOUR_SCHEME_DROPDOWN:
w->ride_colour = (uint16_t)dropdownIndex;
w->ride_colour = static_cast<uint16_t>(dropdownIndex);
w->Invalidate();
break;
case WIDX_TRACK_MAIN_COLOUR:
@ -5378,7 +5380,7 @@ static void setup_scenery_selection(rct_window* w)
while (tool_set(w, WIDX_BACKGROUND, TOOL_CROSSHAIR))
;
gTrackDesignSaveRideIndex = (uint8_t)w->number;
gTrackDesignSaveRideIndex = static_cast<uint8_t>(w->number);
track_design_save_init();
gGamePaused |= GAME_PAUSED_SAVING_TRACK;
@ -6549,7 +6551,7 @@ static void window_ride_income_mouseup(rct_window* w, rct_widgetindex widgetInde
auto ride = get_ride(w->number);
if (ride != nullptr)
{
money_to_string((money32)ride->price, _moneyInputText, MONEY_STRING_MAXLENGTH, true);
money_to_string(static_cast<money32>(ride->price), _moneyInputText, MONEY_STRING_MAXLENGTH, true);
window_text_input_raw_open(
w, WIDX_PRIMARY_PRICE, STR_ENTER_NEW_VALUE, STR_ENTER_NEW_VALUE, _moneyInputText, MONEY_STRING_MAXLENGTH);
}
@ -6560,7 +6562,7 @@ static void window_ride_income_mouseup(rct_window* w, rct_widgetindex widgetInde
break;
case WIDX_SECONDARY_PRICE:
{
money32 price32 = (money32)window_ride_income_get_secondary_price(w);
money32 price32 = static_cast<money32>(window_ride_income_get_secondary_price(w));
money_to_string(price32, _moneyInputText, MONEY_STRING_MAXLENGTH, true);
window_text_input_raw_open(
@ -6635,7 +6637,7 @@ static void window_ride_income_textinput(rct_window* w, rct_widgetindex widgetIn
}
price = std::clamp(price, MONEY(0, 00), MONEY(20, 00));
money16 price16 = (money16)price;
money16 price16 = static_cast<money16>(price);
if (widgetIndex == WIDX_PRIMARY_PRICE)
{

2
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -2350,7 +2350,7 @@ static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi
y += 11;
if (_currentTrackPrice != MONEY32_UNDEFINED && !(gParkFlags & PARK_FLAGS_NO_MONEY))
{
gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, COLOUR_BLACK, (void*)&_currentTrackPrice);
gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, COLOUR_BLACK, static_cast<void*>(&_currentTrackPrice));
}
}

6
src/openrct2-ui/windows/RideList.cpp
View File

@ -389,12 +389,12 @@ static void window_ride_list_dropdown(rct_window* w, rct_widgetindex widgetIndex
return;
int32_t informationType = INFORMATION_TYPE_STATUS;
uint32_t arg = (uint32_t)gDropdownItemsArgs[dropdownIndex];
uint32_t arg = static_cast<uint32_t>(gDropdownItemsArgs[dropdownIndex]);
for (size_t i = 0; i < std::size(ride_info_type_string_mapping); i++)
{
if (arg == ride_info_type_string_mapping[i])
{
informationType = (int32_t)i;
informationType = static_cast<int32_t>(i);
}
}
@ -534,7 +534,7 @@ static void window_ride_list_invalidate(rct_window* w)
auto allOpen = false;
if (std::size(rideManager) != 0)
{
auto c = (RideClassification)w->page;
auto c = static_cast<RideClassification>(w->page);
allClosed = std::none_of(rideManager.begin(), rideManager.end(), [c](const Ride& ride) {
return ride.GetClassification() == c && ride.status == RIDE_STATUS_OPEN;
});

4
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -248,10 +248,10 @@ static void window_save_prompt_mouseup(rct_window* w, rct_widgetindex widgetInde
}
else
{
intent = (Intent*)create_save_game_as_intent();
intent = static_cast<Intent*>(create_save_game_as_intent());
}
window_close(w);
intent->putExtra(INTENT_EXTRA_CALLBACK, (void*)window_save_prompt_callback);
intent->putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_save_prompt_callback));
context_open_intent(intent);
delete intent;
break;

9
src/openrct2-ui/windows/Scenery.cpp
View File

@ -720,15 +720,15 @@ static void window_scenery_dropdown(rct_window* w, rct_widgetindex widgetIndex,
if (widgetIndex == WIDX_SCENERY_PRIMARY_COLOUR_BUTTON)
{
gWindowSceneryPrimaryColour = (uint8_t)dropdownIndex;
gWindowSceneryPrimaryColour = static_cast<colour_t>(dropdownIndex);
}
else if (widgetIndex == WIDX_SCENERY_SECONDARY_COLOUR_BUTTON)
{
gWindowScenerySecondaryColour = (uint8_t)dropdownIndex;
gWindowScenerySecondaryColour = static_cast<colour_t>(dropdownIndex);
}
else if (widgetIndex == WIDX_SCENERY_TERTIARY_COLOUR_BUTTON)
{
gWindowSceneryTertiaryColour = (uint8_t)dropdownIndex;
gWindowSceneryTertiaryColour = static_cast<colour_t>(dropdownIndex);
}
w->Invalidate();
@ -1181,7 +1181,8 @@ void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
w->windowPos.y + w->height - 13);
}
set_format_arg(0, rct_string_id, sceneryEntry != nullptr ? sceneryEntry->name : (rct_string_id)STR_UNKNOWN_OBJECT_TYPE);
set_format_arg(
0, rct_string_id, sceneryEntry != nullptr ? sceneryEntry->name : static_cast<rct_string_id>(STR_UNKNOWN_OBJECT_TYPE));
gfx_draw_string_left_clipped(
dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + 3, w->windowPos.y + w->height - 13,
w->width - 19);

15
src/openrct2-ui/windows/ServerList.cpp
View File

@ -161,7 +161,7 @@ rct_window* window_server_list_open()
safe_strcpy(_playerName, gConfigNetwork.player_name.c_str(), sizeof(_playerName));
_serverList.ReadAndAddFavourites();
window->no_list_items = (uint16_t)_serverList.GetCount();
window->no_list_items = static_cast<uint16_t>(_serverList.GetCount());
server_list_fetch_servers_begin();
@ -187,7 +187,7 @@ static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetInde
case WIDX_LIST:
{
int32_t serverIndex = w->selected_list_item;
if (serverIndex >= 0 && serverIndex < (int32_t)_serverList.GetCount())
if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
{
const auto& server = _serverList.GetServer(serverIndex);
if (server.IsVersionValid())
@ -222,7 +222,7 @@ static void window_server_list_resize(rct_window* w)
static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
auto serverIndex = w->selected_list_item;
if (serverIndex >= 0 && serverIndex < (int32_t)_serverList.GetCount())
if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
{
auto& server = _serverList.GetServer(serverIndex);
switch (dropdownIndex)
@ -267,7 +267,7 @@ static void window_server_list_scroll_getsize(rct_window* w, int32_t scrollIndex
static void window_server_list_scroll_mousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{
int32_t serverIndex = w->selected_list_item;
if (serverIndex >= 0 && serverIndex < (int32_t)_serverList.GetCount())
if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
{
const auto& server = _serverList.GetServer(serverIndex);
@ -398,7 +398,7 @@ static void window_server_list_invalidate(rct_window* w)
window_server_list_widgets[WIDX_START_SERVER].top = buttonTop;
window_server_list_widgets[WIDX_START_SERVER].bottom = buttonBottom;
w->no_list_items = (uint16_t)_serverList.GetCount();
w->no_list_items = static_cast<uint16_t>(_serverList.GetCount());
}
static void window_server_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
@ -413,11 +413,12 @@ static void window_server_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
std::string version = network_get_version();
const char* versionCStr = version.c_str();
gfx_draw_string_left(
dpi, STR_NETWORK_VERSION, (void*)&versionCStr, COLOUR_WHITE, w->windowPos.x + 324,
dpi, STR_NETWORK_VERSION, static_cast<void*>(&versionCStr), COLOUR_WHITE, w->windowPos.x + 324,
w->windowPos.y + w->widgets[WIDX_START_SERVER].top + 1);
gfx_draw_string_left(
dpi, _statusText, (void*)&_numPlayersOnline, COLOUR_WHITE, w->windowPos.x + 8, w->windowPos.y + w->height - 15);
dpi, _statusText, static_cast<void*>(&_numPlayersOnline), COLOUR_WHITE, w->windowPos.x + 8,
w->windowPos.y + w->height - 15);
}
static void window_server_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)

2
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -217,7 +217,7 @@ static void window_server_start_mouseup(rct_window* w, rct_widgetindex widgetInd
network_set_password(_password);
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME);
intent.putExtra(INTENT_EXTRA_CALLBACK, (void*)window_server_start_loadsave_callback);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_server_start_loadsave_callback));
context_open_intent(&intent);
break;
}

4
src/openrct2-ui/windows/Sign.cpp
View File

@ -255,10 +255,10 @@ static void window_sign_mousedown(rct_window* w, rct_widgetindex widgetIndex, rc
switch (widgetIndex)
{
case WIDX_MAIN_COLOUR:
window_dropdown_show_colour(w, widget, TRANSLUCENT(w->colours[1]), (uint8_t)w->list_information_type);
window_dropdown_show_colour(w, widget, TRANSLUCENT(w->colours[1]), static_cast<uint8_t>(w->list_information_type));
break;
case WIDX_TEXT_COLOUR:
window_dropdown_show_colour(w, widget, TRANSLUCENT(w->colours[1]), (uint8_t)w->var_492);
window_dropdown_show_colour(w, widget, TRANSLUCENT(w->colours[1]), static_cast<uint8_t>(w->var_492));
break;
}
}

26
src/openrct2-ui/windows/Staff.cpp
View File

@ -768,7 +768,7 @@ void window_staff_unknown_05(rct_window* w)
*/
void window_staff_stats_invalidate(rct_window* w)
{
colour_scheme_update_by_class(w, (rct_windowclass)WC_STAFF);
colour_scheme_update_by_class(w, static_cast<rct_windowclass>(WC_STAFF));
if (window_staff_page_widgets[w->page] != w->widgets)
{
@ -802,7 +802,7 @@ void window_staff_stats_invalidate(rct_window* w)
*/
void window_staff_options_invalidate(rct_window* w)
{
colour_scheme_update_by_class(w, (rct_windowclass)WC_STAFF);
colour_scheme_update_by_class(w, static_cast<rct_windowclass>(WC_STAFF));
if (window_staff_page_widgets[w->page] != w->widgets)
{
@ -879,7 +879,7 @@ void window_staff_options_invalidate(rct_window* w)
*/
void window_staff_overview_invalidate(rct_window* w)
{
colour_scheme_update_by_class(w, (rct_windowclass)WC_STAFF);
colour_scheme_update_by_class(w, static_cast<rct_windowclass>(WC_STAFF));
if (window_staff_page_widgets[w->page] != w->widgets)
{
@ -1111,24 +1111,30 @@ void window_staff_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
y += LIST_ROW_HEIGHT;
}
gfx_draw_string_left(dpi, STR_STAFF_STAT_EMPLOYED_FOR, (void*)&peep->time_in_park, COLOUR_BLACK, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_EMPLOYED_FOR, static_cast<void*>(&peep->time_in_park), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
switch (peep->staff_type)
{
case STAFF_TYPE_HANDYMAN:
gfx_draw_string_left(dpi, STR_STAFF_STAT_LAWNS_MOWN, (void*)&peep->staff_lawns_mown, COLOUR_BLACK, x, y);
gfx_draw_string_left(
dpi, STR_STAFF_STAT_LAWNS_MOWN, static_cast<void*>(&peep->staff_lawns_mown), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_STAFF_STAT_GARDENS_WATERED, (void*)&peep->staff_gardens_watered, COLOUR_BLACK, x, y);
gfx_draw_string_left(
dpi, STR_STAFF_STAT_GARDENS_WATERED, static_cast<void*>(&peep->staff_gardens_watered), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_STAFF_STAT_LITTER_SWEPT, (void*)&peep->staff_litter_swept, COLOUR_BLACK, x, y);
gfx_draw_string_left(
dpi, STR_STAFF_STAT_LITTER_SWEPT, static_cast<void*>(&peep->staff_litter_swept), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_STAFF_STAT_BINS_EMPTIED, (void*)&peep->staff_bins_emptied, COLOUR_BLACK, x, y);
gfx_draw_string_left(
dpi, STR_STAFF_STAT_BINS_EMPTIED, static_cast<void*>(&peep->staff_bins_emptied), COLOUR_BLACK, x, y);
break;
case STAFF_TYPE_MECHANIC:
gfx_draw_string_left(dpi, STR_STAFF_STAT_RIDES_INSPECTED, (void*)&peep->staff_rides_inspected, COLOUR_BLACK, x, y);
gfx_draw_string_left(
dpi, STR_STAFF_STAT_RIDES_INSPECTED, static_cast<void*>(&peep->staff_rides_inspected), COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
gfx_draw_string_left(dpi, STR_STAFF_STAT_RIDES_FIXED, (void*)&peep->staff_rides_fixed, COLOUR_BLACK, x, y);
gfx_draw_string_left(
dpi, STR_STAFF_STAT_RIDES_FIXED, static_cast<void*>(&peep->staff_rides_fixed), COLOUR_BLACK, x, y);
break;
}
}

8
src/openrct2-ui/windows/StaffList.cpp
View File

@ -297,7 +297,7 @@ static void window_staff_list_mousedown(rct_window* w, rct_widgetindex widgetInd
if (_windowStaffListSelectedTab == newSelectedTab)
break;
_windowStaffListSelectedTab = (uint8_t)newSelectedTab;
_windowStaffListSelectedTab = static_cast<uint8_t>(newSelectedTab);
w->Invalidate();
w->scrolls[0].v_top = 0;
window_staff_list_cancel_tools(w);
@ -530,9 +530,9 @@ void window_staff_list_invalidate(rct_window* w)
if (tabIndex < 3)
{
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WWT_COLOURBTN;
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = SPRITE_ID_PALETTE_COLOUR_1(
(uint32_t)staff_get_colour(tabIndex))
| IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
auto spriteIdPalette = SPRITE_ID_PALETTE_COLOUR_1(static_cast<uint32_t>(staff_get_colour(tabIndex)));
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = spriteIdPalette | IMAGE_TYPE_TRANSPARENT
| SPR_PALETTE_BTN;
}
if (_quick_fire_mode)
w->pressed_widgets |= (1ULL << WIDX_STAFF_LIST_QUICK_FIRE);

2
src/openrct2-ui/windows/TextInput.cpp
View File

@ -368,5 +368,5 @@ static void draw_ime_composition(rct_drawpixelinfo* dpi, int cursorX, int cursor
gfx_fill_rect(dpi, x - 1, y - 1, x + width + 1, y + height + 1, PALETTE_INDEX_12);
gfx_fill_rect(dpi, x, y, x + width, y + height, PALETTE_INDEX_0);
gfx_draw_string(dpi, (char*)gTextInput->ImeBuffer, COLOUR_DARK_GREEN, x, y);
gfx_draw_string(dpi, static_cast<const char*>(gTextInput->ImeBuffer), COLOUR_DARK_GREEN, x, y);
}

14
src/openrct2-ui/windows/Themes.cpp
View File

@ -369,7 +369,7 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
window_text_input_open(
w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_PROMPT_ENTER_THEME_NAME, STR_STRING,
(uintptr_t)activeThemeName, 64);
reinterpret_cast<const uintptr_t>(activeThemeName), 64);
break;
case WIDX_THEMES_DELETE_BUTTON:
if (theme_get_flags() & UITHEME_FLAG_PREDEFINED)
@ -392,7 +392,7 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
window_text_input_open(
w, widgetIndex, STR_TRACK_MANAGE_RENAME, STR_THEMES_PROMPT_ENTER_THEME_NAME, STR_STRING,
(uintptr_t)activeThemeName, 64);
reinterpret_cast<uintptr_t>(activeThemeName), 64);
}
break;
}
@ -505,7 +505,7 @@ static void window_themes_mousedown(rct_window* w, rct_widgetindex widgetIndex,
newSelectedTab = widgetIndex - WIDX_THEMES_SETTINGS_TAB;
if (_selected_tab == newSelectedTab)
break;
_selected_tab = (uint8_t)newSelectedTab;
_selected_tab = static_cast<uint8_t>(newSelectedTab);
w->scrolls[0].v_top = 0;
w->frame_no = 0;
window_event_resize_call(w);
@ -513,20 +513,20 @@ static void window_themes_mousedown(rct_window* w, rct_widgetindex widgetIndex,
break;
case WIDX_THEMES_PRESETS_DROPDOWN:
theme_manager_load_available_themes();
num_items = (int32_t)theme_manager_get_num_available_themes();
num_items = static_cast<int32_t>(theme_manager_get_num_available_themes());
widget--;
for (int32_t i = 0; i < num_items; i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)theme_manager_get_available_theme_name(i);
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(theme_manager_get_available_theme_name(i));
}
window_dropdown_show_text_custom_width(
w->windowPos.x + widget->left, w->windowPos.y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
DROPDOWN_FLAG_STAY_OPEN, num_items, widget->right - widget->left - 3);
dropdown_set_checked((int32_t)theme_manager_get_active_available_theme_index(), true);
dropdown_set_checked(static_cast<int32_t>(theme_manager_get_active_available_theme_index()), true);
break;
case WIDX_THEMES_RCT1_RIDE_LIGHTS:
if (theme_get_flags() & UITHEME_FLAG_PREDEFINED)
@ -836,7 +836,7 @@ void window_themes_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
size_t activeAvailableThemeIndex = theme_manager_get_active_available_theme_index();
const utf8* activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
set_format_arg(0, uintptr_t, (uintptr_t)activeThemeName);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(activeThemeName));
gfx_draw_string_left(
dpi, STR_THEMES_LABEL_CURRENT_THEME, nullptr, w->colours[1], w->windowPos.x + 10,
w->windowPos.y + window_themes_widgets[WIDX_THEMES_PRESETS].top + 1);

9
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -1818,8 +1818,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Edge texture name
uint32_t idx = tileElement->AsSurface()->GetEdgeStyle();
openrct2_assert(
(uint32_t)idx < std::size(TerrainEdgeTypeStringIds),
"Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx);
idx < std::size(TerrainEdgeTypeStringIds), "Tried accessing invalid entry %d in terrainEdgeTypeStringIds",
idx);
rct_string_id terrainEdgeNameId = TerrainEdgeTypeStringIds[tileElement->AsSurface()->GetEdgeStyle()];
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, COLOUR_WHITE, x, y + 11);
@ -1871,8 +1871,9 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
const auto pathAdditionType = tileElement->AsPath()->GetAdditionEntryIndex();
const auto* sceneryElement = get_footpath_item_entry(pathAdditionType);
rct_string_id additionNameId = sceneryElement != nullptr ? sceneryElement->name
: (rct_string_id)STR_UNKNOWN_OBJECT_TYPE;
rct_string_id additionNameId = sceneryElement != nullptr
? sceneryElement->name
: static_cast<rct_string_id>(STR_UNKNOWN_OBJECT_TYPE);
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_ADDITIONS, &additionNameId, COLOUR_WHITE, x, y + 11);
}
else

36
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -169,7 +169,7 @@ static void scenario_select_callback(const utf8* path)
static int32_t get_command_info_index(int32_t index)
{
for (int32_t i = 0; i < (int32_t)NUM_COMMANDS; i++)
for (int32_t i = 0; i < static_cast<int32_t>(NUM_COMMANDS); i++)
{
if (_window_title_command_editor_orders[i].command == index)
return i;
@ -179,7 +179,7 @@ static int32_t get_command_info_index(int32_t index)
static TITLE_COMMAND_ORDER get_command_info(int32_t index)
{
for (int32_t i = 0; i < (int32_t)NUM_COMMANDS; i++)
for (int32_t i = 0; i < static_cast<int32_t>(NUM_COMMANDS); i++)
{
if (_window_title_command_editor_orders[i].command == index)
return _window_title_command_editor_orders[i];
@ -280,7 +280,7 @@ void window_title_command_editor_open(TitleSequence* sequence, int32_t index, bo
case TITLE_SCRIPT_FOLLOW:
if (command.SpriteIndex != SPRITE_INDEX_NULL)
{
window_follow_sprite(window, (size_t)command.SpriteIndex);
window_follow_sprite(window, static_cast<size_t>(command.SpriteIndex));
}
break;
}
@ -324,8 +324,8 @@ static void window_title_command_editor_mouseup(rct_window* w, rct_widgetindex w
if (command.Type == TITLE_SCRIPT_LOCATION)
{
auto tileCoord = get_location();
command.X = (uint8_t)tileCoord.x;
command.Y = (uint8_t)tileCoord.y;
command.X = static_cast<uint8_t>(tileCoord.x);
command.Y = static_cast<uint8_t>(tileCoord.y);
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.X);
snprintf(textbox2Buffer, BUF_SIZE, "%d", command.Y);
}
@ -418,11 +418,11 @@ static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex
}
else if (command.Type == TITLE_SCRIPT_LOAD)
{
int32_t numItems = (int32_t)_sequence->NumSaves;
int32_t numItems = static_cast<int32_t>(_sequence->NumSaves);
for (int32_t i = 0; i < numItems; i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)_sequence->Saves[i];
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(_sequence->Saves[i]);
}
window_dropdown_show_text_custom_width(
@ -463,8 +463,8 @@ static void window_title_command_editor_dropdown(rct_window* w, rct_widgetindex
case TITLE_SCRIPT_LOCATION:
{
auto tileCoord = get_location();
command.X = (uint8_t)tileCoord.x;
command.Y = (uint8_t)tileCoord.y;
command.X = static_cast<uint8_t>(tileCoord.x);
command.Y = static_cast<uint8_t>(tileCoord.y);
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.X);
snprintf(textbox2Buffer, BUF_SIZE, "%d", command.Y);
break;
@ -508,14 +508,14 @@ static void window_title_command_editor_dropdown(rct_window* w, rct_widgetindex
case TITLE_SCRIPT_SPEED:
if (dropdownIndex != command.Speed - 1)
{
command.Speed = (uint8_t)(dropdownIndex + 1);
command.Speed = static_cast<uint8_t>(dropdownIndex + 1);
w->Invalidate();
}
break;
case TITLE_SCRIPT_LOAD:
if (dropdownIndex != command.SaveIndex)
{
command.SaveIndex = (uint8_t)dropdownIndex;
command.SaveIndex = static_cast<uint8_t>(dropdownIndex);
w->Invalidate();
}
break;
@ -546,7 +546,7 @@ static void window_title_command_editor_textinput(rct_window* w, rct_widgetindex
value = 100;
if (value > 65000)
value = 65000;
command.Milliseconds = (uint16_t)value;
command.Milliseconds = static_cast<uint16_t>(value);
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.Milliseconds);
}
else
@ -556,7 +556,7 @@ static void window_title_command_editor_textinput(rct_window* w, rct_widgetindex
value = 3;
if (value < 1 && command.Type == TITLE_SCRIPT_ROTATE)
value = 1;
command.Rotations = (uint8_t)value;
command.Rotations = static_cast<uint8_t>(value);
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.Rotations);
}
}
@ -572,7 +572,7 @@ static void window_title_command_editor_textinput(rct_window* w, rct_widgetindex
{
if (*end == '\0')
{
command.X = (uint8_t)value;
command.X = static_cast<uint8_t>(value);
}
snprintf(textbox1Buffer, BUF_SIZE, "%d", command.X);
w->Invalidate();
@ -587,7 +587,7 @@ static void window_title_command_editor_textinput(rct_window* w, rct_widgetindex
{
if (*end == '\0')
{
command.Y = (uint8_t)value;
command.Y = static_cast<uint8_t>(value);
}
snprintf(textbox2Buffer, BUF_SIZE, "%d", command.Y);
w->Invalidate();
@ -671,7 +671,7 @@ static void window_title_command_editor_tool_down(
if (validSprite)
{
command.SpriteIndex = spriteIndex;
window_follow_sprite(w, (size_t)command.SpriteIndex);
window_follow_sprite(w, static_cast<size_t>(command.SpriteIndex));
tool_cancel();
w->Invalidate();
}
@ -774,7 +774,7 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
if (command.SpriteIndex != SPRITE_INDEX_NULL)
{
window_draw_viewport(dpi, w);
set_format_arg(0, uintptr_t, (uintptr_t)command.SpriteName);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(command.SpriteName));
}
else
{
@ -801,7 +801,7 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
}
else
{
set_format_arg(0, uintptr_t, (uintptr_t)_sequence->Saves[command.SaveIndex]);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(_sequence->Saves[command.SaveIndex]));
gfx_draw_string_left_clipped(
dpi, STR_STRING, gCommonFormatArgs, w->colours[1], w->windowPos.x + w->widgets[WIDX_INPUT].left + 1,
w->windowPos.y + w->widgets[WIDX_INPUT].top,

73
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -302,7 +302,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
window_text_input_open(
w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, STR_STRING,
(uintptr_t)_sequenceName, 64);
reinterpret_cast<uintptr_t>(_sequenceName), 64);
}
break;
case WIDX_TITLE_EDITOR_DELETE_BUTTON:
@ -317,7 +317,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
window_text_input_open(
w, widgetIndex, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, STR_STRING,
(uintptr_t)_sequenceName, 64);
reinterpret_cast<uintptr_t>(_sequenceName), 64);
}
break;
@ -329,7 +329,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME);
intent.putExtra(INTENT_EXTRA_CALLBACK, (void*)window_title_editor_add_park_callback);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_title_editor_add_park_callback));
context_open_intent(&intent);
}
break;
@ -353,7 +353,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
window_text_input_open(
w, widgetIndex, STR_FILEBROWSER_RENAME_SAVE_TITLE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SAVE, STR_STRING,
(uintptr_t)_editingTitleSequence->Saves[w->selected_list_item], 52 - 1);
reinterpret_cast<uintptr_t>(_editingTitleSequence->Saves[w->selected_list_item]), 52 - 1);
}
}
break;
@ -361,7 +361,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
if (w->selected_list_item >= 0 && w->selected_list_item < (int16_t)_editingTitleSequence->NumSaves)
{
auto handle = TitleSequenceGetParkHandle(_editingTitleSequence, w->selected_list_item);
auto stream = (IStream*)handle->Stream;
auto stream = static_cast<IStream*>(handle->Stream);
auto hintPath = String::ToStd(handle->HintPath);
bool isScenario = ParkImporter::ExtensionIsScenario(hintPath);
try
@ -396,13 +396,15 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
if (w->selected_list_item != -1)
window_title_command_editor_open(_editingTitleSequence, w->selected_list_item + 1, true);
else
window_title_command_editor_open(_editingTitleSequence, (int32_t)_editingTitleSequence->NumCommands, true);
window_title_command_editor_open(
_editingTitleSequence, static_cast<int32_t>(_editingTitleSequence->NumCommands), true);
}
break;
case WIDX_TITLE_EDITOR_EDIT:
if (window_title_editor_check_can_edit())
{
if (w->selected_list_item != -1 && w->selected_list_item < (int16_t)_editingTitleSequence->NumCommands)
if (w->selected_list_item != -1
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->NumCommands))
{
window_title_command_editor_open(_editingTitleSequence, w->selected_list_item, false);
}
@ -411,14 +413,16 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_DELETE:
if (window_title_editor_check_can_edit())
{
if (w->selected_list_item != -1 && w->selected_list_item < (int16_t)_editingTitleSequence->NumCommands)
if (w->selected_list_item != -1
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->NumCommands))
{
for (int32_t i = w->selected_list_item; i < (int16_t)_editingTitleSequence->NumCommands - 1; i++)
for (int32_t i = w->selected_list_item; i < static_cast<int16_t>(_editingTitleSequence->NumCommands - 1);
i++)
{
_editingTitleSequence->Commands[i] = _editingTitleSequence->Commands[i + 1];
}
_editingTitleSequence->NumCommands--;
if (w->selected_list_item >= (int16_t)_editingTitleSequence->NumCommands)
if (w->selected_list_item >= static_cast<int16_t>(_editingTitleSequence->NumCommands))
{
w->selected_list_item--;
}
@ -429,7 +433,8 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_SKIP_TO:
{
int32_t position = w->selected_list_item;
if (title_is_previewing_sequence() && position != -1 && position < (int32_t)_editingTitleSequence->NumCommands)
if (title_is_previewing_sequence() && position != -1
&& position < static_cast<int32_t>(_editingTitleSequence->NumCommands))
{
auto player = window_title_editor_get_player();
player->Seek(position);
@ -440,7 +445,8 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_MOVE_DOWN:
if (window_title_editor_check_can_edit())
{
if (w->selected_list_item != -1 && w->selected_list_item < (int16_t)_editingTitleSequence->NumCommands - 1)
if (w->selected_list_item != -1
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->NumCommands - 1))
{
TitleCommand* a = &_editingTitleSequence->Commands[w->selected_list_item];
TitleCommand* b = &_editingTitleSequence->Commands[w->selected_list_item + 1];
@ -455,7 +461,8 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
case WIDX_TITLE_EDITOR_MOVE_UP:
if (window_title_editor_check_can_edit())
{
if (w->selected_list_item > 0 && w->selected_list_item < (int16_t)_editingTitleSequence->NumCommands)
if (w->selected_list_item > 0
&& w->selected_list_item < static_cast<int16_t>(_editingTitleSequence->NumCommands))
{
TitleCommand* a = &_editingTitleSequence->Commands[w->selected_list_item - 1];
TitleCommand* b = &_editingTitleSequence->Commands[w->selected_list_item];
@ -499,7 +506,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
auto player = window_title_editor_get_player();
int32_t position = player->GetCurrentPosition() + 1;
if (position >= (int32_t)_editingTitleSequence->NumCommands)
if (position >= static_cast<int32_t>(_editingTitleSequence->NumCommands))
{
position = 0;
}
@ -546,18 +553,18 @@ static void window_title_editor_mousedown(rct_window* w, rct_widgetindex widgetI
}
else
{
int32_t numItems = (int32_t)title_sequence_manager_get_count();
int32_t numItems = static_cast<int32_t>(title_sequence_manager_get_count());
for (int32_t i = 0; i < numItems; i++)
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
gDropdownItemsArgs[i] = (uintptr_t)title_sequence_manager_get_name(i);
gDropdownItemsArgs[i] = reinterpret_cast<uintptr_t>(title_sequence_manager_get_name(i));
}
widget--;
window_dropdown_show_text_custom_width(
w->windowPos.x + widget->left, w->windowPos.y + widget->top, widget->bottom - widget->top + 1,
w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3);
dropdown_set_checked((int32_t)_selectedTitleSequence, true);
dropdown_set_checked(static_cast<int32_t>(_selectedTitleSequence), true);
}
break;
}
@ -600,7 +607,7 @@ static void window_title_editor_scrollgetsize(rct_window* w, int32_t scrollIndex
else if (w->selected_tab == WINDOW_TITLE_EDITOR_TAB_SCRIPT)
lineCount = _editingTitleSequence->NumCommands;
*height = (int32_t)(lineCount * SCROLLABLE_ROW_HEIGHT);
*height = static_cast<int32_t>(lineCount * SCROLLABLE_ROW_HEIGHT);
int32_t i = *height - window_title_editor_widgets[WIDX_TITLE_EDITOR_LIST].bottom
+ window_title_editor_widgets[WIDX_TITLE_EDITOR_LIST].top + 21;
if (i < 0)
@ -623,14 +630,14 @@ static void window_title_editor_scrollmousedown(rct_window* w, int32_t scrollInd
switch (w->selected_tab)
{
case WINDOW_TITLE_EDITOR_TAB_SAVES:
if (index < (int32_t)_editingTitleSequence->NumSaves)
if (index < static_cast<int32_t>(_editingTitleSequence->NumSaves))
{
w->selected_list_item = index;
widget_invalidate(w, WIDX_TITLE_EDITOR_LIST);
}
break;
case WINDOW_TITLE_EDITOR_TAB_SCRIPT:
if (index < (int32_t)_editingTitleSequence->NumCommands)
if (index < static_cast<int32_t>(_editingTitleSequence->NumCommands))
{
w->selected_list_item = index;
widget_invalidate(w, WIDX_TITLE_EDITOR_LIST);
@ -645,12 +652,12 @@ static void window_title_editor_scrollmouseover(rct_window* w, int32_t scrollInd
switch (w->selected_tab)
{
case WINDOW_TITLE_EDITOR_TAB_SAVES:
if (index < (int32_t)_editingTitleSequence->NumSaves)
_window_title_editor_highlighted_index = (int16_t)index;
if (index < static_cast<int32_t>(_editingTitleSequence->NumSaves))
_window_title_editor_highlighted_index = static_cast<int16_t>(index);
break;
case WINDOW_TITLE_EDITOR_TAB_SCRIPT:
if (index < (int32_t)_editingTitleSequence->NumCommands)
_window_title_editor_highlighted_index = (int16_t)index;
if (index < static_cast<int32_t>(_editingTitleSequence->NumCommands))
_window_title_editor_highlighted_index = static_cast<int16_t>(index);
break;
}
widget_invalidate(w, WIDX_TITLE_EDITOR_LIST);
@ -869,7 +876,7 @@ static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelin
if (_editingTitleSequence == nullptr)
return;
for (int32_t i = 0; i < (int32_t)_editingTitleSequence->NumSaves; i++, y += SCROLLABLE_ROW_HEIGHT)
for (int32_t i = 0; i < static_cast<int32_t>(_editingTitleSequence->NumSaves); i++, y += SCROLLABLE_ROW_HEIGHT)
{
bool selected = false;
bool hover = false;
@ -899,7 +906,7 @@ static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelin
else
{
format_string(buffer + 1, 255, STR_STRING, gCommonFormatArgs);
buffer[0] = (utf8)(uint8_t)FORMAT_BLACK;
buffer[0] = static_cast<utf8>(static_cast<uint8_t>(FORMAT_BLACK));
}
set_format_arg(0, uintptr_t, &buffer);
gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, w->colours[1], x + 5, y);
@ -917,7 +924,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
int32_t x = 0;
int32_t y = 0;
for (int32_t i = 0; i < (int32_t)_editingTitleSequence->NumCommands; i++, y += SCROLLABLE_ROW_HEIGHT)
for (int32_t i = 0; i < static_cast<int32_t>(_editingTitleSequence->NumCommands); i++, y += SCROLLABLE_ROW_HEIGHT)
{
TitleCommand* command = &_editingTitleSequence->Commands[i];
bool selected = false;
@ -928,7 +935,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
selected = true;
gfx_fill_rect(dpi, x, y, x + SCROLL_WIDTH + 100, y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].dark);
}
else if (i == (int32_t)_window_title_editor_highlighted_index || i == position)
else if (i == static_cast<int32_t>(_window_title_editor_highlighted_index) || i == position)
{
hover = true;
gfx_fill_rect(dpi, x, y, x + SCROLL_WIDTH + 100, y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].mid_dark);
@ -980,7 +987,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
}
else
{
set_format_arg(0, uintptr_t, (uintptr_t)command->SpriteName);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(command->SpriteName));
}
break;
case TITLE_SCRIPT_WAIT:
@ -1025,7 +1032,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
else
{
format_string(buffer + 1, 255, commandName, gCommonFormatArgs);
buffer[0] = (utf8)(error ? ((selected || hover) ? FORMAT_LIGHTPINK : FORMAT_RED) : FORMAT_BLACK);
buffer[0] = static_cast<utf8>((error) ? ((selected || hover) ? FORMAT_LIGHTPINK : FORMAT_RED) : FORMAT_BLACK);
}
set_format_arg(0, uintptr_t, &buffer);
gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, w->colours[1], x + 5, y);
@ -1079,7 +1086,7 @@ static void window_title_editor_load_sequence(size_t index)
static ITitleSequencePlayer* window_title_editor_get_player()
{
return (ITitleSequencePlayer*)title_get_sequence_player();
return static_cast<ITitleSequencePlayer*>(title_get_sequence_player());
}
static bool window_title_editor_check_can_edit()
@ -1122,11 +1129,11 @@ static void window_title_editor_add_park_callback(int32_t result, const utf8* pa
{
free(_renameSavePath);
_renameSavePath = _strdup(filename);
// set_format_arg(0, intptr_t, (intptr_t)&_renameSavePath);
// set_format_arg(0, intptr_t, static_cast<intptr_t>(&_renameSavePath));
rct_window* w = window_find_by_class(WC_TITLE_EDITOR);
window_text_input_open(
w, WIDX_TITLE_EDITOR_RENAME_SAVE, STR_FILEBROWSER_RENAME_SAVE_TITLE, STR_ERROR_EXISTING_NAME, STR_STRING,
(uintptr_t)_renameSavePath, 52 - 1);
reinterpret_cast<uintptr_t>(_renameSavePath), 52 - 1);
return;
}

5
src/openrct2-ui/windows/TitleScenarioSelect.cpp
View File

@ -490,7 +490,8 @@ static void window_scenarioselect_paint(rct_window* w, rct_drawpixelinfo* dpi)
const utf8* pathPtr = path;
gfx_draw_string_left(
dpi, STR_STRING, (void*)&pathPtr, w->colours[1], w->windowPos.x + 3, w->windowPos.y + w->height - 3 - 11);
dpi, STR_STRING, static_cast<void*>(&pathPtr), w->colours[1], w->windowPos.x + 3,
w->windowPos.y + w->height - 3 - 11);
}
// Scenario name
@ -587,7 +588,7 @@ static void window_scenarioselect_scrollpaint(rct_window* w, rct_drawpixelinfo*
// Draw scenario name
char buffer[64];
safe_strcpy(buffer, scenario->name, sizeof(buffer));
rct_string_id format = isDisabled ? (rct_string_id)STR_STRINGID
rct_string_id format = isDisabled ? static_cast<rct_string_id>(STR_STRINGID)
: (isHighlighted ? highlighted_format : unhighlighted_format);
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, char*, buffer);

12
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -586,7 +586,7 @@ static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetInd
case DDIDX_NEW_GAME:
{
auto intent = Intent(WC_SCENARIO_SELECT);
intent.putExtra(INTENT_EXTRA_CALLBACK, (void*)window_top_toolbar_scenarioselect_callback);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(window_top_toolbar_scenarioselect_callback));
context_open_intent(&intent);
break;
}
@ -2562,7 +2562,7 @@ static money32 try_place_ghost_scenery(
if (res->Error != GA_ERROR::OK)
return MONEY32_UNDEFINED;
gSceneryPlaceRotation = (uint16_t)(parameter_3 & 0xFF);
gSceneryPlaceRotation = static_cast<uint16_t>(parameter_3 & 0xFF);
gSceneryPlaceObject.SceneryType = SCENERY_TYPE_SMALL;
gSceneryPlaceObject.EntryIndex = entryIndex;
@ -2826,7 +2826,7 @@ static void top_toolbar_tool_update_scenery(int16_t x, int16_t y)
// If no change in ghost placement
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_1) && mapTile == gSceneryGhostPosition
&& (int16_t)(parameter2 & 0xFF) * COORDS_Z_STEP == gSceneryGhostPosition.z)
&& static_cast<int16_t>(parameter2 & 0xFF) * COORDS_Z_STEP == gSceneryGhostPosition.z)
{
return;
}
@ -2882,8 +2882,8 @@ static void top_toolbar_tool_update_scenery(int16_t x, int16_t y)
scenery = get_large_scenery_entry(selectedScenery);
gMapSelectionTiles.clear();
for (rct_large_scenery_tile* tile = scenery->large_scenery.tiles; tile->x_offset != (int16_t)(uint16_t)0xFFFF;
tile++)
for (rct_large_scenery_tile* tile = scenery->large_scenery.tiles;
tile->x_offset != static_cast<int16_t>(static_cast<uint16_t>(0xFFFF)); tile++)
{
CoordsXY tileLocation = { tile->x_offset, tile->y_offset };
auto rotatedTileCoords = tileLocation.Rotate((parameter1 >> 8) & 0xFF);
@ -2941,7 +2941,7 @@ static void top_toolbar_tool_update_scenery(int16_t x, int16_t y)
// If no change in ghost placement
if ((gSceneryGhostType & SCENERY_GHOST_FLAG_4) && mapTile == gSceneryGhostPosition
&& (int16_t)(parameter2 & 0xFF) * COORDS_Z_STEP == gSceneryGhostPosition.z
&& static_cast<int16_t>(parameter2 & 0xFF) * COORDS_Z_STEP == gSceneryGhostPosition.z
&& ((parameter2 >> 8) & 0xFF) == gSceneryPlaceRotation)
{
return;

12
src/openrct2-ui/windows/TrackList.cpp
View File

@ -184,7 +184,7 @@ static void window_track_list_filter_list()
utf8 filterStringLower[sizeof(_filterString)];
String::Set(filterStringLower, sizeof(filterStringLower), _filterString);
for (int32_t i = 0; filterStringLower[i] != '\0'; i++)
filterStringLower[i] = (utf8)tolower(filterStringLower[i]);
filterStringLower[i] = static_cast<utf8>(tolower(filterStringLower[i]));
// Fill the set with indices for tracks that match the filter
for (uint16_t i = 0; i < _trackDesigns.size(); i++)
@ -192,7 +192,7 @@ static void window_track_list_filter_list()
utf8 trackNameLower[USER_STRING_MAX_LENGTH];
String::Set(trackNameLower, sizeof(trackNameLower), _trackDesigns[i].name);
for (int32_t j = 0; trackNameLower[j] != '\0'; j++)
trackNameLower[j] = (utf8)tolower(trackNameLower[j]);
trackNameLower[j] = static_cast<utf8>(tolower(trackNameLower[j]));
if (strstr(trackNameLower, filterStringLower) != nullptr)
{
@ -295,7 +295,7 @@ static int32_t window_track_list_get_list_item_index_from_position(const ScreenC
}
int32_t index = screenCoords.y / SCROLLABLE_ROW_HEIGHT;
if (index < 0 || (uint32_t)index >= maxItems)
if (index < 0 || static_cast<uint32_t>(index) >= maxItems)
{
index = -1;
}
@ -368,7 +368,7 @@ static void window_track_list_scrollgetsize(rct_window* w, int32_t scrollIndex,
numItems++;
}
*height = (int32_t)(numItems * SCROLLABLE_ROW_HEIGHT);
*height = static_cast<int32_t>(numItems * SCROLLABLE_ROW_HEIGHT);
}
/**
@ -721,7 +721,7 @@ static void window_track_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
{
// Build custom track item
rct_string_id stringId;
if (listIndex == (size_t)w->selected_list_item)
if (listIndex == static_cast<size_t>(w->selected_list_item))
{
// Highlight
gfx_filter_rect(dpi, x, y, w->width, y + SCROLLABLE_ROW_HEIGHT - 1, PALETTE_DARKEN_1);
@ -743,7 +743,7 @@ static void window_track_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
if (y + SCROLLABLE_ROW_HEIGHT >= dpi->y && y < dpi->y + dpi->height)
{
rct_string_id stringId;
if (listIndex == (size_t)w->selected_list_item)
if (listIndex == static_cast<size_t>(w->selected_list_item))
{
// Highlight
gfx_filter_rect(dpi, x, y, w->width, y + SCROLLABLE_ROW_HEIGHT - 1, PALETTE_DARKEN_1);

19
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -127,9 +127,9 @@ static void window_view_clipping_set_clipheight(rct_window* w, const uint8_t cli
{
gClipHeight = clipheight;
rct_widget* widget = &window_view_clipping_widgets[WIDX_CLIP_HEIGHT_SLIDER];
const float clip_height_ratio = (float)gClipHeight / 255;
w->scrolls[0].h_left = (int16_t)std::ceil(
clip_height_ratio * (w->scrolls[0].h_right - ((widget->right - widget->left) - 1)));
const float clip_height_ratio = static_cast<float>(gClipHeight) / 255;
w->scrolls[0].h_left = static_cast<int16_t>(
std::ceil(clip_height_ratio * (w->scrolls[0].h_right - ((widget->right - widget->left) - 1))));
}
rct_window* window_view_clipping_open()
@ -286,7 +286,8 @@ static void window_view_clipping_update(rct_window* w)
const rct_widget* const widget = &window_view_clipping_widgets[WIDX_CLIP_HEIGHT_SLIDER];
const rct_scroll* const scroll = &w->scrolls[0];
const int16_t scroll_width = widget->right - widget->left - 1;
const uint8_t clip_height = (uint8_t)(((float)scroll->h_left / (scroll->h_right - scroll_width)) * 255);
const uint8_t clip_height = static_cast<uint8_t>(
(static_cast<float>(scroll->h_left) / (scroll->h_right - scroll_width)) * 255);
if (clip_height != gClipHeight)
{
gClipHeight = clip_height;
@ -406,7 +407,7 @@ static void window_view_clipping_paint(rct_window* w, rct_drawpixelinfo* dpi)
fixed16_1dp clipHeightValueInUnits;
fixed32_2dp clipHeightValueInMeters;
fixed16_1dp clipHeightValueInFeet;
int32_t clipHeightRawValue = (int32_t)gClipHeight;
int32_t clipHeightRawValue = static_cast<int32_t>(gClipHeight);
switch (gClipHeightDisplayType)
{
case DISPLAY_TYPE::DISPLAY_RAW:
@ -419,7 +420,7 @@ static void window_view_clipping_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (gConfigGeneral.show_height_as_units == 1)
{
// Height label is Units.
clipHeightValueInUnits = (fixed16_1dp)(FIXED_1DP(gClipHeight, 0) / 2 - FIXED_1DP(7, 0));
clipHeightValueInUnits = static_cast<fixed16_1dp>(FIXED_1DP(gClipHeight, 0) / 2 - FIXED_1DP(7, 0));
gfx_draw_string_left(
dpi, STR_UNIT1DP_NO_SUFFIX, &clipHeightValueInUnits, w->colours[0], x,
y); // Printing the value in Height Units.
@ -432,12 +433,14 @@ static void window_view_clipping_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
case MEASUREMENT_FORMAT_METRIC:
case MEASUREMENT_FORMAT_SI:
clipHeightValueInMeters = (fixed32_2dp)(FIXED_2DP(gClipHeight, 0) / 2 * 1.5f - FIXED_2DP(10, 50));
clipHeightValueInMeters = static_cast<fixed32_2dp>(
FIXED_2DP(gClipHeight, 0) / 2 * 1.5f - FIXED_2DP(10, 50));
gfx_draw_string_left(dpi, STR_UNIT2DP_SUFFIX_METRES, &clipHeightValueInMeters, w->colours[0], x, y);
break;
case MEASUREMENT_FORMAT_IMPERIAL:
default:
clipHeightValueInFeet = (fixed16_1dp)(FIXED_1DP(gClipHeight, 0) / 2.0f * 5 - FIXED_1DP(35, 0));
clipHeightValueInFeet = static_cast<fixed16_1dp>(
FIXED_1DP(gClipHeight, 0) / 2.0f * 5 - FIXED_1DP(35, 0));
gfx_draw_string_left(dpi, STR_UNIT1DP_SUFFIX_FEET, &clipHeightValueInFeet, w->colours[0], x, y);
break;
}