From 22bdc6227cc08e67cb1767f44594566fd56de3d0 Mon Sep 17 00:00:00 2001 From: Japa Date: Sun, 24 Dec 2017 10:50:30 +0530 Subject: [PATCH 1/3] add more world mode options to world info --- library/RemoteTools.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp index 77374ea0c..8b62d7ab7 100644 --- a/library/RemoteTools.cpp +++ b/library/RemoteTools.cpp @@ -395,15 +395,21 @@ static command_result GetWorldInfo(color_ostream &stream, { case game_type::DWARF_MAIN: case game_type::DWARF_RECLAIM: - out->set_mode(GetWorldInfoOut::MODE_DWARF); + case game_type::DWARF_ARENA: + case game_type::DWARF_TUTORIAL: + case game_type::DWARF_UNRETIRE: + out->set_mode(GetWorldInfoOut::MODE_DWARF); out->set_civ_id(ui->civ_id); out->set_site_id(ui->site_id); out->set_group_id(ui->group_id); out->set_race_id(ui->race_id); break; - case game_type::ADVENTURE_MAIN: - out->set_mode(GetWorldInfoOut::MODE_ADVENTURE); + case game_type::ADVENTURE_MAIN: + case game_type::ADVENTURE_ARENA: + case game_type::ADVENTURE_DUNGEON: + case game_type::ADVENTURE_WORLD_DEBUG: + out->set_mode(GetWorldInfoOut::MODE_ADVENTURE); if (auto unit = vector_get(world->units.active, 0)) out->set_player_unit_id(unit->id); From 73c6209f875c4032c7f0cf6a5c67f607bce393a1 Mon Sep 17 00:00:00 2001 From: Japa Date: Sun, 24 Dec 2017 17:22:50 +0530 Subject: [PATCH 2/3] Remove extra These don't actually act the same. --- library/RemoteTools.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp index 8b62d7ab7..90f4104ca 100644 --- a/library/RemoteTools.cpp +++ b/library/RemoteTools.cpp @@ -395,8 +395,6 @@ static command_result GetWorldInfo(color_ostream &stream, { case game_type::DWARF_MAIN: case game_type::DWARF_RECLAIM: - case game_type::DWARF_ARENA: - case game_type::DWARF_TUTORIAL: case game_type::DWARF_UNRETIRE: out->set_mode(GetWorldInfoOut::MODE_DWARF); out->set_civ_id(ui->civ_id); @@ -407,8 +405,6 @@ static command_result GetWorldInfo(color_ostream &stream, case game_type::ADVENTURE_MAIN: case game_type::ADVENTURE_ARENA: - case game_type::ADVENTURE_DUNGEON: - case game_type::ADVENTURE_WORLD_DEBUG: out->set_mode(GetWorldInfoOut::MODE_ADVENTURE); if (auto unit = vector_get(world->units.active, 0)) From 692bce8507614028e8d854f2cb6a3791df2f61ed Mon Sep 17 00:00:00 2001 From: Lethosor Date: Sun, 24 Dec 2017 13:50:54 -0500 Subject: [PATCH 3/3] Tabs to spaces --- library/RemoteTools.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp index 90f4104ca..e29220fb7 100644 --- a/library/RemoteTools.cpp +++ b/library/RemoteTools.cpp @@ -395,17 +395,17 @@ static command_result GetWorldInfo(color_ostream &stream, { case game_type::DWARF_MAIN: case game_type::DWARF_RECLAIM: - case game_type::DWARF_UNRETIRE: - out->set_mode(GetWorldInfoOut::MODE_DWARF); + case game_type::DWARF_UNRETIRE: + out->set_mode(GetWorldInfoOut::MODE_DWARF); out->set_civ_id(ui->civ_id); out->set_site_id(ui->site_id); out->set_group_id(ui->group_id); out->set_race_id(ui->race_id); break; - case game_type::ADVENTURE_MAIN: - case game_type::ADVENTURE_ARENA: - out->set_mode(GetWorldInfoOut::MODE_ADVENTURE); + case game_type::ADVENTURE_MAIN: + case game_type::ADVENTURE_ARENA: + out->set_mode(GetWorldInfoOut::MODE_ADVENTURE); if (auto unit = vector_get(world->units.active, 0)) out->set_player_unit_id(unit->id);