--- deliantra/server/socket/item.C 2007/01/09 21:32:43 1.32 +++ deliantra/server/socket/item.C 2007/01/21 21:28:27 1.35 @@ -306,12 +306,12 @@ anim_speed = head->anim_speed; else { - if (FABS (head->speed) < 0.001) + if (fabs (head->speed) < 0.001) anim_speed = 255; - else if (FABS (head->speed) >= 1.0) + else if (fabs (head->speed) >= 1.0) anim_speed = 1; else - anim_speed = (int) (1.0 / FABS (head->speed)); + anim_speed = (int) (1.0 / fabs (head->speed)); } if (anim_speed > 255) @@ -450,6 +450,9 @@ void esrv_send_inventory (object *pl, object *op) { + if (!pl->contr->ns)//D + return; + int got_one = 0; pl->contr->ns->send_packet_printf ("delinv %d", op->count); @@ -603,12 +606,12 @@ anim_speed = op->anim_speed; else { - if (FABS (op->speed) < 0.001) + if (fabs (op->speed) < 0.001) anim_speed = 255; - else if (FABS (op->speed) >= 1.0) + else if (fabs (op->speed) >= 1.0) anim_speed = 1; else - anim_speed = (int) (1.0 / FABS (op->speed)); + anim_speed = (int) (1.0 / fabs (op->speed)); } if (anim_speed > 255) @@ -630,6 +633,9 @@ void esrv_send_item (object *pl, object *op) { + if (!pl->contr->ns) + return; + /* If this is not the player object, do some more checks */ if (op != pl) { @@ -891,7 +897,7 @@ } dy = atoi (cp); - if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) + if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) return; if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])