Merge lp:~widelands-dev/widelands/remove-compatibility-wares into lp:widelands

[Hans Joachim Desserud]

Remove the compatibility-sections I found in the conf-files.

Also, I've removed what I could find on the code side responsible for reading/using these. I haven't done any thorough checks after these changes, but it compiles ;)

As before, I've included a couple of FIXMEs for specific issues.

[SirVer (sirver)]

Looked over the FIXMEs and the merge request in general. LGTM. Some comments on the FIXMEs

The first was the problem that name was a plain old c string (i.e. a pointer to an array of characters). Constructing a c++ std::string out of it gives you access to more utility methods. Generally speaking, const char* should not show up in our code - they are pretty legacy. I refactored the area around that code to use std::string, instead of const char *.

The second FIXME was a dirty hack that would fail a workers program if it was currently running a program that was removed from the engine. It did this to check for program_name=fail in the conf file, if this was found, a function was queued that would be executed as soon as loading was done and that would send the worker a fail signal. The worker would then go to its 'default action' which is usually running to a warehouse. This code is no longer necessary and it made a bunch of other methods unnecessary too. I removed them.

If you think the changes are fine, feel free to merge.

review: Approve

[Hans Joachim Desserud (hjd)]

I'm not expert on c++, but it looks ok to me at least.

Btw, I noticed Map_Object::Loader::load_finish() wasn't removed even though it is now empty. After grepping I saw that plenty of other classes had methods with the same signature. Is this part of an interface which some other part of the code expects to be in place for these classes?

[SirVer (sirver)]

load_finish() seems to be still needed - some derived classes override it.

=== modified file 'src/economy/ware_instance.cc'
--- src/economy/ware_instance.cc	2014-02-22 18:04:02 +0000
+++ src/economy/ware_instance.cc	2014-03-13 21:39:01 +0000
@@ -636,32 +636,13 @@
 		if (!tribe)
 			throw wexception("unknown tribe '%s'", tribename.c_str());
 
-		bool kill = false;
 		Ware_Index wareindex = tribe->ware_index(warename);
-		if (!wareindex) {
-			// Old savegame, using a ware that no longer exists
-			// We need to do the loading anyway to ensure that the
-			// correct number of bytes is read, but we will mark
-			// the object for immediate removal.
-			log("WARNING: Tribe %s has no ware %s\n", tribename.c_str(), warename.c_str());
-			wareindex = Ware_Index::First();
-			kill = true;
-		}
 		const WareDescr * descr = tribe->get_ware_descr(wareindex);
 
 		std::unique_ptr<Loader> loader(new Loader);
 		loader->init(egbase, mol, *new WareInstance(wareindex, descr));
 		loader->load(fr);
 
