Merge branch 'master' of git://github.com/wesnoth/wesnoth

src/ai/testing/stage_sf_with_rca.hpp

@@ -41,38 +41,6 @@ namespace testing_ai_default {
 class turn_state;
 class decision;
 
-class strategy_formulation_with_rca: public virtual stage, public virtual rca_context {
-public:
-	strategy_formulation_with_rca(ai_context &context, const config &cfg);
-
-	~strategy_formulation_with_rca();
-
-	bool do_play_stage();
-
-	void on_create();
-
-	config to_config() const;
-
-	rca_context& get_rca_context();
-
-	void simulate_states_ahead();
-
-	void set_optimal_strategy();
-
-	const turn_state simulate_state(const int decision_no_, const turn_state &state);
-
-	void switch_side();
-
-	void init_side();
-
-private:
-	std::queue<turn_state> states_;
-
-	std::vector<bool> enemy_this_turn_;	// Store if is enemy for this turn. Use in the set optimal strategy function.
-
-	boost::shared_ptr<candidate_action_evaluation_loop> rca_;
-};
-
 class decision
 {
 	friend std::ostream& operator<<(std::ostream&, const decision&);
@@ -133,6 +101,38 @@ class turn_state
 	decision decision_;
 };
 
+class strategy_formulation_with_rca: public virtual stage, public virtual rca_context {
+public:
+	strategy_formulation_with_rca(ai_context &context, const config &cfg);
+
+	~strategy_formulation_with_rca();
+
+	bool do_play_stage();
+
+	void on_create();
+
+	config to_config() const;
+
+	rca_context& get_rca_context();
+
+	void simulate_states_ahead();
+
+	void set_optimal_strategy();
+
+	const turn_state simulate_state(const int decision_no_, const turn_state &state);
+
+	void switch_side();
+
+	void init_side();
+
+private:
+	std::queue<turn_state> states_;
+
+	std::vector<bool> enemy_this_turn_;	// Store if is enemy for this turn. Use in the set optimal strategy function.
+
+	boost::shared_ptr<candidate_action_evaluation_loop> rca_;
+};
+
 } // of namespace testing_ai_default
 
 } // of namespace ai

src/singleplayer.cpp

@@ -81,6 +81,7 @@ bool enter_create_mode(game_display& disp, const config& game_config,
 			// didn't find any campaign with that id
 			if (not_found)
 			{
+				//TODO: use ERR_NG or similar
 				std::cerr<<"No such campaign id to jump to: ["<<jump_to_campaign.campaign_id_<<"]\n";
 				return false;
 			}
@@ -107,6 +108,12 @@ bool enter_create_mode(game_display& disp, const config& game_config,
 		create_eng.prepare_for_new_level();
 
 		create_eng.get_parameters();
+		if(!state.valid())
+		{
+			//TODO: use ERR_NG or similar
+			std::cerr << "Cannot load scenario with id=" << state.get_scenario_id() << "\n";
+			return false;
+		}
 
 		configure_canceled = !enter_configure_mode(disp, resources::config_manager->game_config(),
 				state, jump_to_campaign, local_players_only);