mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity

Strip all whitespace

Browse Source
This commit is contained in:
Michał Janiszewski
2015-10-20 20:16:30 +02:00
parent 6fb6bb2556
commit 7d0ce00bab
163 changed files with 1280 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/console.c
View File

@@ -154,7 +154,7 @@ void console_draw(rct_drawpixelinfo *dpi)
int x = _consoleLeft + 4;
int y = _consoleTop + 4;
// Draw previous lines
utf8 lineBuffer[2 + 256], *lineCh;
ch = _consoleViewBufferStart;
@@ -933,7 +933,7 @@ console_command console_command_table[] = {
{ "windows", cc_windows, "Lists all the windows that can be opened.", "windows" },
{ "load_object", cc_load_object, "Loads the object file into the scenario.\n"
"Loading a scenery group will not load its associated objects.\n"
"This is a safer method opposed to \"open object_selection\".",
"This is a safer method opposed to \"open object_selection\".",
"load_object <objectfilenodat>" },
{ "object_count", cc_object_count, "Shows the number of objects of each type in the scenario.", "object_count" },
{ "twitch", cc_twitch, "Twitch API" },

4
src/interface/graph.c
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/graph.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

8
src/interface/keyboard_shortcut.c
View File

@@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -35,7 +35,7 @@ typedef void (*shortcut_action)();
static const shortcut_action shortcut_table[SHORTCUT_COUNT];
/**
*
*
* rct2: 0x006E3E91
*/
void keyboard_shortcut_set(int key)
@@ -58,7 +58,7 @@ void keyboard_shortcut_set(int key)
}
/**
*
*
* rct2: 0x006E3E68
*/
void keyboard_shortcut_handle(int key)

4
src/interface/keyboard_shortcut.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/screenshot.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/themes.c
View File

@@ -98,7 +98,7 @@ theme_window_preset gThemeWindowsRCT1[] = {
{ WC_GUEST_LIST, COLOURS_RCT1(22, 26, 26, 0, 0, 0) },
{ WC_STAFF_LIST, COLOURS_RCT1(12, 4, 4, 0, 0, 0) },
{ WC_FINANCES, COLOURS_RCT1(4, 1, 1, 0, 0, 0) },
{ WC_TITLE_MENU, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
{ WC_TITLE_MENU, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
{ WC_TITLE_EXIT, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
{ WC_NEW_CAMPAIGN, COLOURS_RCT1(4, 4, 1, 0, 0, 0) },
{ WC_TITLE_OPTIONS, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
@@ -156,7 +156,7 @@ void colour_scheme_update(rct_window *window)
void colour_scheme_update_by_class(rct_window *window, rct_windowclass classification)
{
theme_window* theme = theme_window_get_by_class(classification);
bool transparent = false;
for (int i = 0; i < 6; i++) {
window->colours[i] = theme->colours[i];

10
src/interface/title_sequences.c
View File

@@ -100,7 +100,7 @@ void title_sequence_create_preset(const char *name)
strcat(path, gConfigTitleSequences.presets[preset].name);
platform_file_delete(path);
platform_ensure_directory_exists(path);
title_sequence_save_preset_script(preset);
gCurrentTitleSequence = preset;
}
@@ -164,7 +164,7 @@ void title_sequence_duplicate_preset(int duplicate, const char *name)
if (loadmm) {
title_sequence_add_save(preset, get_file_path(PATH_ID_SIXFLAGS_MAGICMOUNTAIN), "Six Flags Magic Mountain.SC6");
}
title_sequence_save_preset_script(preset);
gCurrentTitleSequence = preset;
}
@@ -241,7 +241,7 @@ void title_sequence_add_save(int preset, const char *path, const char *newName)
gConfigTitleSequences.presets[preset].num_saves++;
gConfigTitleSequences.presets[preset].saves = realloc(gConfigTitleSequences.presets[preset].saves, sizeof(char[TITLE_SEQUENCE_MAX_SAVE_LENGTH]) * (size_t)gConfigTitleSequences.presets[preset].num_saves);
strcpy(gConfigTitleSequences.presets[preset].saves[gConfigTitleSequences.presets[preset].num_saves - 1], newName);
// Add the appropriate extension if needed
if (_stricmp(extension, ".sv6") != 0 && _stricmp(extension, ".sc6") != 0)
@@ -260,7 +260,7 @@ void title_sequence_remove_save(int preset, int index)
strncat(path, &separator, 1);
strcat(path, gConfigTitleSequences.presets[preset].saves[index]);
platform_file_delete(path);
// Remove all references to this save in the commands and decrement save indecies
for (int i = 0; i < gConfigTitleSequences.presets[preset].num_commands; i++) {
if (gConfigTitleSequences.presets[preset].commands[i].command == TITLE_SCRIPT_LOAD) {
@@ -270,7 +270,7 @@ void title_sequence_remove_save(int preset, int index)
gConfigTitleSequences.presets[preset].commands[i].saveIndex--;
}
}
for (int i = index; i < gConfigTitleSequences.presets[preset].num_saves - 1; i++) {
strcpy(gConfigTitleSequences.presets[preset].saves[i], gConfigTitleSequences.presets[preset].saves[i + 1]);
}

4
src/interface/viewport.h
View File

@@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or

34
src/interface/viewport_interaction.c
View File

@@ -56,7 +56,7 @@ int viewport_interaction_get_item_left(int x, int y, viewport_interaction_info *
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_MANAGER))
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
//
//
if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) && s6Info->editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
@@ -162,7 +162,7 @@ int viewport_interaction_left_click(int x, int y)
}
/**
*
*
* rct2: 0x006EDE88
*/
int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info *info)
@@ -179,7 +179,7 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_MANAGER))
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
//
//
if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) && s6Info->editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
@@ -336,7 +336,7 @@ int viewport_interaction_right_over(int x, int y)
}
/**
*
*
* rct2: 0x006E8A62
*/
int viewport_interaction_right_click(int x, int y)
@@ -385,7 +385,7 @@ int viewport_interaction_right_click(int x, int y)
}
/**
*
*
* rct2: 0x006E08D2
*/
static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int x, int y)
@@ -403,7 +403,7 @@ static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int
}
/**
*
*
* rct2: 0x006A614A
*/
static void viewport_interaction_remove_footpath(rct_map_element *mapElement, int x, int y)
@@ -413,7 +413,7 @@ static void viewport_interaction_remove_footpath(rct_map_element *mapElement, in
rct_map_element *mapElement2;
z = mapElement->base_height;
w = window_find_by_class(WC_FOOTPATH);
if (w != NULL)
footpath_provisional_update();
@@ -429,7 +429,7 @@ static void viewport_interaction_remove_footpath(rct_map_element *mapElement, in
}
/**
*
*
* rct2: 0x006A61AB
*/
static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, int x, int y)
@@ -453,7 +453,7 @@ static void viewport_interaction_remove_footpath_item(rct_map_element *mapElemen
}
/**
*
*
* rct2: 0x00666C0E
*/
void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int x, int y)
@@ -474,7 +474,7 @@ void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int
}
/**
*
*
* rct2: 0x006E57A9
*/
static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, int x, int y)
@@ -499,7 +499,7 @@ static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, i
}
/**
*
*
* rct2: 0x006B88DC
*/
static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, int x, int y)
@@ -516,12 +516,12 @@ static void viewport_interaction_remove_large_scenery(rct_map_element *mapElemen
} else {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = STR_CANT_REMOVE_THIS;
game_do_command(
x,
1 | ((mapElement->type & 0x3) << 8),
y,
x,
1 | ((mapElement->type & 0x3) << 8),
y,
mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8),
GAME_COMMAND_REMOVE_LARGE_SCENERY,
0,
GAME_COMMAND_REMOVE_LARGE_SCENERY,
0,
0
);
}
@@ -538,7 +538,7 @@ static rct_peep *viewport_interaction_get_closest_peep(int x, int y, int maxDist
w = window_find_from_point(x, y);
if (w == NULL)
return 0;
viewport = w->viewport;
if (viewport == NULL || viewport->zoom >= 2)
return 0;

54
src/interface/widget.c
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@@ -48,7 +48,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex);
/**
*
*
* rct2: 0x006EAF26
*/
void widget_scroll_update_thumbs(rct_window *w, int widget_index)
@@ -102,7 +102,7 @@ void widget_scroll_update_thumbs(rct_window *w, int widget_index)
}
/**
*
*
* rct2: 0x006EB2A8
*/
void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -170,7 +170,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x006EB6CE
*/
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -188,7 +188,7 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
r = w->x + widget->right;
b = w->y + widget->bottom;
//
//
press = (w->flags & WF_10 ? 0x80 : 0);
// Get the colour
@@ -210,7 +210,7 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
}
/**
*
*
* rct2: 0x006EB765
*/
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -247,7 +247,7 @@ static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget
}
/**
*
*
* rct2: 0x006EB8E5
*/
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -297,7 +297,7 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd
// Get the widget
widget = &w->widgets[widgetIndex];
//
//
if (widget->image == -1)
return;
@@ -330,7 +330,7 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd
}
/**
*
*
* rct2: 0x006EB861
*/
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -373,7 +373,7 @@ static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int w
}
/**
*
*
* rct2: 0x006EBBEB
*/
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -403,7 +403,7 @@ static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widget
}
/**
*
*
* rct2: 0x006EBC41
*/
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -462,7 +462,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge
}
/**
*
*
* rct2: 0x006EBD52
*/
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -492,7 +492,7 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x006EBD1F
*/
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -518,7 +518,7 @@ static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
}
/**
*
*
* rct2: 0x006EC1A6
*/
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -546,12 +546,12 @@ static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIn
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
// TODO
gfx_fill_rect(dpi, l, t, r, b, colour);
}
/**
*
*
* rct2: 0x006EB535
*/
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -611,7 +611,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
}
/**
*
*
* rct2: 0x006EB2F9
*/
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -632,7 +632,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
// Get the colour
colour = w->colours[widget->colour];
//
//
if (w->var_4B8 != -1) {
gfx_draw_sprite(dpi, *((char*)(0x013CA742 + w->var_4B8)) << 19, l + 1, t + 1, 0);
if (w->width > 638)
@@ -643,7 +643,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
gfx_draw_sprite(dpi, *((char*)(0x013CA742 + w->var_4B9)) << 19, l + 1 + 638, t + 1, 0);
}
//
//
press = 0x70;
if (w->flags & WF_10)
press |= 0x80;
@@ -651,7 +651,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
gfx_fill_rect(dpi, r + 1, t, r + 1, b, *((char*)(0x0141FC47 + (colour * 8))));
} else {
//
//
press = 0x60;
if (w->flags & WF_10)
press |= 0x80;
@@ -682,7 +682,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
}
/**
*
*
* rct2: 0x006EBB85
*/
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -726,7 +726,7 @@ static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
}
/**
*
*
* rct2: 0x006EBAD9
*/
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -770,7 +770,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
}
/**
*
*
* rct2: 0x006EBD96
*/
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@@ -858,11 +858,11 @@ static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
gfx_fill_rect(dpi, l + 10, t + 3, r - 10, t + 3, *((char*)(0x0141FC4B + (colour * 8))));
gfx_fill_rect(dpi, l + 10, t + 7, r - 10, t + 7, *((char*)(0x0141FC47 + (colour * 8))));
gfx_fill_rect(dpi, l + 10, t + 8, r - 10, t + 8, *((char*)(0x0141FC4B + (colour * 8))));
// Left button
gfx_fill_rect_inset(dpi, l, t, l + 9, b, colour, (scroll->flags & HSCROLLBAR_LEFT_PRESSED ? 0x20 : 0));
gfx_draw_string(dpi, (char*)BlackLeftArrowString, 0, l + 1, t);
// Thumb
gfx_fill_rect_inset(dpi,
max(l + 10, l + scroll->h_thumb_left - 1), t,
@@ -901,7 +901,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
}
/**
*
*
* rct2: 0x006EB951
*/
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)

4
src/interface/widget.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

10
src/interface/window.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@@ -102,7 +102,7 @@ typedef struct {
uint16 v_thumb_bottom; // 0x10
} rct_scroll;
/**
/**
* Viewport focus structure.
* size: 0xA
* Use sprite.type to work out type.
@@ -122,7 +122,7 @@ typedef struct{
uint16 sprite_id; //0x482
uint8 pad_484;
uint8 type; //0x485 & VIEWPORT_FOCUS_TYPE_MASK
uint16 pad_486;
uint16 pad_486;
uint8 rotation; //0x488
uint8 zoom; //0x489
} sprite_focus;
@@ -286,7 +286,7 @@ typedef enum {
WE_RESIZE = 2,
WE_MOUSE_DOWN = 3,
WE_DROPDOWN = 4,
WE_UNKNOWN_05 = 5,
WE_UNKNOWN_05 = 5,
// Unknown 05: Used to update tabs that are not being animated
// see window_peep. When the overview tab is not highlighted the
// items being carried such as hats/balloons still need to be shown