-		if (kill) {
-			if (upcast(Game, game, &egbase))
-				loader->add_finish
-					(boost::bind
-					 (&Map_Object::schedule_destroy,
-					  loader->get_object(),
-					  boost::ref(*game)));
-		}
-
 		return loader.release();
 	} catch (const std::exception & e) {
 		throw wexception("WareInstance: %s", e.what());

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2014-03-09 18:29:48 +0000
+++ src/logic/immovable.cc	2014-03-13 21:39:01 +0000
@@ -742,47 +742,29 @@
 		uint8_t const version = fr.Unsigned8();
 		if (1 <= version and version <= IMMOVABLE_SAVEGAME_VERSION) {
 
-			char const * const owner = fr.CString ();
-			char const * const name  = fr.CString ();
+			const std::string owner_name = fr.CString();
+			const std::string name = fr.CString();
 			Immovable * imm = nullptr;
 
-			if (strcmp(owner, "world")) { //  It is a tribe immovable.
-				egbase.manually_load_tribe(owner);
-
-				if (Tribe_Descr const * const tribe = egbase.get_tribe(owner)) {
-					std::string effective_name = name;
-					const std::vector<std::string> & compat =
-						tribe->compatibility_immovable(name);
-
-					if (compat.size() >= 1) {
-						if (compat[0] == "replace") {
-							if (compat.size() != 2)
-								throw game_data_error
-									("incomplete compatibility_immovable replace for %s",
-									 name);
-
-							effective_name = compat[1];
-						} else
-							throw game_data_error
-								("bad compatibility_immovable code %s for %s",
-								 compat[0].c_str(), name);
-					}
-
-					int32_t const idx = tribe->get_immovable_index(effective_name);
+			if (owner_name != "world") { //  It is a tribe immovable.
+				egbase.manually_load_tribe(owner_name);
+
+				if (Tribe_Descr const * const tribe = egbase.get_tribe(owner_name)) {
+					int32_t const idx = tribe->get_immovable_index(name);
 					if (idx != -1)
 						imm = new Immovable(*tribe->get_immovable_descr(idx));
 					else
 						throw game_data_error
 							("tribe %s does not define immovable type \"%s\"",
-							 owner, effective_name.c_str());
+							 owner_name.c_str(), name.c_str());
 				} else
-					throw wexception("unknown tribe %s", owner);
+					throw wexception("unknown tribe %s", owner_name.c_str());
 			} else { //  world immovable
 				const World & world = egbase.map().world();
-				int32_t const idx = world.get_immovable_index(name);
+				int32_t const idx = world.get_immovable_index(name.c_str());
 				if (idx == -1)
 					throw wexception
-						("world does not define immovable type \"%s\"", name);
+						("world does not define immovable type \"%s\"", name.c_str());
 
 				imm = new Immovable(*world.get_immovable_descr(idx));
 			}

=== modified file 'src/logic/instances.cc'
--- src/logic/instances.cc	2014-03-04 13:24:58 +0000
+++ src/logic/instances.cc	2014-03-13 21:39:01 +0000
@@ -518,26 +518,7 @@
  */
 void Map_Object::Loader::load_finish()
 {
-	while (!m_finish.empty()) {
-		m_finish.back()();
-		m_finish.pop_back();
-	}
-}
-
-/**
- * Register a callback function that will automatically be run at
- * \ref load_finish time.
- *
- * This is useful for registering save game compatibility fixups that need
- * to be run after everything else has loaded.
- *
- * Callbacks are run in LIFO order.
- */
-void Map_Object::Loader::add_finish(const FinishFn & fini)
-{
-	m_finish.push_back(fini);
-}
-
+}
 
 /**
  * Save the Map_Object to the given file.

=== modified file 'src/logic/instances.h'
--- src/logic/instances.h	2014-02-22 18:04:02 +0000
+++ src/logic/instances.h	2014-03-13 21:39:01 +0000
@@ -279,8 +279,6 @@
 		Loader() : m_egbase(nullptr), m_mol(nullptr), m_object(nullptr) {}
 
 	public:
-		typedef boost::function<void ()> FinishFn;
-
 		virtual ~Loader() {}
 
 		void init
@@ -298,17 +296,12 @@
 			return ref_cast<T, Map_Object>(*m_object);
 		}
 
-		void add_finish(const FinishFn & fini);
-
 	protected:
 		void load(FileRead &);
 
 	public:
 		virtual void load_pointers();
 		virtual void load_finish();
-
-	private:
-		std::vector<FinishFn> m_finish;
 	};
 
 	/// This is just a fail-safe guard for the time until we fully transition

=== modified file 'src/logic/productionsite.cc'
--- src/logic/productionsite.cc	2014-03-04 13:24:58 +0000
+++ src/logic/productionsite.cc	2014-03-13 21:39:01 +0000
@@ -133,16 +133,6 @@
 			throw wexception("program %s: %s", program_name.c_str(), e.what());
 		}
 	}
-
-	if (Section * compat_s = prof.get_section("compatibility_programs")) {
-		while (const Section::Value * v = compat_s->get_next_val())
-			m_compatibility_programs[v->get_name()] = split_string(v->get_string(), " ");
-	}
-
-	if (Section * compat_s = prof.get_section("compatibility working positions")) {
-		while (const Section::Value * v = compat_s->get_next_val())
-			m_compatibility_working_positions[v->get_name()] = split_string(v->get_string(), " ");
-	}
 }
 
 ProductionSite_Descr::~ProductionSite_Descr()
@@ -168,32 +158,6 @@
 }
 
 /**
- * If there is a compatibility action for the given program, return it.
- *
- * Otherwise, return an empty vector.
- */
-const std::vector<std::string> & ProductionSite_Descr::compatibility_program
-	(const std::string & progname) const
-{
-	static const std::vector<std::string> empty;
-	Compatibility::const_iterator it = m_compatibility_programs.find(progname);
-	if (it != m_compatibility_programs.end())
-		return it->second;
-	return empty;
-}
-
-const std::vector<std::string> & ProductionSite_Descr::compatibility_working_positions
-	(const std::string & workername) const
-{
-	static const std::vector<std::string> empty;
-	Compatibility::const_iterator it = m_compatibility_working_positions.find(workername);
-	if (it != m_compatibility_working_positions.end())
-		return it->second;
-	return empty;
-}
-
-
-/**
  * Create a new building of this type
  */
 Building & ProductionSite_Descr::create_object() const {

=== modified file 'src/logic/productionsite.h'
--- src/logic/productionsite.h	2014-02-22 18:04:02 +0000
+++ src/logic/productionsite.h	2014-03-13 21:39:01 +0000
@@ -85,25 +85,12 @@
 	typedef std::map<std::string, ProductionProgram *> Programs;
 	const Programs & programs() const {return m_programs;}
 
-	const std::vector<std::string> & compatibility_program(const std::string & progname) const;
-	const std::vector<std::string> & compatibility_working_positions(const std::string & workername) const;
-
 private:
 	BillOfMaterials m_working_positions;
 	BillOfMaterials m_inputs;
 	Output   m_output_ware_types;
 	Output   m_output_worker_types;
 	Programs m_programs;
-
-	typedef std::map<std::string, std::vector<std::string> > Compatibility;
-
-	/**
-	 * For savegame compatibility purposes, associate with old program
-	 * names a string describing actions that should be taken to preserve
-	 * compatibility.
-	 */
-	Compatibility m_compatibility_programs;
-	Compatibility m_compatibility_working_positions;
 };
 
 class ProductionSite : public Building {

=== modified file 'src/logic/tribe.cc'
--- src/logic/tribe.cc	2014-03-04 13:24:58 +0000
+++ src/logic/tribe.cc	2014-03-13 21:39:01 +0000
@@ -93,14 +93,6 @@
 					 	(*this, _name, _descname, path, prof, global_s));
 			PARSE_MAP_OBJECT_TYPES_END;
 
-			// Read compatibility wares (removed wares existing in saved games from older builds
-			if (Section * const section = root_conf.get_section("compatibility_wares")) {
-				while (Section::Value const * const v = section->get_next_val()) {
-					log("Compatibility ware \"%s\"=\"%s\" loaded.\n", v->get_name(), v->get_string());
-					m_compatibility_wares[v->get_name()] = v->get_string();
-				}
-			}
-
 			PARSE_MAP_OBJECT_TYPES_BEGIN("immovable")
 				m_immovables.add
 					(new Immovable_Descr
@@ -325,11 +317,6 @@
 		} catch (const std::exception & e) {
 			throw game_data_error("root conf: %s", e.what());
 		}
-
-		if (Section * compatibility_s = root_conf.get_section("compatibility_immovable")) {
-			while (const Section::Value * v = compatibility_s->get_next_val())
-				m_compatibility_immovable[v->get_name()] = split_string(v->get_string(), " ");
-		}
 	} catch (const _wexception & e) {
 		throw game_data_error("tribe %s: %s", tribename.c_str(), e.what());
 	}
@@ -530,41 +517,21 @@
 	if (Ware_Index const result = ware_index(warename))
 		return result;
 	else
-		// If this point is reached, the defined ware is neither defined as normal ware nor as a compatibility.
 		throw game_data_error("tribe %s does not define ware type \"%s\"", name().c_str(), warename.c_str());
 }
 Ware_Index Tribe_Descr::safe_ware_index(const char * const warename) const {
 	if (Ware_Index const result = ware_index(warename))
 		return result;
 	else
-		// If this point is reached, the defined ware is neither defined as normal ware nor as a compatibility.
 		throw game_data_error("tribe %s does not define ware type \"%s\"", name().c_str(), warename);
 }
 
 Ware_Index Tribe_Descr::ware_index(const std::string & warename) const {
 	Ware_Index const wi = m_wares.get_index(warename);
-	if (!wi) {
-		// try to find the ware in compatibility wares std::map
-		std::map<std::string, std::string>::const_iterator it = m_compatibility_wares.find(warename);
-		if (m_compatibility_wares.find(warename) != m_compatibility_wares.end()) {
-			log ("ware %s found in compatibility map: %s!\n", warename.c_str(), it->second.c_str());
-			if (Ware_Index const result = m_wares.get_index(it->second))
-				return result;
-		}
-	}
 	return wi;
 }
 Ware_Index Tribe_Descr::ware_index(char const * const warename) const {
 	Ware_Index const wi = m_wares.get_index(warename);
-	if (!wi) {
-		// try to find the ware in compatibility wares std::map
-		std::map<std::string, std::string>::const_iterator it = m_compatibility_wares.find(warename);
-		if (m_compatibility_wares.find(warename) != m_compatibility_wares.end()) {
-			log ("ware %s found in compatibility map: %s!\n", warename, it->second.c_str());
-			if (Ware_Index const result = m_wares.get_index(it->second))
-				return result;
-		}
-	}
 	return wi;
 }
 
