From 5f2ef620c18b36fe0d480474135aa78eb9eb0c01 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 25 Dec 2015 12:49:47 +0100
Subject: WAGE: Implemented World::move(Obj *obj, Chr *chr)

---
 engines/wage/world.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'engines/wage/world.cpp')

diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 8ae775ad12..a177d32930 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -352,8 +352,21 @@ Common::String *World::loadStringFromDITL(Common::MacResManager *resMan, int res
 	return NULL;
 }
 
+bool ChrComparator(Obj *l, Obj *r) {
+    return l->_index < r->_index;
+}
+
 void World::move(Obj *obj, Chr *chr) {
-	warning("STUB: World::move(obj, chr)");
+	if (obj == NULL)
+		return;
+
+	Designed *from = obj->removeFromCharOrScene();
+	obj->_currentOwner = chr;
+	chr->_inventory.push_back(obj);
+
+	Common::sort(chr->_inventory.begin(), chr->_inventory.end(), ChrComparator);
+
+	_engine->onMove(obj, from, chr);
 }
 
 void World::move(Obj *obj, Scene *scene) {
-- 
cgit v1.2.3