commit 9845d1122367c2a40311b46e86b7314b5d14c43f
author Arathorn <mud@mg.mud.de> Wed Jan 08 22:02:03 2020 +0100
committer MG Mud User <mud@mg.mud.de> Wed Jan 08 22:02:03 2020 +0100
tree beadda3396e96317c26ae69b90359a5ac117a9f2
parent 4c9e19e6ed000ed829a96f1a2c8cce4fbfc81a98

Typfixes

Change-Id: I29c337444e3379cdc58a014ca2e6d541ee7502b8

std/lightsource.c

diff --git a/std/lightsource.c b/std/lightsource.c
index 6975578..d2ff3aa 100644
--- a/std/lightsource.c
+++ b/std/lightsource.c
@@ -285,15 +285,15 @@
 
 static string _query_lightdesc()
 {
-  string *tmp;
-  int n,i;
+  string|string* l_desc = Query(P_LIGHTDESC);
+  if (!pointerp(l_desc))
+    return (string)l_desc;
   
-  tmp=Query(P_LIGHTDESC);
-  if (!pointerp(tmp)) return (string)tmp;
-  n=sizeof(tmp);
-  i=n*_query_fuel()/max_fuel;
-  if (i>=n) i=n-1;
-  return tmp[i];
+  int n = sizeof(l_desc);
+  int i = n * _query_fuel() / max_fuel;
+  if (i>=n)
+    i = n-1;
+  return l_desc[i];
 }
 
 static int _query_light()

std/room/exits.c

diff --git a/std/room/exits.c b/std/room/exits.c
index 27f59d7..d0ead0b 100644
--- a/std/room/exits.c
+++ b/std/room/exits.c
@@ -208,7 +208,8 @@
 
 varargs string GetExits( object viewer ) 
 {
-    string *indices, *hidden;
+    string *indices;
+    int|string* hidden;
     string exits;
 
     if ( QueryProp(P_DOOR_INFOS) )

std/shells/magier/parsing.c

diff --git a/std/shells/magier/parsing.c b/std/shells/magier/parsing.c
index 37eaebd..074aaa2 100644
--- a/std/shells/magier/parsing.c
+++ b/std/shells/magier/parsing.c
@@ -296,10 +296,13 @@
 
   if ((mode==MODE_LSA||mode==MODE_LSB))
   {
-    string *vrooms;
     object vcompiler =
       find_object(implode(patharray[0..<2],"/")+"/virtual_compiler");
-    if (vcompiler && pointerp(vrooms=(mixed *)vcompiler->QueryObjects()))
+
+    object *vrooms = ({});
+    if (vcompiler)
+      vrooms = vcompiler->QueryObjects();
+    
     map(vrooms,#'_vc_map,&data);
   }
   mixed *files=({});