@@ -605,19 +572,6 @@
 	return result;
 }
 
-/**
- * If there is a savegame compatibility information string concerning the
- * given immovable name, return it. Otherwise, return an empty string.
- */
-const std::vector<std::string> & Tribe_Descr::compatibility_immovable(const std::string & imm_name) const
-{
-	static const std::vector<std::string> empty;
-	Compatibility::const_iterator it = m_compatibility_immovable.find(imm_name);
-	if (it != m_compatibility_immovable.end())
-		return it->second;
-	return empty;
-}
-
 void Tribe_Descr::resize_ware_orders(size_t maxLength) {
 	bool need_resize = false;
 

=== modified file 'src/logic/tribe.h'
--- src/logic/tribe.h	2014-02-22 18:04:02 +0000
+++ src/logic/tribe.h	2014-03-13 21:39:01 +0000
@@ -234,8 +234,6 @@
 
 	void resize_ware_orders(size_t maxLength);
 
-	const std::vector<std::string> & compatibility_immovable(const std::string & name) const;
-
 private:
 	const std::string m_name;
 	const World & m_world;
@@ -260,15 +258,6 @@
 	Initializations m_initializations;
 
 	Military_Data   m_military_data;
-
-	typedef std::map<std::string, std::vector<std::string> > Compatibility;
-	/**
-	 * For savegame compatibility, this maps immovable names to strings
-	 * describing the appropriate compatibility preserving action.
-	 */
-	Compatibility m_compatibility_immovable;
-	std::map<std::string, std::string> m_compatibility_wares;
-
 };
 
 }

