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.40 by pippijn, Thu Mar 1 12:28:17 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 338
339 object *ob = pl->ob;
340
340 if (!pl->contr->ns->update_look) 341 if (!pl->ns->update_look)
341 { 342 {
342 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); 343 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
343 return; 344 return;
344 } 345 }
345 else 346 else
346 pl->contr->ns->update_look = 0; 347 pl->ns->update_look = 0;
347 348
348 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
349 || !pl->map 350 || !ob->map
350 || pl->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_ACTIVE
351 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
352 return; 353 return;
353 354
354 pl->contr->ns->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
355 356
356 packet sl; 357 packet sl;
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
358 359
359 sl << uint32 (0); 360 sl << uint32 (0);
360 361
361 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 pl->ns->send_face (empty_face, -50);
362 esrv_send_face (pl->contr->ns, empty_face->number, 0); 363 pl->ns->flush_fx ();
363 364
364 if (pl->contr->ns->look_position) 365 if (pl->ns->look_position)
365 { 366 {
366 char buf[80]; 367 char buf[80];
367 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);
368 369
369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
370 << uint32 (0) 371 << uint32 (0)
371 << sint32 (-1) 372 << sint32 (-1)
372 << uint32 (empty_face->number) 373 << uint32 (empty_face)
373 << data8 (buf) 374 << data8 (buf)
374 << uint16 (0) 375 << uint16 (0)
375 << uint8 (0) 376 << uint8 (0)
376 << uint32 (0); 377 << uint32 (0);
377 378
378 if (pl->contr->ns->itemcmd == 2) 379 if (pl->ns->itemcmd == 2)
379 sl << uint16 (0); 380 sl << uint16 (0);
380 } 381 }
381 382
382 object *tmp = pl->ms ().top; 383 object *tmp = ob->ms ().top;
383 for (object *last = 0; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
384 { 385 {
385 object *head; 386 object *head;
386 387
387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
… …
391 last = last->below; 392 last = last->below;
392 } 393 }
393 394
394 if (tmp->client_visible ()) 395 if (tmp->client_visible ())
395 { 396 {
396 if (++start_look < pl->contr->ns->look_position) 397 if (++start_look < pl->ns->look_position)
397 continue; 398 continue;
398 399
399 end_look++; 400 end_look++;
400 401
401 if (end_look > FLOORBOX_PAGESIZE) 402 if (end_look > FLOORBOX_PAGESIZE)
402 { 403 {
403 /* 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,
404 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
405 */ 406 */
406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
407 << uint32 (0) 408 << uint32 (0)
408 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
409 << uint32 (empty_face->number) 410 << uint32 (empty_face)
410 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
411 << uint16 (0) 412 << uint16 (0)
412 << uint8 (0) 413 << uint8 (0)
413 << uint32 (0); 414 << uint32 (0);
414 415
415 if (pl->contr->ns->itemcmd == 2) 416 if (pl->ns->itemcmd == 2)
416 sl << uint16 (0); 417 sl << uint16 (0);
417 418
418 break; 419 break;
419 } 420 }
420 421
421 if (tmp->head) 422 if (tmp->head)
422 head = tmp->head; 423 head = tmp->head;
423 else 424 else
424 head = tmp; 425 head = tmp;
425 426
426 add_object_to_socklist (*pl->contr->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
427 got_one++; 428 got_one++;
428 429
429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
430 { 431 {
431 pl->contr->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
432 433
433 sl.reset (); 434 sl.reset ();
434 sl.printf ("item%d ", pl->contr->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
435 sl << uint32 (0); 436 sl << uint32 (0);
436 got_one = 0; 437 got_one = 0;
437 } 438 }
438 } 439 }
439 } 440 }
440 441
441 if (got_one) 442 if (got_one)
442 pl->contr->ns->send_packet (sl); 443 pl->ns->send_packet (sl);
443 444
444} 445}
445 446
446/** 447/**
447 * Sends whole inventory. 448 * Sends whole inventory.
… …
478 479
479 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
480 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
481 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
482 */ 483 */
483 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
484 { 485 {
485 pl->contr->ns->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
486 487
487 sl.reset (); 488 sl.reset ();
488 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
555 ns->last_weight = weight; 556 ns->last_weight = weight;
556 } 557 }
557 558
558 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
559 { 560 {
560 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 561 ns->send_face (op->face, -50);
561 esrv_send_face (ns, op->face->number, 0); 562 ns->flush_fx ();
562
563 sl << uint32 (op->face->number); 563 sl << uint32 (op->face);
564 } 564 }
565 565
566 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
567 { 567 {
568 int len; 568 int len;
… …
665 pl->contr->ns->send_packet (sl); 665 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT); 666 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 667}
668 668
669/** 669/**
670 * Tells the client to delete an item. Uses the item 670 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 671 */
673void 672void
674esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
675{ 674{
676 if (!pl->ns) 675 if (!pl->ns)
… …
692 691
693/** 692/**
694 * 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
695 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
696 */ 695 */
697
698object * 696object *
699esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
700{ 698{
701 object *op, *tmp;
702
703 if (pl->count == count) 699 if (pl->count == count)
704 return pl; 700 return pl;
705 701
706 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
707 if (op->count == count) 703 if (op->count == count)
708 return op; 704 return op;
709 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
710 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
711 if (tmp->count == count) 707 if (tmp->count == count)
712 return tmp; 708 return tmp;
713 709
714 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)
715 if (op->head && op->head->count == count) 711 if (op->head && op->head->count == count)
716 return op; 712 return op;
717 else if (op->count == count) 713 else if (op->count == count)
718 return op; 714 return op;
719 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
720 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
721 if (tmp->count == count) 717 if (tmp->count == count)
722 return tmp; 718 return tmp;
723 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
724 return 0; 726 return 0;
725} 727}
726 728
727
728/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
729void 730void
730ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
731{ 732{
732 tag_t tag = atoi (buf); 733 tag_t tag = atoi (buf);
733
734 /* If the high bit is set, player examined a pseudo object. */
735 if (tag & 0x80000000)
736 return;
737 734
738 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
739 736
740 if (!op) 737 if (!op)
741 { 738 {
742 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);
743 return; 740 return;
744 } 741 }
745 742
746 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 }
747} 761}
748 762
749/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
750void 764void
751ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
… …
785 tag_t tag = net_uint32 ((uint8 *)data + 1); 799 tag_t tag = net_uint32 ((uint8 *)data + 1);
786 object *op = esrv_get_ob_from_count (pl->ob, tag); 800 object *op = esrv_get_ob_from_count (pl->ob, tag);
787 801
788 if (!op) 802 if (!op)
789 { 803 {
790 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");
791 return; 805 return;
792 } 806 }
793 807
794 if (!flag) 808 if (!flag)
795 CLEAR_FLAG (op, FLAG_INV_LOCKED); 809 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
806 tag_t tag = net_uint32 ((uint8 *)data); 820 tag_t tag = net_uint32 ((uint8 *)data);
807 object *op = esrv_get_ob_from_count (pl->ob, tag); 821 object *op = esrv_get_ob_from_count (pl->ob, tag);
808 822
809 if (!op) 823 if (!op)
810 { 824 {
811 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 825 pl->failmsg ("Could not find object to mark");
812 return; 826 return;
813 } 827 }
814 828
815 pl->mark = op; 829 pl->mark = op;
816 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)));
817} 831}
818 832
819/** 833/**
820 * look_at prints items on the specified square. 834 * look_at prints items on the specified square.
821 * 835 *
822 * [ removed EARTHWALL check and added check for containers inventory. 836 * [ removed EARTHWALL check and added check for containers inventory.
823 * Tero.Haatanen@lut.fi ] 837 * Tero.Haatanen@lut.fi ]
824 */ 838 */
825void 839static void
826look_at (object *op, int dx, int dy) 840look_at (player *pl, int dx, int dy)
827{ 841{
828 object *tmp; 842 dynbuf_text buf;
829 int flag = 0; 843 object *ob = pl->ob;
830 sint16 x, y;
831 maptile *m;
832 844
833 x = op->x + dx; 845 if (!pl->observe->map)
834 y = op->y + dy;
835
836 if (out_of_map (op->map, x, y))
837 return; 846 return;
838 847
839 m = get_map_from_coord (op->map, &x, &y); 848 mapxy pos (pl->observe);
840 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, ' ')))
841 return; 887 return;
842 888
843 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
844
845 for (; tmp != NULL; tmp = tmp->below)
846 {
847 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
848 continue;
849
850 if (!flag)
851 {
852 if (dx || dy)
853 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
854 else
855 {
856 clear_win_info (op);
857 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
858 }
859 flag = 1;
860 }
861
862 if (QUERY_FLAG (op, FLAG_WIZ))
863 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
864 else
865 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
866
867 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
868 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
869 inventory (op, tmp->head == NULL ? tmp : tmp->head);
870
871 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
872 break;
873 }
874
875 if (!flag)
876 {
877 if (dx || dy)
878 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
879 else
880 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
881 }
882}
883
884/** Client wants to look at some object. Lets do so. */
885void
886LookAt (char *buf, int len, player *pl)
887{
888 int dx, dy;
889 char *cp;
890
891 dx = atoi (buf);
892 if (!(cp = strchr (buf, ' ')))
893 {
894 return;
895 }
896 dy = atoi (cp); 889 int dy = atoi (cp);
897 890
891 if (player *opl = pl->observe->contr)
892 if (client *ns = opl->ns)
893 {
898 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)
899 return; 895 return;
900 896
901 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])
902 return; 898 return;
899 }
903 900
904 look_at (pl->ob, dx, dy); 901 look_at (pl, dx, dy);
905} 902}
906 903
907/** Move an object to a new location */ 904/** Move an object to a new location */
908void 905void
909esrv_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)
… …
927 */ 924 */
928 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
929 { 926 {
930 object *current, *next; 927 object *current, *next;
931 928
929 int cnt = MAX_ITEM_PER_DROP;
930
932 for (current = op->inv; current != NULL; current = next) 931 for (current = op->inv; current != NULL; current = next)
933 { 932 {
934 next = current->below; 933 next = current->below;
935 drop_object (pl, current, 0); 934 drop_object (pl, current, 0);
935
936 if (--cnt <= 0) break;
936 } 937 }
938
939 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once.");
937 941
938 esrv_update_item (UPD_WEIGHT, pl, op); 942 esrv_update_item (UPD_WEIGHT, pl, op);
939 } 943 }
940 else 944 else
941 drop_object (pl, op, nrof); 945 drop_object (pl, op, nrof);
946
947 update_after_inventory_change (pl);
942 948
943 return; 949 return;
944 } 950 }
945 else if (to == pl->count) 951 else if (to == pl->count)
946 { /* pick it up to the inventory */ 952 { /* pick it up to the inventory */
… …
964 * 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
965 * 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
966 * 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.
967 */ 973 */
968 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 {
969 put_object_in_sack (pl, env, op, nrof); 976 put_object_in_sack (pl, env, op, nrof);
977 update_after_inventory_change (pl);
978 }
970} 979}
971 980

Diff Legend

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