mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 18:07:53 +01:00
Code Issues Releases Wiki Activity

Remove trailing whitespace in sources

Browse Source
This commit is contained in:
Michał Janiszewski
2016-11-13 20:17:49 +01:00
parent 9fed68bf6f
commit 3f7fd56328
92 changed files with 359 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interface/Theme.cpp
View File

@@ -255,7 +255,7 @@ static void ThrowThemeLoadException()
json_t * UIThemeWindowEntry::ToJson() const
{
const WindowThemeDesc * wtDesc = GetWindowThemeDescriptor(WindowClass);
json_t * jsonColours = json_array();
for (uint8 i = 0; i < wtDesc->NumColours; i++) {
colour_t colour = Theme.Colours[i];
@@ -282,7 +282,7 @@ UIThemeWindowEntry UIThemeWindowEntry::FromJson(const WindowThemeDesc * wtDesc,
UIThemeWindowEntry result;
result.WindowClass = wtDesc->WindowClass;
result.Theme = wtDesc->DefaultTheme;
for (uint8 i = 0; i < numColours; i++)
{
result.Theme.Colours[i] = (colour_t)json_integer_value(json_array_get(jsonColours, i));
@@ -536,7 +536,7 @@ namespace ThemeManager
AvailableTheme theme;
Path::GetFileNameWithoutExtension(theme.Name, sizeof(theme.Name), fileInfo.path);
GetThemeFileName(theme.Path, sizeof(theme.Path), theme.Name);
outThemes->push_back(theme);
if (Path::Equals(CurrentThemePath, fileInfo.path))
@@ -621,7 +621,7 @@ namespace ThemeManager
configValid = true;
}
}
if (!configValid)
{
String::DiscardDuplicate(&gConfigInterface.current_theme_preset, theme_manager_get_available_theme_name(1));

10
src/interface/chat.c
View File

@@ -123,7 +123,7 @@ void chat_draw(rct_drawpixelinfo * dpi)
gfx_fill_rect_inset(dpi, _chatLeft + 1, _chatTop - 4, _chatRight - 1, _chatBottom - inputLineHeight - 6, chatBackgroundColor, INSET_RECT_FLAG_BORDER_INSET);
gfx_fill_rect_inset(dpi, _chatLeft + 1, _chatBottom - inputLineHeight - 5, _chatRight - 1, _chatBottom + 4, chatBackgroundColor, INSET_RECT_FLAG_BORDER_INSET); //Textbox
}
int x = _chatLeft + 5;
int y = _chatBottom - inputLineHeight - 20;
int stringHeight = 0;
@@ -143,7 +143,7 @@ void chat_draw(rct_drawpixelinfo * dpi)
break;
}
}
// Draw current chat input
if (gChatOpen) {
lineCh = utf8_write_codepoint(lineCh, FORMAT_OUTLINE);
@@ -155,7 +155,7 @@ void chat_draw(rct_drawpixelinfo * dpi)
lineCh = lineBuffer;
int inputLineHeight = gfx_draw_string_left_wrapped(dpi, (void*)&lineCh, x, y + 3, _chatWidth - 10, STR_STRING, 255);
gfx_set_dirty_blocks(x, y, x + _chatWidth, y + inputLineHeight + 15);
//TODO: Show caret if the input text have multiple lines
if (_chatCaretTicks < 15 && gfx_get_string_width(lineBuffer) < (_chatWidth - 10)) {
memcpy(lineBuffer, _chatCurrentLine, gTextInput.selection_offset);
@@ -215,7 +215,7 @@ static void chat_clear_input()
int chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, int x, int y, int width)
{
int fontSpriteBase, lineHeight, lineY, numLines;
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gfx_draw_string(dpi, "", 255, dpi->x, dpi->y);
@@ -256,7 +256,7 @@ int chat_string_wrapped_get_height(void *args, int width)
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase);
lineHeight = font_get_line_height(fontSpriteBase);
gCurrentFontFlags = 0;
lineY = 0;

6
src/interface/console.c
View File

@@ -477,7 +477,7 @@ static int cc_rides(const utf8 **argv, int argc)
bool int_valid[2] = { 0 };
int ride_index = console_parse_int(argv[2], &int_valid[0]);
int friction = console_parse_int(argv[3], &int_valid[1]);
if (ride_index < 0) {
console_printf("Ride index must not be negative");
} else if (!int_valid[0] || !int_valid[1]) {
@@ -496,7 +496,7 @@ static int cc_rides(const utf8 **argv, int argc)
vehicle->friction=friction;
vehicle_index=vehicle->next_vehicle_on_train;
}
}
}
}
}
}
@@ -528,7 +528,7 @@ static int cc_staff(const utf8 **argv, int argc)
bool int_valid[3] = { 0 };
int_val[0] = console_parse_int(argv[2], &int_valid[0]);
int_val[1] = console_parse_int(argv[3], &int_valid[1]);
if (int_valid[0] && int_valid[1] && ((GET_PEEP(int_val[0])) != NULL)) {
rct_peep *peep = GET_PEEP(int_val[0]);

2
src/interface/window.c
View File

@@ -358,7 +358,7 @@ static void window_close_surplus(int cap, sint8 avoid_classification)
}
}
//difference between amount open and cap = amount to close
diff = count - WINDOW_LIMIT_RESERVED - cap;
diff = count - WINDOW_LIMIT_RESERVED - cap;
for (i = 0; i < diff; i++) {
rct_window *w = NULL;
//iterates through the list until it finds the newest window, or a window that can be closed