=== modified file 'src/logic/widelands_streamread.cc'
--- src/logic/widelands_streamread.cc	2013-07-26 20:19:36 +0000
+++ src/logic/widelands_streamread.cc	2014-03-13 21:39:01 +0000
@@ -27,9 +27,6 @@
 	(const Tribe_Descr & tribe)
 {
 	std::string name = CString();
-	const std::vector<std::string> & compat = tribe.compatibility_immovable(name);
-	if (compat.size() == 2 && compat[0] == "replace")
-		name = compat[1];
 	int32_t const index = tribe.get_immovable_index(name);
 	if (index == -1)
 		throw tribe_immovable_nonexistent(tribe.name(), name);

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2014-03-10 09:53:33 +0000
+++ src/logic/worker.cc	2014-03-13 21:39:01 +0000
@@ -1336,19 +1336,6 @@
 }
 
 /**
- * Change this worker into a different type.
- *
- * \warning Using this function is very dangerous. The only reason it exists
- * is to fix certain savegame compatibility issues.
- */
-void Worker::flash(const std::string & newname)
-{
-	log("WARNING: Flashing worker of type %s to %s\n", name().c_str(), newname.c_str());
-
-	m_descr = tribe().get_worker_descr(tribe().safe_worker_index(newname));
-}
-
-/**
  * Set a fallback task.
  */
 void Worker::init_auto_task(Game & game) {
@@ -3046,14 +3033,6 @@
 const BobProgramBase * Worker::Loader::get_program(const std::string & name)
 {
 	Worker & worker = get<Worker>();
-	const std::string & compatibility = worker.descr().compatibility_program(name);
-
-	if (compatibility == "fail") {
-		if (upcast(Game, game, &egbase()))
-			add_finish(boost::bind(&Worker::send_signal, &worker, boost::ref(*game), "fail"));
-		return nullptr;
-	}
-
 	return worker.descr().get_program(name);
 }
 

=== modified file 'src/logic/worker.h'
--- src/logic/worker.h	2014-02-22 18:04:02 +0000
+++ src/logic/worker.h	2014-03-13 21:39:01 +0000
@@ -146,8 +146,6 @@
 	void create_needed_experience(Game &);
 	Ware_Index level             (Game &);
 
-	void flash(const std::string & newname);
-
 	int32_t get_needed_experience() const {
 		return descr().get_level_experience();
 	}

=== modified file 'src/logic/worker_descr.cc'
--- src/logic/worker_descr.cc	2014-02-22 18:04:02 +0000
+++ src/logic/worker_descr.cc	2014-03-13 21:39:01 +0000
@@ -131,12 +131,6 @@
 			throw wexception("program %s: %s", program_name.c_str(), e.what());
 		}
 	}
