mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 15:23:01 +01:00
Code Issues Releases Wiki Activity

replace tutorial button with new multiplayer button

Browse Source 
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
This commit is contained in:
IntelOrca
2015-12-26 17:09:15 +00:00
parent 42292ea218
commit 4eb8192549
5 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/language/english_uk.txt
View File

@@ -3926,6 +3926,7 @@ STR_5584 :SI
STR_5585 :{SMALLFONT}{BLACK}Unlocks ride operation limits, allowing for things like {VELOCITY} lift hills STR_5585 :{SMALLFONT}{BLACK}Unlocks ride operation limits, allowing for things like {VELOCITY} lift hills
STR_5586 :Automatically open shops and stalls STR_5586 :Automatically open shops and stalls
STR_5587 :{SMALLFONT}{BLACK}When enabled, shops and stalls will be automatically opened after building them STR_5587 :{SMALLFONT}{BLACK}When enabled, shops and stalls will be automatically opened after building them
STR_5588 :{SMALLFONT}{BLACK}Play with other players
##################### #####################
# Rides/attractions # # Rides/attractions #

BIN
resources/g2/60.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

2
src/localisation/string_ids.h
View File

@@ -2208,6 +2208,8 @@ enum {
STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP = 5585, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP = 5585,
STR_SHOW_MULTIPLAYER_TIP = 5588,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768 STR_COUNT = 32768
}; };

1
src/sprites.h
View File

@@ -393,6 +393,7 @@ enum {
SPR_G2_TAB_NEWS = SPR_G2_BEGIN + 58, SPR_G2_TAB_NEWS = SPR_G2_BEGIN + 58,
SPR_G2_LOCKED = SPR_G2_BEGIN + 59, SPR_G2_LOCKED = SPR_G2_BEGIN + 59,
SPR_MENU_MULTIPLAYER = SPR_G2_BEGIN + 60,
}; };
#endif #endif

59
src/windows/title_menu.c
View File

@@ -33,17 +33,17 @@
enum { enum {
WIDX_START_NEW_GAME, WIDX_START_NEW_GAME,
WIDX_CONTINUE_SAVED_GAME, WIDX_CONTINUE_SAVED_GAME,
WIDX_MULTIPLAYER,
WIDX_SHOW_TUTORIAL, WIDX_SHOW_TUTORIAL,
WIDX_GAME_TOOLS, WIDX_GAME_TOOLS
WIDX_MULTIPLAYER
}; };
static rct_widget window_title_menu_widgets[] = { static rct_widget window_title_menu_widgets[] = {
{ WWT_IMGBTN, 2, 0, 81, 0, 81, SPR_MENU_NEW_GAME, STR_START_NEW_GAME_TIP }, { WWT_IMGBTN, 2, 0, 0, 0, 81, SPR_MENU_NEW_GAME, STR_START_NEW_GAME_TIP },
{ WWT_IMGBTN, 2, 82, 163, 0, 81, SPR_MENU_LOAD_GAME, STR_CONTINUE_SAVED_GAME_TIP }, { WWT_IMGBTN, 2, 0, 0, 0, 81, SPR_MENU_LOAD_GAME, STR_CONTINUE_SAVED_GAME_TIP },
{ WWT_IMGBTN, 2, 164, 245, 0, 81, SPR_MENU_TUTORIAL, STR_SHOW_TUTORIAL_TIP }, { WWT_IMGBTN, 2, 0, 0, 0, 81, SPR_MENU_MULTIPLAYER, STR_SHOW_MULTIPLAYER_TIP },
{ WWT_IMGBTN, 2, 246, 327, 0, 81, SPR_MENU_TOOLBOX, STR_GAME_TOOLS }, { WWT_IMGBTN, 2, 0, 0, 0, 81, SPR_MENU_TUTORIAL, STR_SHOW_TUTORIAL_TIP },
{ WWT_DROPDOWN_BUTTON, 2, 82, 245, 88, 99, STR_MULTIPLAYER, STR_NONE }, { WWT_IMGBTN, 2, 0, 0, 0, 81, SPR_MENU_TOOLBOX, STR_GAME_TOOLS },
{ WIDGETS_END }, { WIDGETS_END },
}; };
@@ -94,8 +94,8 @@ void window_title_menu_open()
rct_window* window; rct_window* window;
window = window_create( window = window_create(
(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, uint16) - 328) / 2, RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_HEIGHT, uint16) - 142, 0, RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_HEIGHT, uint16) - 142,
328, 100, 0, 100,
&window_title_menu_events, &window_title_menu_events,
WC_TITLE_MENU, WC_TITLE_MENU,
WF_STICK_TO_BACK | WF_TRANSPARENT | WF_NO_BACKGROUND WF_STICK_TO_BACK | WF_TRANSPARENT | WF_NO_BACKGROUND
@@ -104,18 +104,29 @@ void window_title_menu_open()
window->enabled_widgets = ( window->enabled_widgets = (
(1 << WIDX_START_NEW_GAME) | (1 << WIDX_START_NEW_GAME) |
(1 << WIDX_CONTINUE_SAVED_GAME) | (1 << WIDX_CONTINUE_SAVED_GAME) |
(1 << WIDX_SHOW_TUTORIAL) | #ifndef DISABLE_NETWORK
(1 << WIDX_GAME_TOOLS) | (1 << WIDX_MULTIPLAYER) |
(1 << WIDX_MULTIPLAYER) #endif
// Disable tutorial
// (1 << WIDX_SHOW_TUTORIAL) |
(1 << WIDX_GAME_TOOLS)
); );
// Disable tutorial button int i = 0;
window->disabled_widgets = (1 << WIDX_SHOW_TUTORIAL); int x = 0;
for (rct_widget *widget = window->widgets; widget->type != WWT_LAST; widget++) {
if (widget_is_enabled(window, i)) {
widget->left = x;
widget->right = x + 81;
#if DISABLE_NETWORK x += 82;
// Disable multiplayer } else {
window->widgets[WIDX_MULTIPLAYER].type = WWT_EMPTY; widget->type = WWT_EMPTY;
#endif }
i++;
}
window->width = x;
window->x = (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, uint16) - window->width) / 2;
window_init_scroll_widgets(window); window_init_scroll_widgets(window);
} }
@@ -195,18 +206,6 @@ static void window_title_menu_cursor(rct_window *w, int widgetIndex, int x, int
static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi) static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi)
{ {
gfx_fill_rect(dpi, w->x, w->y, w->x + w->width - 1, w->y + 82 - 1, 0x2000000 | 51); gfx_fill_rect(dpi, w->x, w->y, w->x + w->width - 1, w->y + 82 - 1, 0x2000000 | 51);
rct_widget *multiplayerButtonWidget = &window_title_menu_widgets[WIDX_MULTIPLAYER];
if (multiplayerButtonWidget->type != WWT_EMPTY) {
gfx_fill_rect(
dpi,
w->x + multiplayerButtonWidget->left,
w->y + multiplayerButtonWidget->top,
w->x + multiplayerButtonWidget->right,
w->y + multiplayerButtonWidget->bottom,
0x2000000 | 51
);
}
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
} }