[ViewVC] Diff of: cvs/deliantra/server/socket/info.C

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.35 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.37 by root, Tue Apr 24 12:32:16 2007 UTC

         /* range_scroll is only used for controlling golems.  If the
          * the player does not have a golem, reset some things.
          */
       case range_golem:
-        if (pl->contr->ranges[range_golem] != NULL)
+        if (object *golem = pl->contr->ranges[range_golem])
-          sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
+          sprintf (obuf, "Range: golem (%s)", &golem->name);
         else
           {
             pl->contr->shoottype = range_none;
             strcpy (obuf, "Range: nothing");
           }
   /* Eneq(@csd.uu.se): Let players define their own titles. */
   if (pl->contr->own_title[0] == '\0')
     sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
   else
     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.
  *

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines