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.33 by root, Fri Jan 12 01:29:13 2007 UTC vs.
Revision 1.44 by root, Mon Apr 23 19:10:17 2007 UTC

… …
264 264
265 flags = query_flags (head); 265 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 267 flags |= F_NOPICK;
268 268
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
270 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
271 271
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
274 274
275 sl << uint32 (head->count) 275 sl << uint32 (head->count)
276 << uint32 (flags) 276 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
278 << uint32 (head->face->number); 278 << uint32 (head->face);
279 279
280 if (!head->custom_name) 280 if (!head->custom_name)
281 { 281 {
282 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 283 item_n[127] = 0;
… …
304 { 304 {
305 if (head->anim_speed) 305 if (head->anim_speed)
306 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
307 else 307 else
308 { 308 {
309 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
310 anim_speed = 255; 310 anim_speed = 255;
311 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
312 anim_speed = 1; 312 anim_speed = 1;
313 else 313 else
314 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
315 } 315 }
316 316
317 if (anim_speed > 255) 317 if (anim_speed > 255)
318 anim_speed = 255; 318 anim_speed = 255;
319 } 319 }
… …
334 */ 334 */
335void 335void
336esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
337{ 337{
338 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
339 char buf[MAX_BUF];
340 339
341 if (!pl->contr->ns->update_look) 340 if (!pl->contr->ns->update_look)
342 { 341 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 342 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
344 return; 343 return;
345 } 344 }
346 else 345 else
347 pl->contr->ns->update_look = 0; 346 pl->contr->ns->update_look = 0;
348 347
… …
357 packet sl; 356 packet sl;
358 sl.printf ("item%d ", pl->contr->ns->itemcmd); 357 sl.printf ("item%d ", pl->contr->ns->itemcmd);
359 358
360 sl << uint32 (0); 359 sl << uint32 (0);
361 360
362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 361 pl->contr->ns->send_face (empty_face);
363 esrv_send_face (pl->contr->ns, empty_face->number, 0); 362 pl->contr->ns->flush_fx ();
364 363
365 if (pl->contr->ns->look_position) 364 if (pl->contr->ns->look_position)
366 { 365 {
367 char buf[80]; 366 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 368
370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
371 << uint32 (0) 370 << uint32 (0)
372 << sint32 (-1) 371 << sint32 (-1)
373 << uint32 (empty_face->number) 372 << uint32 (empty_face)
374 << data8 (buf) 373 << data8 (buf)
375 << uint16 (0) 374 << uint16 (0)
376 << uint8 (0) 375 << uint8 (0)
377 << uint32 (0); 376 << uint32 (0);
378 377
… …
405 * we notice the special tag the object has, and act accordingly. 404 * we notice the special tag the object has, and act accordingly.
406 */ 405 */
407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0) 407 << uint32 (0)
409 << uint32 ((uint32) - 1) 408 << uint32 ((uint32) - 1)
410 << uint32 (empty_face->number) 409 << uint32 (empty_face)
411 << data8 ("Apply this to see next group of items") 410 << data8 ("Apply this to see next group of items")
412 << uint16 (0) 411 << uint16 (0)
413 << uint8 (0) 412 << uint8 (0)
414 << uint32 (0); 413 << uint32 (0);
415 414
… …
502 * 501 *
503 * flags is a list of values to update 502 * flags is a list of values to update
504 * to the client (as defined in newclient.h - might as well use the 503 * to the client (as defined in newclient.h - might as well use the
505 * same value both places. 504 * same value both places.
506 */ 505 */
507
508void 506void
509esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
510{ 508{
511 /* If we have a request to send the player item, skip a few checks. */ 509 /* If we have a request to send the player item, skip a few checks. */
512 if (op != pl) 510 if (op != pl)
… …
557 ns->last_weight = weight; 555 ns->last_weight = weight;
558 } 556 }
559 557
560 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
561 { 559 {
562 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
563 esrv_send_face (ns, op->face->number, 0); 561 ns->flush_fx ();
564
565 sl << uint32 (op->face->number); 562 sl << uint32 (op->face);
566 } 563 }
567 564
568 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
569 { 566 {
570 int len; 567 int len;
… …
604 { 601 {
605 if (op->anim_speed) 602 if (op->anim_speed)
606 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
607 else 604 else
608 { 605 {
609 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
610 anim_speed = 255; 607 anim_speed = 255;
611 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
612 anim_speed = 1; 609 anim_speed = 1;
613 else 610 else
614 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
615 } 612 }
616 613
617 if (anim_speed > 255) 614 if (anim_speed > 255)
618 anim_speed = 255; 615 anim_speed = 255;
619 } 616 }
… …
631 * Sends item's info to player. 628 * Sends item's info to player.
632 */ 629 */
633void 630void
634esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
635{ 632{
633 if (!pl->contr->ns)
634 return;
635
636 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
637 if (op != pl) 637 if (op != pl)
638 { 638 {
639 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
640 if (!op->client_visible ()) 640 if (!op->client_visible ())
… …
667 667
668/** 668/**
669 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
670 * command with a -1 location. 670 * command with a -1 location.
671 */ 671 */
672
673void 672void
674esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
675{ 674{
675 if (!pl->ns)
676 return;
677
676 packet sl ("delitem"); 678 packet sl ("delitem");
677 679
678 sl << uint32 (tag); 680 sl << uint32 (tag);
679 681
680 pl->ns->send_packet (sl); 682 pl->ns->send_packet (sl);
… …
689 691
690/** 692/**
691 * Takes a player and object count (tag) and returns the actual object 693 * Takes a player and object count (tag) and returns the actual object
692 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
693 */ 695 */
694
695object * 696object *
696esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
697{ 698{
698 object *op, *tmp;
699
700 if (pl->count == count) 699 if (pl->count == count)
701 return pl; 700 return pl;
702 701
703 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
704 if (op->count == count) 703 if (op->count == count)
705 return op; 704 return op;
706 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
707 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
708 if (tmp->count == count) 707 if (tmp->count == count)
709 return tmp; 708 return tmp;
710 709
711 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 710 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
712 if (op->head && op->head->count == count) 711 if (op->head && op->head->count == count)
713 return op; 712 return op;
714 else if (op->count == count) 713 else if (op->count == count)
715 return op; 714 return op;
716 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
717 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
718 if (tmp->count == count) 717 if (tmp->count == count)
719 return tmp; 718 return tmp;
720 719
720#if 0
721 /* If the high bit is set, player examined a pseudo object. */
722 if (count & 0x80000000)
723 return 0;
724#endif
725
721 return 0; 726 return 0;
722} 727}
723 728
724
725/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
726void 730void
727ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
728{ 732{
729 tag_t tag = atoi (buf); 733 tag_t tag = atoi (buf);
730
731 /* If the high bit is set, player examined a pseudo object. */
732 if (tag & 0x80000000)
733 return;
734 734
735 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
736 736
737 if (!op) 737 if (!op)
738 { 738 {
739 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 739 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
740 return; 740 return;
741 } 741 }
742 742
743 examine (pl->ob, op); 743 examine (pl->ob, op);
744}
745
746/** Client wants to examine some object. So lets do so. */
747void
748ExCmd (char *buf, int len, player *pl)
749{
750 tag_t tag = atoi (buf);
751
752 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
753 {
754 std::string s = op->describe (pl->ob);
755
756 packet sl ("ex");
757 sl << ber32 (tag) << s.c_str ();
758
759 pl->ns->send_packet (sl);
760 }
744} 761}
745 762
746/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
747void 764void
748ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
… …
835 852
836 m = get_map_from_coord (op->map, &x, &y); 853 m = get_map_from_coord (op->map, &x, &y);
837 if (!m) 854 if (!m)
838 return; 855 return;
839 856
840 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 857 for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
858 ;
841 859
842 for (; tmp != NULL; tmp = tmp->below) 860 for (; tmp; tmp = tmp->below)
843 { 861 {
844 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
845 continue; 863 continue;
846 864
847 if (!flag) 865 if (!flag)
… …
876 else 894 else
877 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
878 } 896 }
879} 897}
880 898
881
882
883/** Client wants to look at some object. Lets do so. */ 899/** Client wants to look at some object. Lets do so. */
884void 900void
885LookAt (char *buf, int len, player *pl) 901LookAt (char *buf, int len, player *pl)
886{ 902{
887 int dx, dy; 903 int dx, dy;
888 char *cp; 904 char *cp;
889 905
890 dx = atoi (buf); 906 dx = atoi (buf);
891 if (!(cp = strchr (buf, ' '))) 907 if (!(cp = strchr (buf, ' ')))
892 {
893 return; 908 return;
894 } 909
895 dy = atoi (cp); 910 dy = atoi (cp);
896
897 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 911 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
898 return; 912 return;
899 913
900 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 914 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
901 return; 915 return;
902 916

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines