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.48 by root, Fri Jun 8 09:18:31 2007 UTC vs.
Revision 1.62 by root, Wed Apr 23 07:49:57 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client/server logic. 26 * Client/server logic.
… …
264 263
265 flags = query_flags (head); 264 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 265 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 266 flags |= F_NOPICK;
268 267
269 ns.send_face (head->face); 268 ns.send_face (head->face, -50);
270 ns.flush_fx (); 269 ns.flush_fx ();
271 270
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 ns.send_animation (head->animation_id); 272 ns.send_animation (head->animation_id);
274 273
275 sl << uint32 (head->count) 274 sl << uint32 (head->count)
276 << uint32 (flags) 275 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278 << uint32 (head->face); 277 << uint32 (head->face);
279 278
280 if (!head->custom_name) 279 if (!head->custom_name)
281 { 280 {
282 strncpy (item_n, query_base_name (head, 0), 127); 281 strncpy (item_n, query_base_name (head, 0), 127);
… …
347 else 346 else
348 pl->ns->update_look = 0; 347 pl->ns->update_look = 0;
349 348
350 if (QUERY_FLAG (ob, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
351 || !ob->map 350 || !ob->map
352 || ob->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_ACTIVE
353 || out_of_map (ob->map, ob->x, ob->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
354 return; 353 return;
355 354
356 pl->ns->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
357 356
358 packet sl; 357 packet sl;
359 sl.printf ("item%d ", pl->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
360 359
361 sl << uint32 (0); 360 sl << uint32 (0);
362 361
363 pl->ns->send_face (empty_face); 362 pl->ns->send_face (empty_face, -50);
364 pl->ns->flush_fx (); 363 pl->ns->flush_fx ();
365 364
366 if (pl->ns->look_position) 365 if (pl->ns->look_position)
367 { 366 {
368 char buf[80]; 367 char buf[80];
… …
426 head = tmp; 425 head = tmp;
427 426
428 add_object_to_socklist (*pl->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
429 got_one++; 428 got_one++;
430 429
431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
432 { 431 {
433 pl->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
434 433
435 sl.reset (); 434 sl.reset ();
436 sl.printf ("item%d ", pl->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
… …
480 479
481 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
482 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
483 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
484 */ 483 */
485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
486 { 485 {
487 pl->contr->ns->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
488 487
489 sl.reset (); 488 sl.reset ();
490 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
507 */ 506 */
508void 507void
509esrv_update_item (int flags, object *pl, object *op) 508esrv_update_item (int flags, object *pl, object *op)
510{ 509{
511 /* If we have a request to send the player item, skip a few checks. */ 510 /* If we have a request to send the player item, skip a few checks. */
512 if (op != pl)
513 {
514 if (!op->client_visible ()) 511 if (op != pl && !op->client_visible ())
515 return; 512 return;
516 /* we remove the check for op->env, because in theory, the object
517 * is hopefully in the same place, so the client should preserve
518 * order.
519 */
520 }
521 513
522 client *ns = pl->contr->ns; 514 client *ns = pl->contr->ns;
523 if (!ns) 515 if (!ns)
524 return; 516 return;
525 517
… …
547 if (flags & UPD_FLAGS) 539 if (flags & UPD_FLAGS)
548 sl << uint32 (query_flags (op)); 540 sl << uint32 (query_flags (op));
549 541
550 if (flags & UPD_WEIGHT) 542 if (flags & UPD_WEIGHT)
551 { 543 {
552 sint32 weight = WEIGHT (op); 544 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
553 545
554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
555
556 if (pl == op) 546 if (op)
557 ns->last_weight = weight; 547 ns->last_weight = weight;
548
549 sl << uint32 (weight);
558 } 550 }
559 551
560 if (flags & UPD_FACE) 552 if (flags & UPD_FACE)
561 { 553 {
562 ns->send_face (op->face); 554 ns->send_face (op->face, -50);
563 ns->flush_fx (); 555 ns->flush_fx ();
564 sl << uint32 (op->face); 556 sl << uint32 (op->face);
565 } 557 }
566 558
567 if (flags & UPD_NAME) 559 if (flags & UPD_NAME)
… …
636 return; 628 return;
637 629
638 /* If this is not the player object, do some more checks */ 630 /* If this is not the player object, do some more checks */
639 if (op != pl) 631 if (op != pl)
640 { 632 {
641 /* We only send 'visibile' objects to the client */ 633 /* We only send 'visible' objects to the client */
642 if (!op->client_visible ()) 634 if (!op->client_visible ())
643 return; 635 return;
644 636
645 /* if the item is on the ground, mark that the look needs to 637 /* if the item is on the ground, mark that the look needs to
646 * be updated. 638 * be updated.
… …
666 pl->contr->ns->send_packet (sl); 658 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT); 659 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 660}
669 661
670/** 662/**
671 * Tells the client to delete an item. Uses the item 663 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 664 */
674void 665void
675esrv_del_item (player *pl, int tag) 666esrv_del_item (player *pl, int tag)
676{ 667{
677 if (!pl->ns) 668 if (!pl->ns)
… …
801 tag_t tag = net_uint32 ((uint8 *)data + 1); 792 tag_t tag = net_uint32 ((uint8 *)data + 1);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 793 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 794
804 if (!op) 795 if (!op)
805 { 796 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 797 pl->failmsg ("Could not find object to lock/unlock");
807 return; 798 return;
808 } 799 }
809 800
810 if (!flag) 801 if (!flag)
811 CLEAR_FLAG (op, FLAG_INV_LOCKED); 802 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
822 tag_t tag = net_uint32 ((uint8 *)data); 813 tag_t tag = net_uint32 ((uint8 *)data);
823 object *op = esrv_get_ob_from_count (pl->ob, tag); 814 object *op = esrv_get_ob_from_count (pl->ob, tag);
824 815
825 if (!op) 816 if (!op)
826 { 817 {
827 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 818 pl->failmsg ("Could not find object to mark");
828 return; 819 return;
829 } 820 }
830 821
831 pl->mark = op; 822 pl->mark = op;
832 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 823 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
833} 824}
834 825
835/** 826/**
836 * look_at prints items on the specified square. 827 * look_at prints items on the specified square.
837 * 828 *
… …
839 * Tero.Haatanen@lut.fi ] 830 * Tero.Haatanen@lut.fi ]
840 */ 831 */
841static void 832static void
842look_at (player *pl, int dx, int dy) 833look_at (player *pl, int dx, int dy)
843{ 834{
835 dynbuf_text buf;
844 object *ob = pl->ob; 836 object *ob = pl->ob;
845 837
846 maptile *m = pl->observe->map; 838 if (!pl->observe->map)
847 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy;
849
850 if (!xy_normalise (m, x, y))
851 {
852 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853 return; 839 return;
854 }
855 840
856 int flag = 0; 841 mapxy pos (pl->observe);
842 pos.move (dx, dy);
857 843
844 if (pos.normalise ())
858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) 845 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 { 846 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 847 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue; 848 continue;
862 849
863 if (!flag)
864 {
865 if (dx || dy)
866 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
867 else
868 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
869
870 flag = 1;
871 }
872
873 if (QUERY_FLAG (ob, FLAG_WIZ)) 850 if (QUERY_FLAG (ob, FLAG_WIZ))
874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); 851 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
875 else 852 else
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 853 buf.printf ("- %s.\n", query_name (tmp));
877 854
878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 855 object *head = tmp->head_ ();
879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
881 856
857 if (head->inv)
858 if ((head->type != CONTAINER && head->type != FLESH)
859 || QUERY_FLAG (ob, FLAG_WIZ))
860 buf << head->query_inventory (ob, " ");
861
882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 862 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
883 break; 863 break;
884 } 864 }
885 865
886 if (!flag) 866 if (buf.empty ())
887 { 867 pl->failmsg ("You see nothing there.");
888 if (dx || dy)
889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
890 else 868 else
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 869 pl->infobox (MSG_CHANNEL ("lookat"), buf);
892 }
893} 870}
894 871
895/** Client wants to look at some object. Lets do so. */ 872/** Client wants to look at some object. Lets do so. */
896void 873void
897LookAt (char *buf, int len, player *pl) 874LookAt (char *buf, int len, player *pl)
… …
938 /* If it is an active container, then we should drop all objects 915 /* If it is an active container, then we should drop all objects
939 * in the container and not the container itself. 916 * in the container and not the container itself.
940 */ 917 */
941 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 918 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
942 { 919 {
943 object *current, *next; 920 int cnt = MAX_ITEM_PER_DROP;
944 921
945 for (current = op->inv; current != NULL; current = next) 922 for (object *current = op->inv; current; )
946 { 923 {
947 next = current->below; 924 object *next = current->below;
925
948 drop_object (pl, current, 0); 926 drop_object (pl, current, 0);
927
928 if (--cnt <= 0) break;
929
930 current = next;
949 } 931 }
950 932
951 esrv_update_item (UPD_WEIGHT, pl, op); 933 if (cnt <= 0)
934 op->failmsg ("Only dropped some items, can't drop that many items at once.");
952 } 935 }
953 else 936 else
954 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
955 938
956 return; 939 return;
… …
976 /* put_object_in_sack presumes that necessary sanity checking 959 /* put_object_in_sack presumes that necessary sanity checking
977 * has already been done (eg, it can be picked up and fits in 960 * has already been done (eg, it can be picked up and fits in
978 * in a sack, so check for those things. We should also check 961 * in a sack, so check for those things. We should also check
979 * an make sure env is in fact a container for that matter. 962 * an make sure env is in fact a container for that matter.
980 */ 963 */
981 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 964 if (env->type == CONTAINER
965 && can_pick (pl, op)
966 && sack_can_hold (pl, env, op, nrof))
982 put_object_in_sack (pl, env, op, nrof); 967 put_object_in_sack (pl, env, op, nrof);
983} 968}
984 969

Diff Legend

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