upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 07:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust how no game history results are handled

Browse Source
This commit is contained in:
Pentarctagon 2023-04-16 08:53:53 -05:00 committed by Pentarctagon
parent 1b90c770e6
commit 58fb4f1e87
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/dialogs/multiplayer/match_history.cpp
View File

@ -82,7 +82,7 @@ bool mp_match_history::update_display()
const config history = request_history(offset_);
// request failed, nothing to do
if(history.child_count("game_history_result") == 0) {
if(history.child_count("game_history_results") == 0) {
return false;
}
@ -93,7 +93,7 @@ bool mp_match_history::update_display()
connect_signal_notify_modified(*tab_bar, std::bind(&mp_match_history::tab_switch_callback, this));
int i = 0;
for(const config& game : history.child_range("game_history_result")) {
for(const config& game : history.mandatory_child("game_history_results").child_range("game_history_result")) {
widget_data row;
grid& history_grid = history_box->add_row(row);
@ -183,17 +183,17 @@ const config mp_match_history::request_history(int offset)
// lobby responses are not received while this method is running, and are handled in the lobby after it completes
// history results are never received in the lobby
if(connection_.receive_data(response)) {
if(response.child_count("game_history_result") == 0) {
if(response.child_count("game_history_results") == 0) {
DBG_NW << "Received non-history data: " << response.debug();
if(!response["error"].str().empty()) {
ERR_NW << "Received error from server: " << response["error"].str();
gui2::show_error_message(_("The server responded with an error:")+response["error"].str());
return {};
} else if(!response["no_data"].str().empty()) {
DBG_NW << "Player has no game history data.";
gui2::show_error_message(_("No game history found."));
return {};
}
} else if(response.mandatory_child("game_history_results").child_count("game_history_result") == 0) {
DBG_NW << "Player has no game history data.";
gui2::show_error_message(_("No game history found."));
return {};
} else {
DBG_NW << "Received history data: " << response.debug();
return response;

8
src/server/common/resultsets/game_history.cpp
View File

@ -53,15 +53,11 @@ std::unique_ptr<simple_wml::document> game_history::to_doc()
{
auto doc = std::make_unique<simple_wml::document>();
if(results.size() == 0)
{
doc->set_attr_dup("no_data", "yes");
return doc;
}
simple_wml::node& results_wml = doc->root().add_child("game_history_results");
for(const auto& result : results)
{
simple_wml::node& ghr = doc->root().add_child("game_history_result");
simple_wml::node& ghr = results_wml.add_child("game_history_result");
ghr.set_attr_dup("game_name", result.game_name.c_str());
ghr.set_attr_dup("game_start", result.game_start.c_str());
ghr.set_attr_dup("scenario_name", result.scenario_name.c_str());