-
-	// Read compatibility information
-	if (Section * compat_s = prof.get_section("compatibility_program")) {
-		while (const Section::Value * v = compat_s->get_next_val())
-			m_compatibility_programs[v->get_name()] = v->get_string();
-	}
 }
 
 
@@ -174,20 +168,6 @@
 }
 
 /**
- * Get the compatibility information for the given program name.
- *
- * Returns an empty string if no compatibility information for this program is found.
- */
-const std::string & Worker_Descr::compatibility_program(const std::string & programname) const
-{
-	static const std::string empty;
-	std::map<std::string, std::string>::const_iterator it = m_compatibility_programs.find(programname);
-	if (it != m_compatibility_programs.end())
-		return it->second;
-	return empty;
-}
-
-/**
  * Custom creation routing that accounts for the location.
  */
 Worker & Worker_Descr::create

=== modified file 'src/logic/worker_descr.h'
--- src/logic/worker_descr.h	2014-02-22 18:04:02 +0000
+++ src/logic/worker_descr.h	2014-03-13 21:39:01 +0000
@@ -114,8 +114,6 @@
 	typedef std::map<std::string, WorkerProgram *> Programs;
 	const Programs & programs() const {return m_programs;}
 
-	const std::string & compatibility_program(const std::string & programname) const;
-
 protected:
 
 	std::string       m_helptext;   ///< Short (tooltip-like) help text
@@ -139,14 +137,6 @@
 	 */
 	Ware_Index  m_becomes;
 	Programs    m_programs;
-
-	/**
-	 * Compatibility hints for loading save games of older versions.
-	 *
-	 * Maps program name to a string that is to be interpreted by the
-	 * game loading logic.
-	 */
-	std::map<std::string, std::string> m_compatibility_programs;
 };
 
 }

