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

Clang tidy Part 1: Ui Project Function Names (#15956)

Browse Source 
* Add NOLINT around STL using classes and vendor functions

* Apply clang-tidy to ui project function names

* Undo scripting clang-format

* Upper case OpenRCT2 and RCT2
This commit is contained in:
Duncan
2021-11-23 13:18:07 +00:00
committed by GitHub
parent fcf587dfa4
commit bb2c7dbaca
84 changed files with 3939 additions and 3959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,72 +184,72 @@ static rct_widget* PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
#pragma region Events
static void window_mapgen_shared_close(rct_window* w);
static void window_mapgen_shared_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenSharedClose(rct_window* w);
static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_base_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_mapgen_base_update(rct_window* w);
static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void window_mapgen_base_invalidate(rct_window* w);
static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenBaseDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenBaseUpdate(rct_window* w);
static void WindowMapgenTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowMapgenBaseInvalidate(rct_window* w);
static void WindowMapgenBasePaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_mapgen_random_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_random_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_random_update(rct_window* w);
static void window_mapgen_random_invalidate(rct_window* w);
static void window_mapgen_random_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenRandomMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenRandomUpdate(rct_window* w);
static void WindowMapgenRandomInvalidate(rct_window* w);
static void WindowMapgenRandomPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void window_mapgen_simplex_update(rct_window* w);
static void window_mapgen_simplex_invalidate(rct_window* w);
static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenSimplexDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenSimplexUpdate(rct_window* w);
static void WindowMapgenSimplexInvalidate(rct_window* w);
static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void window_mapgen_heightmap_invalidate(rct_window* w);
static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenHeightmapMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenHeightmapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenHeightmapInvalidate(rct_window* w);
static void WindowMapgenHeightmapPaint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list BaseEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_base_mouseup;
events.mouse_down = &window_mapgen_base_mousedown;
events.dropdown = &window_mapgen_base_dropdown;
events.update = &window_mapgen_base_update;
events.text_input = &window_mapgen_textinput;
events.invalidate = &window_mapgen_base_invalidate;
events.paint = &window_mapgen_base_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenBaseMouseup;
events.mouse_down = &WindowMapgenBaseMousedown;
events.dropdown = &WindowMapgenBaseDropdown;
events.update = &WindowMapgenBaseUpdate;
events.text_input = &WindowMapgenTextinput;
events.invalidate = &WindowMapgenBaseInvalidate;
events.paint = &WindowMapgenBasePaint;
});
static rct_window_event_list RandomEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_random_mouseup;
events.mouse_down = &window_mapgen_random_mousedown;
events.update = &window_mapgen_random_update;
events.invalidate = &window_mapgen_random_invalidate;
events.paint = &window_mapgen_random_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenRandomMouseup;
events.mouse_down = &WindowMapgenRandomMousedown;
events.update = &WindowMapgenRandomUpdate;
events.invalidate = &WindowMapgenRandomInvalidate;
events.paint = &WindowMapgenRandomPaint;
});
static rct_window_event_list SimplexEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_simplex_mouseup;
events.mouse_down = &window_mapgen_simplex_mousedown;
events.dropdown = &window_mapgen_simplex_dropdown;
events.update = &window_mapgen_simplex_update;
events.text_input = &window_mapgen_textinput;
events.invalidate = &window_mapgen_simplex_invalidate;
events.paint = &window_mapgen_simplex_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenSimplexMouseup;
events.mouse_down = &WindowMapgenSimplexMousedown;
events.dropdown = &WindowMapgenSimplexDropdown;
events.update = &WindowMapgenSimplexUpdate;
events.text_input = &WindowMapgenTextinput;
events.invalidate = &WindowMapgenSimplexInvalidate;
events.paint = &WindowMapgenSimplexPaint;
});
static rct_window_event_list HeightmapEvents([](auto& events) {
events.close = &window_mapgen_shared_close;
events.mouse_up = &window_mapgen_heightmap_mouseup;
events.mouse_down = &window_mapgen_heightmap_mousedown;
events.invalidate = &window_mapgen_heightmap_invalidate;
events.paint = &window_mapgen_heightmap_paint;
events.close = &WindowMapgenSharedClose;
events.mouse_up = &WindowMapgenHeightmapMouseup;
events.mouse_down = &WindowMapgenHeightmapMousedown;
events.invalidate = &WindowMapgenHeightmapInvalidate;
events.paint = &WindowMapgenHeightmapPaint;
});
static rct_window_event_list* PageEvents[] = {
@@ -423,9 +423,9 @@ constexpr int32_t WATERLEVEL_MIN = 0;
constexpr int32_t WATERLEVEL_MAX = 54;
constexpr int32_t MAX_SMOOTH_ITERATIONS = 20;
static void window_mapgen_set_page(rct_window* w, int32_t page);
static void window_mapgen_set_pressed_tab(rct_window* w);
static void window_mapgen_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w);
static void WindowMapgenSetPage(rct_window* w, int32_t page);
static void WindowMapgenSetPressedTab(rct_window* w);
static void WindowMapgenDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w);
static int32_t _mapSize = 150;
static int32_t _baseHeight = 12;
@@ -448,7 +448,7 @@ static bool _heightmapSmoothTiles = true;
static int32_t _heightmapLow = 2;
static int32_t _heightmapHigh = 70;
rct_window* window_mapgen_open()
rct_window* WindowMapgenOpen()
{
rct_window* w = window_bring_to_front_by_class(WC_MAPGEN);
if (w != nullptr)
@@ -475,12 +475,12 @@ rct_window* window_mapgen_open()
return w;
}
static void window_mapgen_shared_close(rct_window* w)
static void WindowMapgenSharedClose(rct_window* w)
{
mapgen_unload_heightmap();
}
static void window_mapgen_shared_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@@ -491,16 +491,16 @@ static void window_mapgen_shared_mouseup(rct_window* w, rct_widgetindex widgetIn
case WIDX_TAB_2:
case WIDX_TAB_3:
case WIDX_TAB_4:
window_mapgen_set_page(w, widgetIndex - WIDX_TAB_1);
WindowMapgenSetPage(w, widgetIndex - WIDX_TAB_1);
break;
}
}
#pragma region Base page
static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
mapgen_settings mapgenSettings;
Formatter ft;
@@ -520,25 +520,24 @@ static void window_mapgen_base_mouseup(rct_window* w, rct_widgetindex widgetInde
ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
ft.Add<int16_t>(MAXIMUM_MAP_SIZE_PRACTICAL);
// Practical map size is 2 lower than the technical map size
window_text_input_open(
w, WIDX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_FORMAT_INTEGER, _mapSize - 2, 4);
WindowTextInputOpen(w, WIDX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_FORMAT_INTEGER, _mapSize - 2, 4);
break;
case WIDX_BASE_HEIGHT:
ft.Add<int16_t>((BASESIZE_MIN - 12) / 2);
ft.Add<int16_t>((BASESIZE_MAX - 12) / 2);
window_text_input_open(
WindowTextInputOpen(
w, WIDX_BASE_HEIGHT, STR_BASE_HEIGHT, STR_ENTER_BASE_HEIGHT, ft, STR_FORMAT_INTEGER, (_baseHeight - 12) / 2, 3);
break;
case WIDX_WATER_LEVEL:
ft.Add<int16_t>((WATERLEVEL_MIN - 12) / 2);
ft.Add<int16_t>((WATERLEVEL_MAX - 12) / 2);
window_text_input_open(
WindowTextInputOpen(
w, WIDX_WATER_LEVEL, STR_WATER_LEVEL, STR_ENTER_WATER_LEVEL, ft, STR_FORMAT_INTEGER, (_waterLevel - 12) / 2, 3);
break;
}
}
static void window_mapgen_base_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@@ -575,7 +574,7 @@ static void window_mapgen_base_mousedown(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMapgenBaseDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
int32_t type;
@@ -618,7 +617,7 @@ static void window_mapgen_base_dropdown(rct_window* w, rct_widgetindex widgetInd
}
}
static void window_mapgen_base_update(rct_window* w)
static void WindowMapgenBaseUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= TabAnimationLoops[w->page])
@@ -626,7 +625,7 @@ static void window_mapgen_base_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_1);
}
static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowMapgenTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
int32_t value;
char* end;
@@ -660,7 +659,7 @@ static void window_mapgen_textinput(rct_window* w, rct_widgetindex widgetIndex,
w->Invalidate();
}
static void window_mapgen_base_invalidate(rct_window* w)
static void WindowMapgenBaseInvalidate(rct_window* w)
{
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
@@ -691,13 +690,13 @@ static void window_mapgen_base_invalidate(rct_window* w)
w->widgets[WIDX_FLOOR_TEXTURE].image = surfaceImage;
w->widgets[WIDX_WALL_TEXTURE].image = edgeImage;
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenBasePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
const auto textColour = w->colours[1];
@@ -737,9 +736,9 @@ static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Random page
static void window_mapgen_random_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
mapgen_settings mapgenSettings;
@@ -770,11 +769,11 @@ static void window_mapgen_random_mouseup(rct_window* w, rct_widgetindex widgetIn
}
}
static void window_mapgen_random_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenRandomMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
}
static void window_mapgen_random_update(rct_window* w)
static void WindowMapgenRandomUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= TabAnimationLoops[w->page])
@@ -782,7 +781,7 @@ static void window_mapgen_random_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_2);
}
static void window_mapgen_random_invalidate(rct_window* w)
static void WindowMapgenRandomInvalidate(rct_window* w)
{
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM])
{
@@ -796,22 +795,22 @@ static void window_mapgen_random_invalidate(rct_window* w)
if (_placeTrees)
w->pressed_widgets |= 1ULL << WIDX_RANDOM_PLACE_TREES;
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_random_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenRandomPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
}
#pragma endregion
#pragma region Simplex page
static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
mapgen_settings mapgenSettings;
@@ -823,7 +822,7 @@ static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetI
ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
ft.Add<int16_t>(MAXIMUM_MAP_SIZE_PRACTICAL);
// Practical map size is 2 lower than the technical map size
window_text_input_open(
WindowTextInputOpen(
w, WIDX_SIMPLEX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, ft, STR_FORMAT_INTEGER, _mapSize - 2, 4);
break;
}
@@ -847,7 +846,7 @@ static void window_mapgen_simplex_mouseup(rct_window* w, rct_widgetindex widgetI
}
}
static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@@ -916,7 +915,7 @@ static void window_mapgen_simplex_mousedown(rct_window* w, rct_widgetindex widge
}
}
static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMapgenSimplexDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
int32_t type;
@@ -959,7 +958,7 @@ static void window_mapgen_simplex_dropdown(rct_window* w, rct_widgetindex widget
}
}
static void window_mapgen_simplex_update(rct_window* w)
static void WindowMapgenSimplexUpdate(rct_window* w)
{
// Tab animation
if (++w->frame_no >= TabAnimationLoops[w->page])
@@ -967,7 +966,7 @@ static void window_mapgen_simplex_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_3);
}
static void window_mapgen_simplex_invalidate(rct_window* w)
static void WindowMapgenSimplexInvalidate(rct_window* w)
{
auto surfaceImage = static_cast<uint32_t>(SPR_NONE);
auto edgeImage = static_cast<uint32_t>(SPR_NONE);
@@ -1013,13 +1012,13 @@ static void window_mapgen_simplex_invalidate(rct_window* w)
WidgetSetEnabled(w, WIDX_SIMPLEX_WALL_TEXTURE, false);
}
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
const uint8_t textColour = w->colours[1];
@@ -1094,7 +1093,7 @@ static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Heightmap page
static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenHeightmapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@@ -1135,7 +1134,7 @@ static void window_mapgen_heightmap_mousedown(rct_window* w, rct_widgetindex wid
}
}
static void window_mapgen_heightmap_generate_map()
static void WindowMapgenHeightmapGenerateMap()
{
mapgen_settings mapgenSettings;
mapgenSettings.water_level = _waterLevel;
@@ -1149,7 +1148,7 @@ static void window_mapgen_heightmap_generate_map()
gfx_invalidate_screen();
}
static void window_mapgen_heightmap_loadsave_callback(int32_t result, const utf8* path)
static void WindowMapgenHeightmapLoadsaveCallback(int32_t result, const utf8* path)
{
if (result == MODAL_RESULT_OK)
{
@@ -1162,15 +1161,15 @@ static void window_mapgen_heightmap_loadsave_callback(int32_t result, const utf8
// The window needs to be open while using the map
rct_window* const w = context_open_window(WC_MAPGEN);
_heightmapLoaded = true;
window_mapgen_set_page(w, WINDOW_MAPGEN_PAGE_HEIGHTMAP);
WindowMapgenSetPage(w, WINDOW_MAPGEN_PAGE_HEIGHTMAP);
window_mapgen_heightmap_generate_map();
WindowMapgenHeightmapGenerateMap();
}
}
static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenHeightmapMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
WindowMapgenSharedMouseup(w, widgetIndex);
switch (widgetIndex)
{
@@ -1186,7 +1185,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, reinterpret_cast<void*>(window_mapgen_heightmap_loadsave_callback));
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowMapgenHeightmapLoadsaveCallback));
context_open_intent(&intent);
return;
}
@@ -1212,10 +1211,10 @@ static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widge
}
// Always regenerate the map after one of the page widgets has been changed
window_mapgen_heightmap_generate_map();
WindowMapgenHeightmapGenerateMap();
}
static void window_mapgen_heightmap_invalidate(rct_window* w)
static void WindowMapgenHeightmapInvalidate(rct_window* w)
{
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP])
{
@@ -1227,13 +1226,13 @@ static void window_mapgen_heightmap_invalidate(rct_window* w)
WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_NORMALIZE, _heightmapNormalize);
WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles);
window_mapgen_set_pressed_tab(w);
WindowMapgenSetPressedTab(w);
}
static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMapgenHeightmapPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
WindowMapgenDrawTabImages(dpi, w);
const colour_t enabledColour = w->colours[1];
const colour_t disabledColour = enabledColour | COLOUR_FLAG_INSET;
@@ -1293,7 +1292,7 @@ static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Common
static void window_mapgen_set_page(rct_window* w, int32_t page)
static void WindowMapgenSetPage(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
@@ -1330,7 +1329,7 @@ static void window_mapgen_set_page(rct_window* w, int32_t page)
w->Invalidate();
}
static void window_mapgen_set_pressed_tab(rct_window* w)
static void WindowMapgenSetPressedTab(rct_window* w)
{
int32_t i;
for (i = 0; i < WINDOW_MAPGEN_PAGE_COUNT; i++)
@@ -1338,7 +1337,7 @@ static void window_mapgen_set_pressed_tab(rct_window* w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
}
static void window_mapgen_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
static void WindowMapgenDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
@@ -1356,12 +1355,12 @@ static void window_mapgen_draw_tab_image(rct_drawpixelinfo* dpi, rct_window* w,
}
}
static void window_mapgen_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
static void WindowMapgenDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w)
{
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_BASE, SPR_G2_TAB_LAND);
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_RANDOM, SPR_G2_TAB_TREE);
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_SIMPLEX, SPR_G2_TAB_PENCIL);
window_mapgen_draw_tab_image(dpi, w, WINDOW_MAPGEN_PAGE_HEIGHTMAP, SPR_TAB_GRAPH_0);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_BASE, SPR_G2_TAB_LAND);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_RANDOM, SPR_G2_TAB_TREE);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_SIMPLEX, SPR_G2_TAB_PENCIL);
WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_HEIGHTMAP, SPR_TAB_GRAPH_0);
}
#pragma endregion