remove unused argument

src/create_engine.cpp

@@ -414,7 +414,7 @@ void create_engine::init_generated_level_data()
 {
 	DBG_MP << "initializing generated level data\n";
 
-	config data = generator_->create_scenario(std::vector<std::string>());
+	config data = generator_->create_scenario();
 
 	// Set the scenario to have placing of sides
 	// based on the terrain they prefer

src/editor/map/context_manager.cpp

@@ -653,8 +653,7 @@ void context_manager::generate_map_dialog()
 	if (dialog.get_retval() == gui2::twindow::OK) {
 		std::string map_string;
 		try {
-			map_string = dialog.get_selected_map_generator()
-				->create_map(std::vector<std::string>());
+			map_string = dialog.get_selected_map_generator()->create_map();
 		} catch (mapgen_exception& e) {
 			gui2::show_transient_message(gui_.video(), _("Map creation failed."), e.what());
 			return;

src/generators/cavegen.cpp

@@ -87,13 +87,13 @@ size_t cave_map_generator::translate_y(size_t y) const
 	return y;
 }
 
-std::string cave_map_generator::create_map(const std::vector<std::string>& args)
+std::string cave_map_generator::create_map()
 {
-	const config res = create_scenario(args);
+	const config res = create_scenario();
 	return res["data"];
 }
 
-config cave_map_generator::create_scenario(const std::vector<std::string>& /*args*/)
+config cave_map_generator::create_scenario()
 {
 	map_ = t_translation::t_map(width_ + 2 * gamemap::default_border,
 		t_translation::t_list(height_ + 2 * gamemap::default_border, wall_));

src/generators/cavegen.hpp

@@ -36,8 +36,8 @@ public:
 
 	std::string config_name() const;
 
-	std::string create_map(const std::vector<std::string>& args);
-	config create_scenario(const std::vector<std::string>& args);
+	std::string create_map();
+	config create_scenario();
 
 private:
 

src/generators/map_create.cpp

@@ -55,7 +55,7 @@ std::string random_generate_map(const std::string& parms, const config &cfg)
 	}
 
 	parameters.erase(parameters.begin());
-	return generator.get()->create_map(parameters);
+	return generator.get()->create_map();
 }
 
 config random_generate_scenario(const std::string& parms, const config &cfg)
@@ -71,5 +71,5 @@ config random_generate_scenario(const std::string& parms, const config &cfg)
 	}
 
 	parameters.erase(parameters.begin());
-	return generator->create_scenario(parameters);
+	return generator->create_scenario();
 }

src/generators/mapgen.cpp

@@ -38,10 +38,10 @@ static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)
 #define LOG_NG LOG_STREAM(info, log_engine)
 
-config map_generator::create_scenario(const std::vector<std::string>& args)
+config map_generator::create_scenario()
 {
 	config res;
-	res["map_data"] = create_map(args);
+	res["map_data"] = create_map();
 	return res;
 }
 

src/generators/mapgen.hpp

@@ -66,9 +66,9 @@ public:
 	 * Creates a new map and returns it.
 	 * args may contain arguments to the map generator.
 	 */
-	virtual std::string create_map(const std::vector<std::string>& args) = 0;
+	virtual std::string create_map() = 0;
 
-	virtual config create_scenario(const std::vector<std::string>& args);
+	virtual config create_scenario();
 };
 
 /** Generate the map. */

src/generators/mapgen_dialog.cpp

@@ -345,12 +345,12 @@ std::string default_map_generator::config_name() const
 	return std::string();
 }
 
-std::string default_map_generator::create_map(const std::vector<std::string>& args)
+std::string default_map_generator::create_map()
 {
-	return generate_map(args);
+	return generate_map();
 }
 
