Improved list_zone, list_ships

Ship price and cargo size

1 files changed, 8 insertions, 5 deletions

diff --git a/src/core/zone.h b/src/core/zone.h
index 4b64ffb..f93cea2 100644
--- a/src/core/zone.h
+++ b/src/core/zone.h
@@ -45,17 +45,14 @@ public:
 	/// find a zone in the zone registry
 	static Zone *find(std::string const & name);
 
-	/// find a zone in the zone registry (searches on id and name)
-	static Zone *find_zone(std::string const & searchname);
-
 	/// remove a zone from the zone registry
 	static void remove(Zone *zone);
 
 	/// list the zone registry
 	static void list();
 
-	/// list the content of a single zone
-	static void list_zone(std::string const & searchname);
+	/// search the zone registry for an id, label or name
+	static Zone *search(std::string const & searchname);
 
 	/// clear the zone registry
 	static void clear();
@@ -76,6 +73,9 @@ public:
 
 	/* ---- inspectors ----------------------------------------- */
 
+	/// print the content of a zone
+	void print();
+
 	/// zone id
 	inline unsigned int id() const { return zone_id; }
 
@@ -103,6 +103,9 @@ public:
 	/// find a labeled entity inside a zone
 	Entity *find_entity(const std::string & label);
 
+	/// search for an entity inside a zone
+	Entity *search_entity(const std::string & label);
+
 	/* ---- mutators ------------------------------------------- */
 
 	/// set the Zone label