mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow starting server with new scenario

This commit is contained in:
Chad Anderson 2016-02-13 11:31:37 +00:00 committed by IntelOrca
parent 934bf28cc1
commit 4658e80deb
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/windows/server_start.c
View File

@ -25,6 +25,7 @@
#include "../localisation/localisation.h" #include "../localisation/localisation.h"
#include "../network/network.h" #include "../network/network.h"
#include "../sprites.h" #include "../sprites.h"
#include "../title.h"
#include "../util/util.h" #include "../util/util.h"
#include "error.h" #include "error.h"
@ -43,7 +44,8 @@ enum {
WIDX_MAXPLAYERS_INCREASE, WIDX_MAXPLAYERS_INCREASE,
WIDX_MAXPLAYERS_DECREASE, WIDX_MAXPLAYERS_DECREASE,
WIDX_ADVERTISE_CHECKBOX, WIDX_ADVERTISE_CHECKBOX,
WIDX_START_SERVER WIDX_START_SERVER,
WIDX_LOAD_SERVER
}; };
#define WW 300 #define WW 300
@ -60,7 +62,8 @@ static rct_widget window_server_start_widgets[] = {
{ WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 68, 72, STR_NUMERIC_UP, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 68, 72, STR_NUMERIC_UP, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 72, 76, STR_NUMERIC_DOWN, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 72, 76, STR_NUMERIC_DOWN, STR_NONE },
{ WWT_CHECKBOX, 1, 6, WW-8, 85, 91, STR_ADVERTISE, STR_NONE }, // advertise checkbox { WWT_CHECKBOX, 1, 6, WW-8, 85, 91, STR_ADVERTISE, STR_NONE }, // advertise checkbox
{ WWT_DROPDOWN_BUTTON, 1, 6, 106, WH-6-11, WH-6, STR_START_SERVER, STR_NONE }, // start server button { WWT_DROPDOWN_BUTTON, 1, 6, 106, WH-6-11, WH-6, STR_NEW_GAME, STR_NONE }, // start server button
{ WWT_DROPDOWN_BUTTON, 1, 112, 212, WH-6-11, WH-6, STR_LOAD_GAME, STR_NONE },
{ WIDGETS_END }, { WIDGETS_END },
}; };
@ -123,7 +126,8 @@ void window_server_start_open()
(1 << WIDX_MAXPLAYERS_INCREASE) | (1 << WIDX_MAXPLAYERS_INCREASE) |
(1 << WIDX_MAXPLAYERS_DECREASE) | (1 << WIDX_MAXPLAYERS_DECREASE) |
(1 << WIDX_ADVERTISE_CHECKBOX) | (1 << WIDX_ADVERTISE_CHECKBOX) |
(1 << WIDX_START_SERVER) (1 << WIDX_START_SERVER) |
(1 << WIDX_LOAD_SERVER)
); );
window_init_scroll_widgets(window); window_init_scroll_widgets(window);
window->no_list_items = 0; window->no_list_items = 0;
@ -146,6 +150,16 @@ static void window_server_start_close(rct_window *w)
} }
static void window_server_start_scenarioselect_callback(const utf8 *path)
{
network_set_password(_password);
if (scenario_load_and_play_from_path(path)) {
network_begin_server(gConfigNetwork.default_port);
} else {
title_load();
}
}
static void window_server_start_mouseup(rct_window *w, int widgetIndex) static void window_server_start_mouseup(rct_window *w, int widgetIndex)
{ {
switch (widgetIndex) { switch (widgetIndex) {
@ -181,6 +195,9 @@ static void window_server_start_mouseup(rct_window *w, int widgetIndex)
window_invalidate(w); window_invalidate(w);
break; break;
case WIDX_START_SERVER: case WIDX_START_SERVER:
window_scenarioselect_open(window_server_start_scenarioselect_callback);
break;
case WIDX_LOAD_SERVER:
network_set_password(_password); network_set_password(_password);
window_loadsave_open(LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME | LOADSAVETYPE_NETWORK, NULL); window_loadsave_open(LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME | LOADSAVETYPE_NETWORK, NULL);
break; break;