--- deliantra/server/socket/info.C 2006/12/21 06:12:37 1.22 +++ deliantra/server/socket/info.C 2006/12/21 23:37:06 1.23 @@ -85,7 +85,7 @@ return; if (pl->type == PLAYER) - esrv_print_msg (pl->contr->socket, colr, (char *) tmp); + esrv_print_msg (pl->contr->ns, colr, (char *) tmp); } /** @@ -249,7 +249,7 @@ if (pri >= pl->contr->listening) return; - if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) + if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) { char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); @@ -264,7 +264,7 @@ } } else - esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); + esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message); } void @@ -279,7 +279,7 @@ if (pri >= pl->contr->listening) return; - if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) + if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) { va_list ap; @@ -298,7 +298,7 @@ vsnprintf (buf, HUGE_BUF, new_format, ap); va_end (ap); strip_media_tag (buf); - esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); + esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); } } @@ -616,7 +616,7 @@ for (int x = xmin; x <= xmax; x++) sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); - pl->contr->socket->send_packet (sl); + pl->contr->ns->send_packet (sl); free (map_mark); }