commit 7dbdec5dd909ae9ccd6d6112365c7d8e704864bd
author Zesstra <zesstra@zesstra.de> Mon Nov 12 22:49:03 2018 +0100
committer Zesstra <zesstra@zesstra.de> Tue Nov 13 19:16:45 2018 +0100
tree 18f7bc2115f2f3aeb8da545c1a5d3ff5b8b6bb15
parent d3c66d390321230a401cab4499f5543534ee4061

moved_objects(): nur wirklich bewegte Objekt liefern.

Es konnte vorkommen, dass in last_moved_objects auch
Objekte enthalten waren, die nicht bewegt wurden.

Change-Id: I52af692a3ef50e45395ca0add400612d32181159

std/living/put_and_get.c

diff --git a/std/living/put_and_get.c b/std/living/put_and_get.c
index 53b5730..7340936 100644
--- a/std/living/put_and_get.c
+++ b/std/living/put_and_get.c
@@ -672,20 +672,18 @@
     if (!sizeof(obs = find_objects(str, this_object(), 1)))
         return 0;
 
+    last_moved_objects=({});
+    last_moved_where = 0;
     foreach (object o: obs) {
         if (objectp(o))
-            drop(o, msg);
+            if (drop(o, msg) == 1)
+                last_moved_objects+=({o});
 
         if (get_eval_cost() < 100000) {
             TME("Den Rest behaeltst Du erst mal.");
-            last_moved_objects = obs[..member(obs, o)];
-            last_moved_where = 0;
             return 1;
         }
     }
-
-    last_moved_objects = obs;
-    last_moved_where = 0;
     return 1;
 }
 
@@ -759,20 +757,20 @@
                 return 0;
         }
 
+        last_moved_objects = ({});
+        last_moved_where = dest;
+
         foreach (object o: obs) {
             if (objectp(o))
-                put(o, dest, msg);
+                if (put(o, dest, msg) == 1)
+                    last_moved_objects += ({o});
 
             if (get_eval_cost() < 100000) {
                 TME("Den Rest laesst Du erst mal, wo er ist.");
-                last_moved_objects = obs[..member(obs, o)];
-                last_moved_where = dest;
                 return 1;
             }
         }
 
-        last_moved_objects = obs;
-        last_moved_where = dest;
         return 1;
     }
     
@@ -789,30 +787,29 @@
     }
 
     if (!sizeof(obs = find_objects(str, 0, 1) - all_inventory()
-	  - (flag ? all_inventory(environment()) : ({}))))
+                - (flag ? all_inventory(environment()) : ({}))))
         return 0;
 
+    last_moved_objects = ({});
+    last_moved_where = this_object();
     foreach (object o: obs) {
         if (objectp(o))
-            pick(o, msg);
+            if (pick(o, msg) == 1)
+                last_moved_objects += ({o});
 
         if (get_eval_cost() < 100000) {
             TME("Den Rest laesst Du erst mal liegen.");
-            last_moved_objects = obs[..member(obs, o)];
-            last_moved_where = 0;
             return 1;
         }
     }
 
-    last_moved_objects = obs;
-    last_moved_where = 0;
     return 1;
 }
 
 varargs int give_objects(string str, mixed msg)
 {
     object *obs, dest;
-    
+
     if (!stringp(str) || !sizeof(str)) return 0;
 
     string *tokens = explode(str, " ");
@@ -852,27 +849,25 @@
     if (!dest || !living(dest) || !sizeof(obs))
         return 0;
 
+    last_moved_objects = ({});
+    last_moved_where = dest;
     foreach (object o: obs) {
         if (objectp(o))
-            give(o, dest, msg);
+            if (give(o, dest, msg) == 1)
+                last_moved_objects += ({o});
 
         if (get_eval_cost() < 100000) {
             TME("Den Rest behaeltst Du erst mal.");
-            last_moved_objects = obs[..member(obs, o)];
-            last_moved_where = dest;
             return 1;
         }
     }
-
-    last_moved_objects = obs;
-    last_moved_where = dest;
     return 1;
 }
 
 varargs int show_objects(string str, mixed msg)
 {
     object *obs, whom;
-    
+
     if (!stringp(str) || !sizeof(str))
       return 0;
 
@@ -908,20 +903,19 @@
             continue;
         }
 
+        last_moved_objects = ({});
+        last_moved_where = whom;
         foreach (object o: obs) {
             if (objectp(o))
-                show(o, whom, msg);
+                if (show(o, whom, msg) == 1)
+                    last_moved_objects += ({o});
 
             if (get_eval_cost() < 100000) {
                 TME("Das reicht erst mal.");
-                last_moved_objects = obs[..member(obs, o)];
-                last_moved_where = whom;
                 return 1;
             }
         }
 
-        last_moved_objects = obs;
-        last_moved_where = whom;
         return 1;
     }