=== modified file 'src/map_io/widelands_map_buildingdata_data_packet.cc'
--- src/map_io/widelands_map_buildingdata_data_packet.cc	2014-03-05 20:20:37 +0000
+++ src/map_io/widelands_map_buildingdata_data_packet.cc	2014-03-13 21:39:01 +0000
@@ -926,49 +926,6 @@
 			for (uint16_t i = nr_workers; i; --i) {
 				Worker * worker = &mol.get<Worker>(fr.Unsigned32());
 
-				const std::vector<std::string> & compat =
-					pr_descr.compatibility_working_positions(worker->descr().name());
-				if (!compat.empty()) {
-					if (compat[0] == "flash") {
-						if (compat.size() != 2)
-							throw game_data_error
-								("working position '%s' compat usage: flash other-name",
-								 worker->descr().name().c_str());
-
-						worker->flash(compat[1]);
-					} else if (compat[0] == "replace") {
-						if (compat.size() != 2)
-							throw game_data_error
-								("working position '%s' compat usage: replace other-name",
-								 worker->descr().name().c_str());
-
-						const Tribe_Descr & tribe = worker->tribe();
-
-						log
-							("COMPAT(%s): replace '%s' (%u) by '%s' in '%s' (%u)\n",
-							 tribe.name().c_str(),
-							 worker->descr().name().c_str(), worker->serial(),
-							 compat[1].c_str(),
-							 pr_descr.name().c_str(), productionsite.serial());
-
-						mol.schedule_destroy(*worker);
-
-						const Worker_Descr & worker_descr =
-							*tribe.get_worker_descr
-							(tribe.safe_worker_index(compat[1]));
-						worker = &worker_descr.create
-							(game,
-							 productionsite.owner(),
-							 &productionsite,
-							 worker->get_position());
-						worker->start_task_buildingwork(game);
-						mol.schedule_act(*worker);
-					} else
-						throw game_data_error
-							("unknown compat '%s' for working position '%s'",
-							 compat[0].c_str(), worker->descr().name().c_str());
-				}
-
 				//  Find a working position that matches this worker.
 				const Worker_Descr & worker_descr = worker->descr();
 				ProductionSite::Working_Position * wp = &wp_begin;
@@ -1035,20 +992,6 @@
 				std::transform
 					(program_name.begin(), program_name.end(), program_name.begin(),
 					 tolower);
-				const std::vector<std::string> & compat = pr_descr.compatibility_program(program_name);
-				if (!compat.empty()) {
-					if (compat[0] == "replace") {
-						if (compat.size() != 2)
-							throw game_data_error
-								("Program '%s' compatibility: usage: replace other-name",
-								 program_name.c_str());
-
-						program_name = compat[1];
-					} else
-						throw game_data_error
-							("Unknown compatibility code '%s' for program '%s'",
-							 compat[0].c_str(), program_name.c_str());
-				}
 
 				productionsite.m_stack[i].program =
 					productionsite.descr().get_program(program_name);

=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf	2014-03-10 10:45:21 +0000
+++ tribes/barbarians/battlearena/conf	2014-03-13 21:39:01 +0000
@@ -19,9 +19,6 @@
 [working positions]
 trainer=1
 
-[compatibility working positions]
-carrier=replace trainer
-
 [inputs]
 pittabread=10
 fish=6

=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2014-03-10 09:15:02 +0000
+++ tribes/barbarians/conf	2014-03-13 21:39:01 +0000
@@ -29,13 +29,6 @@
 fps=5
 playercolor=true
 
-[compatibility_immovable]
-# For compatibility with build15 and earlier
-flax0s=replace reed0s
-flax0t=replace reed0t
-flax0=replace reed0
-flax1=replace reed1
-
 [immovable types]
 ashes=_Ashes
 destroyed_building=_Destroyed building
@@ -64,10 +57,6 @@
 deer=_Deer
 wildboar=_Wild Boar
 
-[compatibility_wares]
-# for compatibility with build15 and earlier
-flax=thatchreed
-
 [ware types]
 axe=_Ax
 bakingtray=_Bread Paddle

=== modified file 'tribes/barbarians/ferner/conf'
--- tribes/barbarians/ferner/conf	2014-02-22 16:49:17 +0000
+++ tribes/barbarians/ferner/conf	2014-03-13 21:39:01 +0000
@@ -2,11 +2,6 @@
 program=plantreed
 program=harvestreed
 
-[compatibility_program]
-# For compatibility with build15 and earlier
-plantflax=fail
-harvestflax=fail
-
 [buildcost]
 carrier=1
 shovel=1

=== modified file 'tribes/barbarians/fernery/conf'
--- tribes/barbarians/fernery/conf	2014-03-10 10:45:21 +0000
+++ tribes/barbarians/fernery/conf	2014-03-13 21:39:01 +0000
@@ -20,14 +20,6 @@
 harvest_reed=_Harvest reed
 work=_Work
 
-[compatibility_programs]
-# For compatibility with savegames from build15 and older
-plant_flax=replace plant_reed
-harvest_flax=replace harvest_reed
-# For compatibility with savegames from build13 and older
-plantflax=replace plant_reed
-harvestflax=replace harvest_reed
-
 [plant_reed]
 sleep=18000  #orig sleep=20000 but ferner animation was increased by 2sec
 worker=plantreed

=== modified file 'tribes/barbarians/metalworks/conf'
--- tribes/barbarians/metalworks/conf	2014-03-03 20:59:04 +0000
+++ tribes/barbarians/metalworks/conf	2014-03-13 21:39:01 +0000
@@ -47,9 +47,6 @@
 produce_hunting_spear=_Produce hunting spear
 work=_Work
 
-[compatibility_programs]
-produce_axe=replace produce_felling_axe
-
 [produce_felling_axe]
 return=skipped unless economy needs felling_axe
 consume=iron trunk

=== modified file 'tribes/empire/sawmill/conf'
--- tribes/empire/sawmill/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/sawmill/conf	2014-03-13 21:39:01 +0000
@@ -16,9 +16,6 @@
 [working positions]
 carpenter=1
 
-[compatibility working positions]
-toolsmith=flash carpenter
-
 [inputs]
 trunk=8