-std::string default_map_generator::generate_map(const std::vector<std::string>& /*args*/, std::map<map_location,std::string>* labels)
+std::string default_map_generator::generate_map(std::map<map_location,std::string>* labels)
 {
 	// Suppress labels?
 	if ( !show_labels_ )
@@ -416,7 +416,7 @@ std::string default_map_generator::generate_map(const std::vector<std::string>&
 	return map;
 }
 
-config default_map_generator::create_scenario(const std::vector<std::string>& args)
+config default_map_generator::create_scenario()
 {
 	DBG_NG << "creating scenario...\n";
 
@@ -428,7 +428,7 @@ config default_map_generator::create_scenario(const std::vector<std::string>& ar
 	DBG_NG << "generating map...\n";
 
 	try{
-		res["map_data"] = generate_map(args,&labels);
+		res["map_data"] = generate_map(&labels);
 	}
 	catch (mapgen_exception& exc){
 		res["map_data"] = "";

src/generators/mapgen_dialog.hpp

@@ -30,12 +30,12 @@ public:
 
 	std::string config_name() const;
 
-	std::string create_map(const std::vector<std::string>& args);
-	config create_scenario(const std::vector<std::string>& args);
+	std::string create_map();
+	config create_scenario();
 
 private:
 
-	std::string generate_map(const std::vector<std::string>& args, std::map<map_location,std::string>* labels=NULL);
+	std::string generate_map(std::map<map_location,std::string>* labels=NULL);
 
 	size_t default_width_, default_height_, width_, height_, island_size_, iterations_, hill_size_, max_lakes_, nvillages_, castle_size_, nplayers_;
 	bool link_castles_, show_labels_;

src/generators/yamg/ya_mapgen.cpp

@@ -334,7 +334,7 @@ std::string ya_mapgen::config_name() const {
  *** create_map
  Parameters and errors reporting are not defined yet, so this is a mere skeleton.
  */
-std::string ya_mapgen::create_map(const std::vector<std::string>& /*args*/) {
+std::string ya_mapgen::create_map() {
 
 	yamg_params *par = new yamg_params();
 
@@ -348,7 +348,7 @@ std::string ya_mapgen::create_map(const std::vector<std::string>& /*args*/) {
 //		printf(stderr,"Errors in parameters. Execution aborted.");
 //		return NULL;
 //	}
-	n = create_map(); // do the job
+	n = do_create_map(); // do the job
 	n = (par->height * par->width * (YAMG_HEXLONG + 2)) + 100; // allocate buffer for result
 	char* buf = new char[n];
 
@@ -416,7 +416,7 @@ unsigned int ya_mapgen::set_up(yamg_params *pars) {
 
  <- returns OK or error code.
  */
-int ya_mapgen::create_map() {
+int ya_mapgen::do_create_map() {
 	unsigned int err;
 
 	switch (status_) {

src/generators/yamg/ya_mapgen.hpp

@@ -88,13 +88,13 @@ public:
 	void user_config(display& disp);
 	std::string name() const; // {return "yamg";};
 	std::string config_name() const; // {return "generator";};
-	std::string create_map(const std::vector<std::string>& args);
+	std::string create_map();
 #endif
 
 //----------------- Methods -------------
 
     unsigned int set_up(yamg_params *); ///< uses parameter list object to configure
-    int create_map();           ///< do the job, return OK if everything is OK
+    int do_create_map();           ///< do the job, return OK if everything is OK
     int get_map(char *buf);     ///< write the map to a buffer
     void reset_map();           ///< reset the generator to new use
 

src/multiplayer.cpp

@@ -838,7 +838,7 @@ void start_local_game_commandline(game_display& disp, const config& game_config,
 		DBG_MP << "generating random map" << std::endl;
 		util::scoped_ptr<map_generator> generator(NULL);
 		generator.assign(create_map_generator(level["map_generation"], level.child("generator")));
-		state.set_scenario(generator->create_scenario(std::vector<std::string>()));
+		state.set_scenario(generator->create_scenario());
 
 		// Set the scenario to have placing of sides
 		// based on the terrain they prefer