--- deliantra/server/socket/request.C	2008/07/13 11:57:25	1.133
+++ deliantra/server/socket/request.C	2008/08/10 16:31:18	1.136
@@ -1264,17 +1264,21 @@
                             && op->stats.maxhp > 0
                             && (op->type == PLAYER
                                 || op->type == DOOR // does not work, have maxhp 0
-                                || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
+                                || QUERY_FLAG (op, FLAG_MONSTER)
+                                || QUERY_FLAG (op, FLAG_ALIVE)
+                                || QUERY_FLAG (op, FLAG_GENERATOR)))
                           {
                             stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
                             stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
                           }
 
-                        if (op->msg && op->msg[0] == '@')
+                        if (op->has_dialogue ())
                           flags |= 1;
 
                         if (op->type == PLAYER)
-                          player = op->count;
+                          player = op == ob     ? pl->ob->count
+                                 : op == pl->ob ? ob->count
+                                 :                op->count;
                       }
 
                   if (lastcell.stat_hp != stat_hp)