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.38 by root, Sat Feb 10 21:01:10 2007 UTC vs.
Revision 1.59 by root, Tue Apr 22 02:46:18 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author 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 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 268 ns.send_face (head->face, -50);
270 esrv_send_face (&ns, head->face->number, 0); 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 esrv_send_animation (&ns, 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 : WEIGHT (head))
278 << uint32 (head->face->number); 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);
283 item_n[127] = 0; 282 item_n[127] = 0;
… …
331 * Send the look window. Don't need to do animations here 330 * Send the look window. Don't need to do animations here
332 * This sends all the faces to the client, not just updates. This is 331 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 332 * because object ordering would otherwise be inconsistent.
334 */ 333 */
335void 334void
336esrv_draw_look (object *pl) 335esrv_draw_look (player *pl)
337{ 336{
338 int got_one = 0, start_look = 0, end_look = 0; 337 int got_one = 0, start_look = 0, end_look = 0;
339 char buf[MAX_BUF];
340 338
339 object *ob = pl->ob;
340
341 if (!pl->contr->ns->update_look) 341 if (!pl->ns->update_look)
342 { 342 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 343 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
344 return; 344 return;
345 } 345 }
346 else 346 else
347 pl->contr->ns->update_look = 0; 347 pl->ns->update_look = 0;
348 348
349 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
350 || !pl->map 350 || !ob->map
351 || pl->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_ACTIVE
352 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
353 return; 353 return;
354 354
355 pl->contr->ns->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
356 356
357 packet sl; 357 packet sl;
358 sl.printf ("item%d ", pl->contr->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
359 359
360 sl << uint32 (0); 360 sl << uint32 (0);
361 361
362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 pl->ns->send_face (empty_face, -50);
363 esrv_send_face (pl->contr->ns, empty_face->number, 0); 363 pl->ns->flush_fx ();
364 364
365 if (pl->contr->ns->look_position) 365 if (pl->ns->look_position)
366 { 366 {
367 char buf[80]; 367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 369
370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
371 << uint32 (0) 371 << uint32 (0)
372 << sint32 (-1) 372 << sint32 (-1)
373 << uint32 (empty_face->number) 373 << uint32 (empty_face)
374 << data8 (buf) 374 << data8 (buf)
375 << uint16 (0) 375 << uint16 (0)
376 << uint8 (0) 376 << uint8 (0)
377 << uint32 (0); 377 << uint32 (0);
378 378
379 if (pl->contr->ns->itemcmd == 2) 379 if (pl->ns->itemcmd == 2)
380 sl << uint16 (0); 380 sl << uint16 (0);
381 } 381 }
382 382
383 object *tmp = pl->ms ().top; 383 object *tmp = ob->ms ().top;
384 for (object *last = 0; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
385 { 385 {
386 object *head; 386 object *head;
387 387
388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
… …
392 last = last->below; 392 last = last->below;
393 } 393 }
394 394
395 if (tmp->client_visible ()) 395 if (tmp->client_visible ())
396 { 396 {
397 if (++start_look < pl->contr->ns->look_position) 397 if (++start_look < pl->ns->look_position)
398 continue; 398 continue;
399 399
400 end_look++; 400 end_look++;
401 401
402 if (end_look > FLOORBOX_PAGESIZE) 402 if (end_look > FLOORBOX_PAGESIZE)
403 { 403 {
404 /* What we basically do is make a 'fake' object - when the user applies it, 404 /* What we basically do is make a 'fake' object - when the user applies it,
405 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
406 */ 406 */
407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0) 408 << uint32 (0)
409 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
410 << uint32 (empty_face->number) 410 << uint32 (empty_face)
411 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
412 << uint16 (0) 412 << uint16 (0)
413 << uint8 (0) 413 << uint8 (0)
414 << uint32 (0); 414 << uint32 (0);
415 415
416 if (pl->contr->ns->itemcmd == 2) 416 if (pl->ns->itemcmd == 2)
417 sl << uint16 (0); 417 sl << uint16 (0);
418 418
419 break; 419 break;
420 } 420 }
421 421
422 if (tmp->head) 422 if (tmp->head)
423 head = tmp->head; 423 head = tmp->head;
424 else 424 else
425 head = tmp; 425 head = tmp;
426 426
427 add_object_to_socklist (*pl->contr->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->contr->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
433 433
434 sl.reset (); 434 sl.reset ();
435 sl.printf ("item%d ", pl->contr->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
436 sl << uint32 (0); 436 sl << uint32 (0);
437 got_one = 0; 437 got_one = 0;
438 } 438 }
439 } 439 }
440 } 440 }
441 441
442 if (got_one) 442 if (got_one)
443 pl->contr->ns->send_packet (sl); 443 pl->ns->send_packet (sl);
444 444
445} 445}
446 446
447/** 447/**
448 * Sends whole inventory. 448 * Sends whole inventory.
… …
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);
… …
556 ns->last_weight = weight; 556 ns->last_weight = weight;
557 } 557 }
558 558
559 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
560 { 560 {
561 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 561 ns->send_face (op->face, -50);
562 esrv_send_face (ns, op->face->number, 0); 562 ns->flush_fx ();
563
564 sl << uint32 (op->face->number); 563 sl << uint32 (op->face);
565 } 564 }
566 565
567 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
568 { 567 {
569 int len; 568 int len;
… …
666 pl->contr->ns->send_packet (sl); 665 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT); 666 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 667}
669 668
670/** 669/**
671 * Tells the client to delete an item. Uses the item 670 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 671 */
674void 672void
675esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
676{ 674{
677 if (!pl->ns) 675 if (!pl->ns)
… …
693 691
694/** 692/**
695 * 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
696 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
697 */ 695 */
698
699object * 696object *
700esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
701{ 698{
702 object *op, *tmp;
703
704 if (pl->count == count) 699 if (pl->count == count)
705 return pl; 700 return pl;
706 701
707 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
708 if (op->count == count) 703 if (op->count == count)
709 return op; 704 return op;
710 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
711 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
712 if (tmp->count == count) 707 if (tmp->count == count)
713 return tmp; 708 return tmp;
714 709
715 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)
716 if (op->head && op->head->count == count) 711 if (op->head && op->head->count == count)
717 return op; 712 return op;
718 else if (op->count == count) 713 else if (op->count == count)
719 return op; 714 return op;
720 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
721 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
722 if (tmp->count == count) 717 if (tmp->count == count)
723 return tmp; 718 return tmp;
724 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
725 return 0; 726 return 0;
726} 727}
727 728
728
729/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
730void 730void
731ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
732{ 732{
733 tag_t tag = atoi (buf); 733 tag_t tag = atoi (buf);
734
735 /* If the high bit is set, player examined a pseudo object. */
736 if (tag & 0x80000000)
737 return;
738 734
739 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
740 736
741 if (!op) 737 if (!op)
742 { 738 {
743 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);
744 return; 740 return;
745 } 741 }
746 742
747 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 }
748} 761}
749 762
750/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
751void 764void
752ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
… …
786 tag_t tag = net_uint32 ((uint8 *)data + 1); 799 tag_t tag = net_uint32 ((uint8 *)data + 1);
787 object *op = esrv_get_ob_from_count (pl->ob, tag); 800 object *op = esrv_get_ob_from_count (pl->ob, tag);
788 801
789 if (!op) 802 if (!op)
790 { 803 {
791 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 804 pl->failmsg ("Could not find object to lock/unlock");
792 return; 805 return;
793 } 806 }
794 807
795 if (!flag) 808 if (!flag)
796 CLEAR_FLAG (op, FLAG_INV_LOCKED); 809 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
807 tag_t tag = net_uint32 ((uint8 *)data); 820 tag_t tag = net_uint32 ((uint8 *)data);
808 object *op = esrv_get_ob_from_count (pl->ob, tag); 821 object *op = esrv_get_ob_from_count (pl->ob, tag);
809 822
810 if (!op) 823 if (!op)
811 { 824 {
812 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 825 pl->failmsg ("Could not find object to mark");
813 return; 826 return;
814 } 827 }
815 828
816 pl->mark = op; 829 pl->mark = op;
817 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 830 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
818} 831}
819 832
820/** 833/**
821 * look_at prints items on the specified square. 834 * look_at prints items on the specified square.
822 * 835 *
823 * [ removed EARTHWALL check and added check for containers inventory. 836 * [ removed EARTHWALL check and added check for containers inventory.
824 * Tero.Haatanen@lut.fi ] 837 * Tero.Haatanen@lut.fi ]
825 */ 838 */
826void 839static void
827look_at (object *op, int dx, int dy) 840look_at (player *pl, int dx, int dy)
828{ 841{
829 object *tmp; 842 dynbuf_text buf;
830 int flag = 0; 843 object *ob = pl->ob;
831 sint16 x, y;
832 maptile *m;
833 844
834 x = op->x + dx; 845 if (!pl->observe->map)
835 y = op->y + dy;
836
837 if (out_of_map (op->map, x, y))
838 return; 846 return;
839 847
840 m = get_map_from_coord (op->map, &x, &y); 848 mapxy pos (pl->observe);
841 if (!m) 849 pos.move (dx, dy);
850
851 if (pos.normalise ())
852 for (object *tmp = pos->top; tmp; tmp = tmp->below)
853 {
854 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
855 continue;
856
857 if (QUERY_FLAG (ob, FLAG_WIZ))
858 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
859 else
860 buf.printf ("- %s.\n", query_name (tmp));
861
862 object *head = tmp->head_ ();
863
864 if (head->inv)
865 if ((head->type != CONTAINER && head->type != FLESH)
866 || QUERY_FLAG (ob, FLAG_WIZ))
867 buf << head->query_inventory (ob, " ");
868
869 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
870 break;
871 }
872
873 if (buf.empty ())
874 pl->failmsg ("You see nothing there.");
875 else
876 pl->infobox (MSG_CHANNEL ("lookat"), buf);
877}
878
879/** Client wants to look at some object. Lets do so. */
880void
881LookAt (char *buf, int len, player *pl)
882{
883 char *cp;
884
885 int dx = atoi (buf);
886 if (!(cp = strchr (buf, ' ')))
842 return; 887 return;
843 888
844 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
845
846 for (; tmp != NULL; tmp = tmp->below)
847 {
848 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
849 continue;
850
851 if (!flag)
852 {
853 if (dx || dy)
854 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
855 else
856 {
857 clear_win_info (op);
858 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
859 }
860 flag = 1;
861 }
862
863 if (QUERY_FLAG (op, FLAG_WIZ))
864 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
865 else
866 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
867
868 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
869 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
870 inventory (op, tmp->head == NULL ? tmp : tmp->head);
871
872 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
873 break;
874 }
875
876 if (!flag)
877 {
878 if (dx || dy)
879 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
880 else
881 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
882 }
883}
884
885/** Client wants to look at some object. Lets do so. */
886void
887LookAt (char *buf, int len, player *pl)
888{
889 int dx, dy;
890 char *cp;
891
892 dx = atoi (buf);
893 if (!(cp = strchr (buf, ' ')))
894 {
895 return;
896 }
897 dy = atoi (cp); 889 int dy = atoi (cp);
898 890
891 if (player *opl = pl->observe->contr)
892 if (client *ns = opl->ns)
893 {
899 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 894 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
900 return; 895 return;
901 896
902 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 897 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
903 return; 898 return;
899 }
904 900
905 look_at (pl->ob, dx, dy); 901 look_at (pl, dx, dy);
906} 902}
907 903
908/** Move an object to a new location */ 904/** Move an object to a new location */
909void 905void
910esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 906esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
928 */ 924 */
929 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
930 { 926 {
931 object *current, *next; 927 object *current, *next;
932 928
929 int cnt = MAX_ITEM_PER_DROP;
930
933 for (current = op->inv; current != NULL; current = next) 931 for (current = op->inv; current != NULL; current = next)
934 { 932 {
935 next = current->below; 933 next = current->below;
936 drop_object (pl, current, 0); 934 drop_object (pl, current, 0);
935
936 if (--cnt <= 0) break;
937 } 937 }
938
939 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once.");
938 941
939 esrv_update_item (UPD_WEIGHT, pl, op); 942 esrv_update_item (UPD_WEIGHT, pl, op);
940 } 943 }
941 else 944 else
942 drop_object (pl, op, nrof); 945 drop_object (pl, op, nrof);
946
947 update_after_inventory_change (pl);
943 948
944 return; 949 return;
945 } 950 }
946 else if (to == pl->count) 951 else if (to == pl->count)
947 { /* pick it up to the inventory */ 952 { /* pick it up to the inventory */
… …
965 * has already been done (eg, it can be picked up and fits in 970 * has already been done (eg, it can be picked up and fits in
966 * in a sack, so check for those things. We should also check 971 * in a sack, so check for those things. We should also check
967 * an make sure env is in fact a container for that matter. 972 * an make sure env is in fact a container for that matter.
968 */ 973 */
969 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 974 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
975 {
970 put_object_in_sack (pl, env, op, nrof); 976 put_object_in_sack (pl, env, op, nrof);
977 update_after_inventory_change (pl);
978 }
971} 979}
972 980

Diff Legend

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