--- deliantra/server/socket/info.C	2006/12/21 23:37:06	1.23
+++ deliantra/server/socket/info.C	2006/12/25 14:43:23	1.25
@@ -189,7 +189,7 @@
     {
       player *tmppl;
 
-      for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
+      for_all_players (pl)
         new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
 
       return;
@@ -311,7 +311,7 @@
 {
   player *pl;
 
-  for (pl = first_player; pl != NULL; pl = pl->next)
+  for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
       {
         new_draw_info (color, 0, pl->ob, str);
@@ -327,7 +327,7 @@
 {
   player *pl;
 
-  for (pl = first_player; pl != NULL; pl = pl->next)
+  for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
       {
         new_draw_info (color, 0, pl->ob, str);
@@ -343,7 +343,7 @@
 {
   player *pl;
 
-  for (pl = first_player; pl != NULL; pl = pl->next)
+  for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map)
       {
         new_draw_info (color, 0, pl->ob, str);
@@ -600,7 +600,7 @@
 
   for (int x = 0; x < MAGIC_MAP_SIZE; x++)
     for (int y = 0; y < MAGIC_MAP_SIZE; y++)
-      if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
+      if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
         {
           xmin = x < xmin ? x : xmin;
           xmax = x > xmax ? x : xmax;