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

Drop unused variables (#3586)

Browse Source
This commit is contained in:
janisozaur
2016-05-13 19:21:58 +02:00
committed by Ted John
parent feb140b84c
commit ca430e1b23
50 changed files with 15 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/Theme.cpp
View File

@@ -414,7 +414,6 @@ UITheme * UITheme::FromJson(const json_t * json)
}
json_t * jsonEntries = json_object_get(json, "entries");
size_t numEntries = json_object_size(jsonEntries);
UITheme * result = nullptr;
try
@@ -436,7 +435,6 @@ UITheme * UITheme::FromJson(const json_t * json)
const char * jkey;
json_t * jvalue;
size_t i = 0;
json_object_foreach(jsonEntries, jkey, jvalue)
{
const WindowThemeDesc * wtDesc = GetWindowThemeDescriptor(jkey);

3
src/interface/console.c
View File

@@ -54,7 +54,6 @@ static utf8 _consoleBuffer[CONSOLE_BUFFER_SIZE] = { 0 };
static utf8 *_consoleBufferPointer = _consoleBuffer;
static utf8 *_consoleViewBufferStart = _consoleBuffer;
static utf8 _consoleCurrentLine[CONSOLE_INPUT_SIZE];
static utf8 *_consoleCurrentLinePointer = _consoleCurrentLine;
static int _consoleCaretTicks;
static utf8 _consolePrintfBuffer[CONSOLE_BUFFER_2_SIZE];
static utf8 _consoleErrorBuffer[CONSOLE_BUFFER_2_SIZE];
@@ -806,8 +805,6 @@ static int cc_load_object(const utf8 **argv, int argc) {
utf8 path[MAX_PATH];
substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), argv[0]);
// Require pointer to start of filename
utf8* last_char = path + strlen(path);
strcat(path, ".DAT\0");
rct_object_entry entry;

1
src/interface/title_sequences.c
View File

@@ -180,7 +180,6 @@ void title_sequence_delete_preset(int preset)
if (preset >= TITLE_SEQUENCE_DEFAULT_PRESETS && preset < gConfigTitleSequences.num_presets) {
// Delete the folder
utf8 path[MAX_PATH];
char separator = platform_get_path_separator();
platform_get_user_directory(path, "title sequences");
strcat(path, gConfigTitleSequences.presets[preset].name);
if (!platform_directory_delete(path)) {

3
src/interface/viewport.c
View File

@@ -662,7 +662,9 @@ void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, i
if (left >= viewport->x + viewport->width)return;
if (top >= viewport->y + viewport->height)return;
#ifdef DEBUG_SHOW_DIRTY_BOX
int l = left, t = top, r = right, b = bottom;
#endif
left = max(left - viewport->x, 0);
right = min(right - viewport->x, viewport->width);
@@ -783,7 +785,6 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
}
RCT2_GLOBAL(0xEE7880, uint32) = 0xF1A4CC;
RCT2_GLOBAL(0x140E9A8, uint32) = (int)dpi2;
int ebp = 0, ebx = 0, esi = 0, ecx = 0;
painter_setup();
viewport_paint_setup();
sub_688217();

3
src/interface/window.c
View File

@@ -1937,9 +1937,6 @@ void window_event_unknown_0E_call(rct_window *w)
void window_get_scroll_size(rct_window *w, int scrollIndex, int *width, int *height)
{
if (w->event_handlers->get_scroll_size != NULL) {
rct_widget *widget = window_get_scroll_widget(w, scrollIndex);
int widgetIndex = window_get_widget_index(w, widget);
w->event_handlers->get_scroll_size(w, scrollIndex, width, height);
}
}