ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.54 by root, Fri Oct 19 04:25:10 2007 UTC

425 head = tmp; 425 head = tmp;
426 426
427 add_object_to_socklist (*pl->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
428 got_one++; 428 got_one++;
429 429
430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
431 { 431 {
432 pl->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
433 433
434 sl.reset (); 434 sl.reset ();
435 sl.printf ("item%d ", pl->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
479 479
480 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
481 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
482 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
483 */ 483 */
484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
485 { 485 {
486 pl->contr->ns->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
487 487
488 sl.reset (); 488 sl.reset ();
489 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
838 * Tero.Haatanen@lut.fi ] 838 * Tero.Haatanen@lut.fi ]
839 */ 839 */
840static void 840static void
841look_at (player *pl, int dx, int dy) 841look_at (player *pl, int dx, int dy)
842{ 842{
843 dynbuf_text buf;
843 object *ob = pl->ob; 844 object *ob = pl->ob;
844 845
845 maptile *m = pl->observe->map; 846 if (!pl->observe->map)
846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
848
849 if (!m)
850 return; 847 return;
851 848
852 if (!xy_normalise (m, x, y)) 849 mapxy pos (pl->observe);
853 { 850 pos.move (dx, dy);
854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
855 return;
856 }
857 851
858 int flag = 0; 852 if (pos.normalise ())
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) 853 for (object *tmp = pos->top; tmp; tmp = tmp->below)
861 { 854 {
862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 855 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
863 continue; 856 continue;
864 857
865 if (!flag)
866 {
867 if (dx || dy)
868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
869 else
870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
871
872 flag = 1;
873 }
874
875 if (QUERY_FLAG (ob, FLAG_WIZ)) 858 if (QUERY_FLAG (ob, FLAG_WIZ))
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); 859 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
877 else 860 else
878 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 861 buf.printf ("- %s.\n", query_name (tmp));
879 862
880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 863 object *head = tmp->head_ ();
881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
883 864
865 if (head->inv)
866 if ((head->type != CONTAINER && head->type != FLESH)
867 || QUERY_FLAG (ob, FLAG_WIZ))
868 buf << head->query_inventory (ob, " ");
869
884 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 870 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
885 break; 871 break;
886 } 872 }
887 873
888 if (!flag) 874 if (buf.empty ())
889 { 875 pl->failmsg ("You see nothing there.");
890 if (dx || dy)
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
892 else 876 else
893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 877 pl->infobox (MSG_CHANNEL ("lookat"), buf);
894 }
895} 878}
896 879
897/** Client wants to look at some object. Lets do so. */ 880/** Client wants to look at some object. Lets do so. */
898void 881void
899LookAt (char *buf, int len, player *pl) 882LookAt (char *buf, int len, player *pl)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines