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

Added start of shortcut window

Browse Source
This commit is contained in:
Duncan Frost
2014-10-05 14:21:35 +01:00
parent 71e6f90e08
commit ff1b124572
5 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openrct2.vcxproj
View File

@@ -136,6 +136,7 @@
<ClCompile Include="..\src\window_ride.c" />
<ClCompile Include="..\src\window_ride_list.c" />
<ClCompile Include="..\src\window_save_prompt.c" />
<ClCompile Include="..\src\window_shortcut_keys.c" />
<ClCompile Include="..\src\window_staff.c" />
<ClCompile Include="..\src\window_staff_peep.c" />
<ClCompile Include="..\src\window_title_exit.c" />

3
projects/openrct2.vcxproj.filters
View File

@@ -431,6 +431,9 @@
<ClCompile Include="..\src\research.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\window_shortcut_keys.c">
<Filter>Windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\openrct2.exe">

1
src/window.h
View File

@@ -476,6 +476,7 @@ void window_staff_open();
void window_guest_list_open();
void window_map_open();
void window_options_open();
void window_shortcut_keys_open();
void window_peep_open(rct_peep* peep);
void window_staff_peep_open(rct_peep* peep);
void window_park_awards_open();

2
src/window_options.c
View File

@@ -286,7 +286,7 @@ static void window_options_mouseup()
window_options_set_page(w, widgetIndex - WIDX_TAB_1);
break;
case WIDX_HOTKEY_DROPDOWN:
RCT2_CALLPROC_EBPSAFE(0x006E3884);
window_shortcut_keys_open();
break;
case WIDX_SCREEN_EDGE_SCROLLING:
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_EDGE_SCROLLING, uint8) ^= 1;

101
src/window_shortcut_keys.c Normal file
View File

@@ -0,0 +1,101 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John, Duncan Frost
* 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
* (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/>.
*****************************************************************************/
#include "window.h"
#include "widget.h"
#define WW 340
#define WH 240
enum WINDOW_SHORTCUT_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
WIDX_CLOSE,
WIDX_SCROLL,
WIDX_RESET
};
// 9DE48C
static rct_widget window_shortcut_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE },
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_OPTIONS, STR_WINDOW_TITLE_TIP },
{ WWT_CLOSEBOX, 0, WW-13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
{ WWT_SCROLL, 0, 4, WW - 5, 18, WH - 18, 2, 2786 },
{ WWT_DROPDOWN_BUTTON, 0, 4, 153, WH-15, WH - 4, 2491, 2492 },
{ WIDGETS_END }
};
void window_shortcut_emptysub() { }
static void* window_options_events[] = {
window_shortcut_emptysub,
(void*)0x6E39E4,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
(void*)0x6E3A07,
(void*)0x6E3A3E,
window_shortcut_emptysub,
(void*)0x6E3A16,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
(void*)0x6E3A0C,
window_shortcut_emptysub,
window_shortcut_emptysub,
window_shortcut_emptysub,
(void*)0x6E38E0,
(void*)0x6E38E6
};
/**
*
* rct2: 0x006E3884
*/
void window_shortcut_keys_open()
{
rct_window* w;
w = window_bring_to_front_by_id(WC_KEYBOARD_SHORTCUT_LIST, 0);
if (w) return;
w = window_create_auto_pos(WW, WH, (uint32*)0x9A3F0C, WC_KEYBOARD_SHORTCUT_LIST, 0);
w->widgets = window_shortcut_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RESET);
window_init_scroll_widgets(w);
w->colours[0] = 7;
w->colours[1] = 7;
w->colours[2] = 7;
w->no_list_items = 32;
w->selected_list_item = -1;
}