0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use expand_scenario function in create_engine.cpp

Browse source
This commit is contained in:
gfgtdf 2014-07-31 03:30:54 +02:00 • committed by gfgtdf
parent 534dae2ec2
commit 84ce463fd7
2 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/create_engine.cpp
View file

@ -13,6 +13,7 @@
*/
#include "create_engine.hpp"
#include "config_assign.hpp"
#include "game_config_manager.hpp"
#include "game_launcher.hpp"
#include "game_display.hpp"
@ -428,9 +429,7 @@ void create_engine::init_generated_level_data()
void create_engine::prepare_for_new_level()
{
DBG_MP << "preparing mp_game_settings for new level\n";
state_.set_scenario(current_level().data());
state_.mp_settings().hash = current_level().data().hash();
state_.expand_scenario();
}
void create_engine::prepare_for_era_and_mods()
@ -452,13 +451,9 @@ void create_engine::prepare_for_scenario()
state_.classification().scenario_define =
current_level().data()["define"].str();
resources::config_manager->
load_game_config_for_game(state_.classification());
current_level().set_data(
resources::config_manager->game_config().find_child(
lexical_cast<std::string> (game_classification::MULTIPLAYER),
"id", current_level().data()["id"]));
state_.set_carryover_sides_start(
config_of("next_scenario", current_level().data()["id"])
);
}
void create_engine::prepare_for_campaign(const std::string& difficulty)
@ -481,14 +476,9 @@ void create_engine::prepare_for_campaign(const std::string& difficulty)
state_.classification().campaign_xtra_defines =
utils::split(current_level().data()["extra_defines"]);
resources::config_manager->
load_game_config_for_game(state_.classification());
// FIXME: Check whether find_child found something and give a meaningful error message if not.
current_level().set_data(
resources::config_manager->game_config().find_child(
lexical_cast<std::string> (game_classification::MULTIPLAYER),
"id", current_level().data()["first_scenario"]));
state_.set_carryover_sides_start(
config_of("next_scenario", current_level().data()["first_scenario"])
);
}
/**

18
src/singleplayer.cpp
View file

@ -92,23 +92,17 @@ bool enter_create_mode(game_display& disp, const config& game_config,
create_eng.prepare_for_campaign(selected_difficulty);
if (jump_to_campaign.scenario_id_.empty())
{
state.set_carryover_sides_start(
config_of("random_mode", random_mode)
("next_scenario", create_eng.current_level().data()["id"].str())
);
}
else
if (!jump_to_campaign.scenario_id_.empty())
{
//FIXME: we don't set "random_mode" if this if is false
//currently "random_mode" inside [carryoer_sides_start] has no effect
//so it's no problem but a possibe plan is to move "random_mode" from
//game_glassification to carryoves/snapshow in order to be able to change
//it during the game
state.set_carryover_sides_start(
config_of("random_mode", random_mode)
("next_scenario", jump_to_campaign.scenario_id_)
);
create_eng.current_level().set_data(
resources::config_manager->game_config().find_child(
lexical_cast<std::string> (game_classification::MULTIPLAYER),
"id", jump_to_campaign.scenario_id_));
}
create_eng.prepare_for_new_level();