diff options
| author | Alexander Gavrilov | 2012-06-16 14:42:56 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-06-16 14:42:56 +0400 |
| commit | db91850464a98e785ff53cfdc5df46b10229cfdb (patch) | |
| tree | 4fb35eee9d316bc0dea2bcd305925539734add5a /library/RemoteTools.cpp | |
| parent | dc5bef2cb84cceb30179df750d986eecdef8b474 (diff) | |
| download | dfhack-db91850464a98e785ff53cfdc5df46b10229cfdb.tar.gz dfhack-db91850464a98e785ff53cfdc5df46b10229cfdb.tar.bz2 dfhack-db91850464a98e785ff53cfdc5df46b10229cfdb.tar.xz | |
Sync to the change in gamemode/gametype globals.
Diffstat (limited to 'library/RemoteTools.cpp')
| -rw-r--r-- | library/RemoteTools.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp index 689c783a..95c495e9 100644 --- a/library/RemoteTools.cpp +++ b/library/RemoteTools.cpp @@ -379,19 +379,19 @@ static command_result GetWorldInfo(color_ostream &stream, if (!ui || !world || !Core::getInstance().isWorldLoaded()) return CR_NOT_FOUND; - t_gamemodes mode; - if (!Core::getInstance().getWorld()->ReadGameMode(mode)) - mode.g_type = GAMETYPE_DWARF_MAIN; + df::game_type gt = game_type::DWARF_MAIN; + if (df::global::gametype) + gt = *df::global::gametype; out->set_save_dir(world->cur_savegame.save_dir); if (world->world_data->name.has_name) describeName(out->mutable_world_name(), &world->world_data->name); - switch (mode.g_type) + switch (gt) { - case GAMETYPE_DWARF_MAIN: - case GAMETYPE_DWARF_RECLAIM: + case game_type::DWARF_MAIN: + case game_type::DWARF_RECLAIM: out->set_mode(GetWorldInfoOut::MODE_DWARF); out->set_civ_id(ui->civ_id); out->set_site_id(ui->site_id); @@ -399,7 +399,7 @@ static command_result GetWorldInfo(color_ostream &stream, out->set_race_id(ui->race_id); break; - case GAMETYPE_ADVENTURE_MAIN: + case game_type::ADVENTURE_MAIN: out->set_mode(GetWorldInfoOut::MODE_ADVENTURE); if (auto unit = vector_get(world->units.active, 0)) @@ -423,7 +423,7 @@ static command_result GetWorldInfo(color_ostream &stream, } break; - case GAMETYPE_VIEW_LEGENDS: + case game_type::VIEW_LEGENDS: out->set_mode(GetWorldInfoOut::MODE_LEGENDS); break; |
