--- deliantra/server/socket/request.C	2006/08/24 10:58:39	1.8
+++ deliantra/server/socket/request.C	2006/08/29 07:34:01	1.11
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_init_c =
- *    "$Id: request.C,v 1.8 2006/08/24 10:58:39 root Exp $";
+ *    "$Id: request.C,v 1.11 2006/08/29 07:34:01 root Exp $";
  */
 
 /*
@@ -235,7 +235,7 @@
 
 void ExtCmd (char *buf, int len, player *pl)
 {
-  execute_global_event (EVENT_EXTCMD, pl, buf, len);
+  INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
 }
 
 void MapInfoCmd (char *buf, int len, player *pl)
@@ -1294,6 +1294,7 @@
     cell->faces[2] = face2;
     cell->count = count;
     cell->stat_hp = 0;
+    cell->player = 0;
 }
 
 #define MAX_HEAD_POS	MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
@@ -1857,12 +1858,11 @@
                     if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
                       {
                         if (op->head || op->invisible)
-                          continue;
-
-                        if (op->type == PLAYER
-                            || QUERY_FLAG(op, FLAG_MONSTER)
-                            || QUERY_FLAG(op, FLAG_ALIVE)
-                            || QUERY_FLAG(op, FLAG_GENERATOR))
+                          ; // do not show
+                        else if (op->type == PLAYER
+                            || QUERY_FLAG (op, FLAG_MONSTER)
+                            || QUERY_FLAG (op, FLAG_ALIVE)
+                            || QUERY_FLAG (op, FLAG_GENERATOR))
                           {
                             if (op->stats.maxhp > 0
                                 && (unsigned)op->stats.maxhp > (unsigned)op->stats.hp)
@@ -1876,7 +1876,7 @@
                           player = op->count;
                       }
 
-                    if (lastcell.stat_hp != stat_hp)
+                    if (lastcell.stat_hp != stat_hp && 0)
                       {
                         lastcell.stat_hp = stat_hp;
 
@@ -1891,7 +1891,7 @@
                           }
                       }
 
-                    if (lastcell.player != player)
+                    if (lastcell.player != player && 0)
                       {
                         lastcell.player = player;
                         mask |= 0x8;
@@ -1993,11 +1993,7 @@
 	return;
     }
 
-    if (pl->contr->transport) {
-	pm = pl->contr->transport->map;
-    }
-    else
-	pm = pl->map;
+    pm = pl->map;
 
     /* If player is just joining the game, he isn't here yet, so the map
      * can get swapped out.  If so, don't try to send them a map.  All will