Skip to content

Commit

Permalink
remove mp_game_settings::scenario_data
Browse files Browse the repository at this point in the history
this is not used anore since we use saved_game::starting_pos now
  • Loading branch information
gfgtdf committed Jun 15, 2014
1 parent d9c6d18 commit 8362414
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
9 changes: 2 additions & 7 deletions src/mp_game_settings.cpp
Expand Up @@ -51,8 +51,7 @@ mp_game_settings::mp_game_settings() :
share_view(false),
share_maps(false),
saved_game(false),
options(),
scenario_data()
options()

{ reset(); }

Expand Down Expand Up @@ -86,8 +85,7 @@ mp_game_settings::mp_game_settings(const config& cfg) :
share_view(false),
share_maps(false),
saved_game(false),
options(),
scenario_data()
options()
{
set_from_config(cfg);
}
Expand Down Expand Up @@ -123,7 +121,6 @@ mp_game_settings::mp_game_settings(const mp_game_settings& settings)
, share_maps(settings.share_maps)
, saved_game(settings.saved_game)
, options(settings.options)
, scenario_data(settings.scenario_data)
{
}

Expand Down Expand Up @@ -184,8 +181,6 @@ void mp_game_settings::reset()
mp_countdown=false;
use_map_settings = random_start_time = fog_game = shroud_game = allow_observers = shuffle_sides = share_view = share_maps = false;
options.clear();

scenario_data.clear();
}

config mp_game_settings::to_config() const
Expand Down
6 changes: 0 additions & 6 deletions src/mp_game_settings.hpp
Expand Up @@ -65,12 +65,6 @@ struct mp_game_settings : public savegame::savegame_config
bool saved_game;

config options;

/**
* If the game is to be randomly generated, the map generator
* will create the scenario data in this variable
*/
config scenario_data;
};

#endif

0 comments on commit 8362414

Please sign in to comment.