MP Staging: some progress with getting the network processing working…

…, as well as using the dialog for non-hosts

data/gui/window/mp_staging.cfg

@@ -430,7 +430,6 @@
 					id = "player_list"
 					definition = "default"
 
-					vertical_scrollbar_mode = "always"
 					horizontal_scrollbar_mode = "never"
 
 					[list_definition]
@@ -493,7 +492,7 @@
 
 							[button]
 								id = "ok"
-								definition = "default"
+								definition = "large"
 								label = _ "I’m Ready"
 							[/button]
 						[/column]
@@ -504,7 +503,7 @@
 
 							[button]
 								id = "cancel"
-								definition = "default"
+								definition = "large"
 								label = _ "Cancel"
 							[/button]
 						[/column]
@@ -616,7 +615,23 @@
 
 									[/row]
 
-									{GUI_HORIZONTAL_SPACER_LINE}
+									[row]
+										grow_factor = 0
+
+										[column]
+											grow_factor = 1
+											horizontal_grow = "true"
+											border = "all"
+											border_size = 5
+
+											[label]
+												id = "status_label"
+												definition = "default_small"
+												label = _ "Waiting for players to join..."
+											[/label]
+										[/column]
+
+									[/row]
 
 									[row]
 										grow_factor = 0

src/game_initialization/multiplayer.cpp

