commit d30c2f4a68cb065f4d6252e293208c02c0241267
author Zesstra <zesstra@zesstra.de> Mon Nov 25 22:24:40 2019 +0100
committer Zesstra <zesstra@zesstra.de> Mon Nov 25 22:24:40 2019 +0100
tree 9249b7e8e91d53eaa7184300dc07a9bb440f1800
parent 15ed8e8d4da293713c3f16eaedd1fcc621379692
parent 7d3be5c01572dc8c9b7a60b904c2045821af5086

Merge branch 'ldmud36' of ssh://mgg/mudlib-public into ldmud36

Change-Id: Id3c731686758aead01b58333a69f308f123e4483

std/container/items.c

diff --git a/std/container/items.c b/std/container/items.c
index a8c8465..282ebcc 100644
--- a/std/container/items.c
+++ b/std/container/items.c
@@ -202,7 +202,7 @@
 
 public void RemoveItem(string|string* filename)
 {
-  < <int|<string|string*>|object>* >* items=QueryProp(P_ITEMS);
+  < <int|<string|string*>|object|mapping>* >* items=QueryProp(P_ITEMS);
 
   if(!pointerp(items) || !sizeof(items))
   {

std/player/base.c

diff --git a/std/player/base.c b/std/player/base.c
index 869c652..a4f271c 100644
--- a/std/player/base.c
+++ b/std/player/base.c
@@ -1902,8 +1902,7 @@
   }
   str=lower_case(str);
   if (str=="alle") {
-    object livs;
-    livs=filter(all_inventory(environment(PL)),
+    object* livs = filter(all_inventory(environment(PL)),
         function int (object ob) {
             if (living(ob) && !query_once_interactive(ob)
                   && !ob->QueryProp(P_INVIS)