Initial inventory loading, ships docking ships

1 files changed, 23 insertions, 3 deletions

diff --git a/src/core/commandbuffer.cc b/src/core/commandbuffer.cc
index 3c7fc35..40971cc 100644
--- a/src/core/commandbuffer.cc
+++ b/src/core/commandbuffer.cc
@@ -116,6 +116,22 @@ void func_list_ent(std::string const &args)
 	Entity::list();
 }
 
+void func_list_inventory(std::string const &args)
+{
+	unsigned long id;
+	std::istringstream argstream(args);
+	if (argstream >> id) {
+		Entity *entity = Entity::find(id);
+		if (entity) {
+			entity->list_inventory();
+		} else {
+			con_print << "Could not find entity with id " << id << std::endl;
+		}		
+	} else {
+		con_print << "usage: list_inventory [entity id]" <<  std::endl;
+	}
+}
+
 void func_list_zone(std::string const &args)
 {
 	Zone *zone = Zone::search(args);
@@ -142,7 +158,7 @@ void func_set(std::string const &args)
 	std::istringstream argstream(args);
 	std::string varname;
 	if (!(argstream >> varname)) {
-		con_print << "Variable name expected!"  << std::endl;
+		con_print << "usage: set [variable name]" <<  std::endl;
 		return;
 	}
 
@@ -174,7 +190,7 @@ void func_toggle(std::string const &args)
 	std::istringstream argstream(args);
 	std::string varname;
 	if (!(argstream >> varname)) {
-		con_print << "Variable name expected!"  << std::endl;
+		con_print << "usage: toggle [variable name]" <<  std::endl;
 		return;
 	}
 
@@ -242,6 +258,9 @@ void CommandBuffer::init()
 	func = Func::add("list_info", (FuncPtr)func_list_info);
 	func->set_info("list info records");
 
+	func = Func::add("list_inventory", (FuncPtr)func_list_inventory);
+	func->set_info("[entity id] list entity inventories");
+
 	func = Func::add("list_var", (FuncPtr)func_list_var);
 	func->set_info("list variables");
 
@@ -249,7 +268,7 @@ void CommandBuffer::init()
 	func->set_info("list zones");
 
 	Func::add("list_model", (FuncPtr) func_list_model);
-	func->set_info("list models");
+	func->set_info("list 3d models");
 
 	Func::add("list_module", (FuncPtr) func_list_module);
 	func->set_info("list game modules");
@@ -282,6 +301,7 @@ void CommandBuffer::shutdown()
 	Func::remove("list_var");
 	Func::remove("list_func");
 	Func::remove("list_info");
+	Func::remove("list_inventories");
 	Func::remove("list_ent");
 	Func::remove("list_model");
 	Func::remove("list_module");