--- deliantra/server/socket/info.C	2007/03/11 02:12:45	1.35
+++ deliantra/server/socket/info.C	2007/04/24 12:32:16	1.37
@@ -386,8 +386,8 @@
          * the player does not have a golem, reset some things.
          */
       case range_golem:
-        if (pl->contr->ranges[range_golem] != NULL)
-          sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
+        if (object *golem = pl->contr->ranges[range_golem])
+          sprintf (obuf, "Range: golem (%s)", &golem->name);
         else
           {
             pl->contr->shoottype = range_none;
@@ -421,6 +421,16 @@
     sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
 }
 
+// formerly a macro, used only by magic map, so optimised it out
+static inline faceidx
+GET_MAP_FACE (maptile *m, int x, int y, int layer)
+{
+  if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
+    return op->face;
+  else
+    return 0;
+}
+
 /**
  * Helper for magic map creation.
  *