@@ -406,30 +406,182 @@ static std::unique_ptr<twesnothd_connection> open_connection(CVideo& video, cons
 // creating the dialogs, then, according to the dialog result, of calling other
 // of those screen functions.
 
+static config& get_scenario(config& c)
+{
+	if(config& scenario = c.child("scenario"))
+		return scenario;
+	else if(config& snapshot = c.child("snapshot"))
+		return snapshot;
+	else
+		return c;
+}
+
 static void enter_wait_mode(CVideo& video, const config& game_config, saved_game& state, twesnothd_connection* wesnothd_connection,
-	bool observe, int current_turn = 0)
+	lobby_info& li, bool observe, int current_turn = 0)
 {
 	DBG_MP << "entering wait mode" << std::endl;
 
 	mp::ui::result res;
 
 	gamelist.clear();
 	statistics::fresh_stats();
-	mp_campaign_info campaign_info(*wesnothd_connection);
-	campaign_info.is_host = false;
+	std::unique_ptr<mp_campaign_info> campaign_info;
+	campaign_info.reset(new mp_campaign_info(*wesnothd_connection));
+	campaign_info->is_host = false;
 	if(preferences::skip_mp_replay() || preferences::blindfold_replay()) {
-		campaign_info.skip_replay_until_turn = current_turn;
-		campaign_info.skip_replay_blindfolded = preferences::blindfold_replay();
+		campaign_info->skip_replay_until_turn = current_turn;
+		campaign_info->skip_replay_blindfolded = preferences::blindfold_replay();
 	}
 
 	{
+		if(preferences::new_lobby()) {
+			bool download_res = true;
+
+			assert(wesnothd_connection);
+			config level;
+			DBG_MP << "download_level_data()\n";
+
+			if(!true) {
+				// Ask for the next scenario data.
+				wesnothd_connection->send_data(config("load_next_scenario"));
+			}
+
+			bool has_scenario_and_controllers = false;
+			while(!has_scenario_and_controllers) {
+				config revc;
+				bool data_res = gui2::tnetwork_transmission::wesnothd_receive_dialog(
+					video, "download level data", revc, *wesnothd_connection);
+
+				if(!data_res) {
+					DBG_MP << "download_level_data bad results\n";
+					download_res = false;
+				}
+
+				mp::check_response(data_res, revc);
+
+				if(revc.child("leave_game")) {
+					download_res = false;
+				} else if(config& next_scenario = revc.child("next_scenario")) {
+					level.swap(next_scenario);
+				} else if(revc.has_attribute("version")) {
+					level.swap(revc);
+					has_scenario_and_controllers = true;
+				} else if(config& controllers = revc.child("controllers")) {
+					int index = 0;
+					for(const config& controller : controllers.child_range("controller")) {
+						if(config& side = get_scenario(level).child("side", index)) {
+							side["is_local"] = controller["is_local"];
+						}
+						++index;
+					}
+					has_scenario_and_controllers = true;
+				}
+
+			}
+
+			std::cerr << "download_level_data() success.\n";
+
+			if(!download_res) {
+				DBG_MP << "mp wait: could not download level data, quitting...";
+				//set_result(QUIT);
+				return;
+			} else if(level["started"].to_bool()) {
+				//set_result(PLAY);
+				return;
+			}
+
+			if(true) {
+				state = saved_game();
+				state.classification() = game_classification(level);
+
+				if(state.classification().campaign_type != game_classification::CAMPAIGN_TYPE::MULTIPLAYER) {
+					//ERR_MP << "Mp wait recieved a game that is not a multiplayer game\n";
+				}
+				// Make sure that we have the same config as host, if possible.
+				game_config_manager::get()->load_game_config_for_game(state.classification());
+			}
+
+			// Add the map name to the title.
+			//append_to_title(": " + get_scenario(level)["name"].t_str());
+
+			game_config::add_color_info(get_scenario(level));
+			if(!observe) {
+				//search for an appropriate vacant slot. If a description is set
+				//(i.e. we're loading from a saved game), then prefer to get the side
+				//with the same description as our login. Otherwise just choose the first
+				//available side.
+				const config *side_choice = nullptr;
+				//int side_num = -1, nb_sides = 0;
+				for(const config &sd : get_scenario(level).child_range("side")) {
+					//std::cerr << "*** side " << nb_sides << "***\n" << sd.debug() << "***\n";
+
+					if(sd["controller"] == "reserved" && sd["current_player"] == preferences::login()) {
+						side_choice = &sd;
+						//side_num = nb_sides;
+						break;
+					}
+
+					if(sd["controller"] == "human" && sd["player_id"].empty()) {
+						if(!side_choice) { // found the first empty side
+							side_choice = &sd;
+							//side_num = nb_sides;
+						}
+
+						if(sd["current_player"] == preferences::login()) {
+							side_choice = &sd;
+							//side_num = nb_sides;
+							break;  // found the preferred one
+						}
+					}
+
+					if(sd["player_id"] == preferences::login()) {
+						//We already own a side in this game.
+						//generate_menu();
+						return;
+					}
+					//++nb_sides;
+				}
+
+				if(!side_choice) {
+					DBG_MP << "could not find a side, all " << get_scenario(level).child_count("side") << " sides were unsuitable\n";
+					//set_result(QUIT);
+					return;
+				}
+			}
+
+			mp::level_to_gamestate(level, state);
+
+			campaign_info.reset(new mp_campaign_info(*wesnothd_connection));
+
+			//campaign_info->connected_players.insert(li.users().begin(), li.users().end());
+
+			ng::connect_engine_ptr connect_engine(new ng::connect_engine(state, true, campaign_info.get()));
+
+			connect_engine->receive_from_server(level);
+
+			gui2::tmp_staging dlg(*connect_engine, li, wesnothd_connection);
+			dlg.show(video);
+
+			if(dlg.get_retval() == gui2::twindow::OK) {
+				campaign_controller controller(video, state, game_config, game_config_manager::get()->terrain_types());
+				controller.set_mp_info(campaign_info.get());
+				controller.play_game();
+			}
+
+			//if(wesnothd_connection) {
+			//	wesnothd_connection->send_data(config("leave_game"));
+			//}
+
+			return;
+		}
+
 		mp::wait ui(video, wesnothd_connection, game_config, state, gamechat, gamelist);
 
 		ui.join_game(observe);
 
 		run_lobby_loop(video, ui);
 		res = ui.get_result();
-		campaign_info.connected_players.insert(ui.user_list().begin(), ui.user_list().end());
+		campaign_info->connected_players.insert(ui.user_list().begin(), ui.user_list().end());
 
 		if (res == mp::ui::PLAY) {
 			ui.start_game();
@@ -441,7 +593,7 @@ static void enter_wait_mode(CVideo& video, const config& game_config, saved_game
 	switch (res) {
 	case mp::ui::PLAY: {
 		campaign_controller controller(video, state, game_config, game_config_manager::get()->terrain_types());
-		controller.set_mp_info(&campaign_info);
+		controller.set_mp_info(campaign_info.get());
 		controller.play_game();
 		break;
 	}
@@ -476,21 +628,22 @@ static bool enter_connect_mode(CVideo& video, const config& game_config,
 	{
 		ng::connect_engine_ptr connect_engine(new ng::connect_engine(state, true, campaign_info.get()));
 
-        if(preferences::new_lobby()) {
-            gui2::tmp_staging dlg(game_config, *connect_engine, li);
-            dlg.show(video);
+		if(preferences::new_lobby()) {
+			gui2::tmp_staging dlg(*connect_engine, li, wesnothd_connection);
+			dlg.show(video);
 
-            if(dlg.get_retval() == gui2::twindow::OK) {
-                campaign_controller controller(video, state, game_config, game_config_manager::get()->terrain_types());
-                controller.set_mp_info(campaign_info.get());
-                controller.play_game();
-                if(wesnothd_connection) {
-                    wesnothd_connection->send_data(config("leave_game"));
-                }
-            }
+			if(dlg.get_retval() == gui2::twindow::OK) {
+				campaign_controller controller(video, state, game_config, game_config_manager::get()->terrain_types());
+				controller.set_mp_info(campaign_info.get());
+				controller.play_game();
+			}
 
-            return true;
-        }
+			if(wesnothd_connection) {
+				wesnothd_connection->send_data(config("leave_game"));
+			}
+
+			return true;
+		}
 
 		mp::connect ui(video, wesnothd_connection, state.mp_settings().name, game_config, gamechat, gamelist,
 			*connect_engine);
@@ -714,7 +867,7 @@ static void enter_lobby_mode(CVideo& video, const config& game_config,
 		case mp::ui::JOIN:
 		case mp::ui::OBSERVE:
 			try {
-				enter_wait_mode(video, game_config, state, wesnothd_connection, res == mp::ui::OBSERVE, current_turn);
+				enter_wait_mode(video, game_config, state, wesnothd_connection, li, res == mp::ui::OBSERVE, current_turn);
 			} catch(config::error& error) {
 				if(!error.message.empty()) {
 					gui2::show_error_message(video, error.message);