ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
Revision: 1.63
Committed: Thu Apr 24 00:30:52 2008 UTC (16 years, 1 month ago) by root
Content type: text/plain
Branch: MAIN
CVS Tags: rel-2_52, rel-2_53
Changes since 1.62: +39 -63 lines
Log Message:
- optimise visible_to
- visible_to now only sends floor items when they might be visible
- optimised remove for the map case
- remove now clsoes containers that get removed from the floor
- work around possible client bug by forcign an item flag update for cointainers
- avoid superfluous floorbox resets

File Contents

# Content
1 /*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
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
10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */
23
24 /**
25 * \file
26 * Client/server logic.
27 *
28 * \date 2003-12-02
29 *
30 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent.
33 */
34
35 #include <global.h>
36 #include <object.h>
37 #include <sproto.h>
38
39 /** This is the maximum number of bytes we expect any one item to take up */
40 #define MAXITEMLEN 300
41
42 #if 0
43 tag_t
44 client_container::tag () const
45 {
46 switch (type)
47 {
48 case CC_INVENTORY:
49 return ns->pl->count;
50 case CC_MAPSPACE:
51 return 0;
52 case CC_CONTAINER:
53 return env->count;
54 }
55
56 abort ();
57 }
58
59 void
60 client_container::clear ()
61 {
62 switch (type)
63 {
64 case CC_INVENTORY:
65 abort ();
66
67 case CC_MAPSPACE:
68 case CC_CONTAINER:
69 ns->send_packet_printf ("delinv %d", tag ());
70 break;
71 }
72
73 for (iterator i = begin (); i != end (); ++i)
74 i->op->seen_by = 0;
75
76 vector< refitem, slice_allocator<refitem> >::clear ();
77 }
78
79 inline iterator
80 client_container::merge_item (iterator i, object *op)
81 {
82 if (i != end () && i->op == op)
83 return ++i;
84
85 if (op->seen_by)
86 return; // seen by another entity already
87
88 op->seen_by = this;
89
90 refitem ref;
91 ref.op = op;
92
93 return insert (i, ref);
94 }
95
96 void
97 client_container::update (int offset)
98 {
99 iterator i = begin ();
100
101 switch (type)
102 {
103 case CC_INVENTORY:
104 case CC_CONTAINER:
105 {
106 object *env = type == CC_INVENTORY
107 ? ns->pl->ob
108 : this->env;
109
110 // pass 1, erase all objects no longer in container
111 for (iterator j = begin (); j != end (); ++j)
112 if (j->op->env != env)
113 {
114 j->op->seen_by = 0;
115 erase (j);
116 }
117
118 // pass 2 merge items
119 for (object *op = env->inv; op; op = op->below)
120 {
121 if (--offset < 0)
122 i = merge_item (i, op);
123 else if (offset < -FLOORBOX_PAGESIZE)
124 break;
125 }
126 }
127 break;
128
129 case CC_MAPSPACE:
130 {
131 // pass 1, erase all objects no longer on space
132 for (iterator j = begin (); j != end (); ++j)
133 if (j->op->x != x || j->op->y != y || j->op->map != map)
134 {
135 j->op->seen_by = 0;
136 erase (j);
137 }
138
139 // pass 2 merge items
140 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
141 {
142 if (--offset < 0)
143 i = merge_item (i, op);
144 else if (offset < -FLOORBOX_PAGESIZE)
145 break;
146 }
147 }
148 break;
149 }
150
151 // pass 3, erase all extra items
152 for (iterator j = i; j != end (); ++j)
153 j->op->seen_by = 0;
154
155 if (i != end ())
156 erase (i, end ());
157 }
158
159 void
160 client_container::set_mapspace (maptile *map, int x, int y)
161 {
162 if (type == CC_MAPSPACE
163 && this->map == map
164 && this->x == x
165 && this->y == y)
166 return;
167
168 clear ();
169
170 type = CC_MAPSPACE;
171 this->map = map;
172 this->x = x;
173 this->y = y;
174 }
175
176 void
177 client_container::set_container (object *env)
178 {
179 }
180 #endif
181
182 /*******************************************************************************
183 *
184 * Functions related to sending object data to the client.
185 *
186 ******************************************************************************/
187
188 /**
189 * This is a similar to query_name, but returns flags
190 * to be sent to client.
191 */
192 unsigned int
193 query_flags (object *op)
194 {
195 unsigned int flags = 0;
196
197 if (QUERY_FLAG (op, FLAG_APPLIED))
198 switch (op->type)
199 {
200 case BOW:
201 case WAND:
202 case ROD:
203 case HORN:
204 flags = a_readied;
205 break;
206 case WEAPON:
207 flags = a_wielded;
208 break;
209 case SKILL:
210 case ARMOUR:
211 case HELMET:
212 case SHIELD:
213 case RING:
214 case BOOTS:
215 case GLOVES:
216 case AMULET:
217 case GIRDLE:
218 case BRACERS:
219 case CLOAK:
220 flags = a_worn;
221 break;
222 case CONTAINER:
223 flags = a_active;
224 break;
225 default:
226 flags = a_applied;
227 break;
228 }
229
230 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
231 flags |= F_OPEN;
232
233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
234 {
235 if (QUERY_FLAG (op, FLAG_DAMNED))
236 flags |= F_DAMNED;
237 else if (QUERY_FLAG (op, FLAG_CURSED))
238 flags |= F_CURSED;
239 }
240
241 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
242 flags |= F_MAGIC;
243 if (QUERY_FLAG (op, FLAG_UNPAID))
244 flags |= F_UNPAID;
245 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
246 flags |= F_LOCKED;
247
248 return flags;
249 }
250
251 /* Used in the send_look to put object head into packet
252 * sl for socket ns. Need socket to know if we need to send
253 * animation of face to the client.
254 */
255 static void
256 add_object_to_socklist (client &ns, packet &sl, object *head)
257 {
258 int flags, len, anim_speed;
259 char item_n[MAX_BUF];
260 const char *item_p;
261
262 flags = query_flags (head);
263 if (QUERY_FLAG (head, FLAG_NO_PICK))
264 flags |= F_NOPICK;
265
266 ns.send_face (head->face, -50);
267 ns.flush_fx ();
268
269 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
270 ns.send_animation (head->animation_id);
271
272 sl << uint32 (head->count)
273 << uint32 (flags)
274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
275 << uint32 (head->face);
276
277 if (!head->custom_name)
278 {
279 strncpy (item_n, query_base_name (head, 0), 127);
280 item_n[127] = 0;
281 len = strlen (item_n);
282 item_p = query_base_name (head, 1);
283 }
284 else
285 {
286 strncpy (item_n, head->custom_name, 127);
287 item_n[127] = 0;
288 len = strlen (item_n);
289 item_p = head->custom_name;
290 }
291
292 strncpy (item_n + len + 1, item_p, 127);
293 item_n[254] = 0;
294 len += strlen (item_n + 1 + len) + 1;
295
296 sl << data8 (item_n, len)
297 << uint16 (head->animation_id);
298
299 anim_speed = 0;
300 if (QUERY_FLAG (head, FLAG_ANIMATE))
301 {
302 if (head->anim_speed)
303 anim_speed = head->anim_speed;
304 else
305 {
306 if (fabs (head->speed) < 0.001)
307 anim_speed = 255;
308 else if (fabs (head->speed) >= 1.0)
309 anim_speed = 1;
310 else
311 anim_speed = (int) (1.0 / fabs (head->speed));
312 }
313
314 if (anim_speed > 255)
315 anim_speed = 255;
316 }
317
318 sl << uint8 (anim_speed)
319 << uint32 (head->nrof);
320
321 if (ns.itemcmd == 2)
322 sl << uint16 (head->client_type);
323
324 SET_FLAG (head, FLAG_CLIENT_SENT);
325 }
326
327 /**
328 * Send the look window. Don't need to do animations here
329 * This sends all the faces to the client, not just updates. This is
330 * because object ordering would otherwise be inconsistent.
331 */
332 void
333 esrv_draw_look (player *pl)
334 {
335 int got_one = 0, start_look = 0, end_look = 0;
336
337 object *ob = pl->ob;
338
339 if (!pl->ns->update_look)
340 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
342 return;
343 }
344
345 pl->ns->update_look = 0;
346
347 if (QUERY_FLAG (ob, FLAG_REMOVED)
348 || !ob->map
349 || ob->map->in_memory != MAP_ACTIVE
350 || out_of_map (ob->map, ob->x, ob->y))
351 return;
352
353 pl->ns->send_packet ("delinv 0");
354
355 packet sl;
356 sl.printf ("item%d ", pl->ns->itemcmd);
357
358 sl << uint32 (0);
359
360 pl->ns->send_face (empty_face, -50);
361 pl->ns->flush_fx ();
362
363 if (pl->ns->look_position)
364 {
365 char buf[80];
366 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
367
368 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
369 << uint32 (0)
370 << sint32 (-1)
371 << uint32 (empty_face)
372 << data8 (buf)
373 << uint16 (0)
374 << uint8 (0)
375 << uint32 (0);
376
377 if (pl->ns->itemcmd == 2)
378 sl << uint16 (0);
379 }
380
381 object *tmp = ob->ms ().top;
382 for (object *last = 0; tmp != last; tmp = tmp->below)
383 {
384 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
385 {
386 last = tmp->below; /* assumes double floor mode */
387 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
388 last = last->below;
389 }
390
391 if (tmp->client_visible ())
392 {
393 if (++start_look < pl->ns->look_position)
394 continue;
395
396 end_look++;
397
398 if (end_look > FLOORBOX_PAGESIZE)
399 {
400 /* What we basically do is make a 'fake' object - when the user applies it,
401 * we notice the special tag the object has, and act accordingly.
402 */
403 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
404 << uint32 (0)
405 << uint32 ((uint32) - 1)
406 << uint32 (empty_face)
407 << data8 ("Apply this to see next group of items")
408 << uint16 (0)
409 << uint8 (0)
410 << uint32 (0);
411
412 if (pl->ns->itemcmd == 2)
413 sl << uint16 (0);
414
415 break;
416 }
417
418 add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
419 got_one++;
420
421 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
422 {
423 pl->ns->send_packet (sl);
424
425 sl.reset ();
426 sl.printf ("item%d ", pl->ns->itemcmd);
427 sl << uint32 (0);
428 got_one = 0;
429 }
430 }
431 }
432
433 if (got_one)
434 pl->ns->send_packet (sl);
435
436 }
437
438 /**
439 * Sends whole inventory.
440 */
441 void
442 esrv_send_inventory (object *pl, object *op)
443 {
444 if (!pl->contr->ns)//D
445 return;
446
447 int got_one = 0;
448
449 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
450
451 packet sl;
452 sl.printf ("item%d ", pl->contr->ns->itemcmd);
453
454 sl << uint32 (op->count);
455
456 for (object *tmp = op->inv; tmp; tmp = tmp->below)
457 {
458 object *head;
459
460 if (tmp->head)
461 head = tmp->head;
462 else
463 head = tmp;
464
465 if (head->client_visible ())
466 {
467 add_object_to_socklist (*pl->contr->ns, sl, head);
468
469 got_one++;
470
471 /* IT is possible for players to accumulate a huge amount of
472 * items (especially with some of the bags out there) to
473 * overflow the buffer. IF so, send multiple item commands.
474 */
475 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
476 {
477 pl->contr->ns->send_packet (sl);
478
479 sl.reset ();
480 sl.printf ("item%d ", pl->contr->ns->itemcmd);
481 sl << uint32 (op->count);
482 got_one = 0;
483 }
484 }
485 }
486
487 if (got_one)
488 pl->contr->ns->send_packet (sl);
489 }
490
491 /**
492 * Updates object *op for player *pl.
493 *
494 * flags is a list of values to update
495 * to the client (as defined in newclient.h - might as well use the
496 * same value both places.
497 */
498 void
499 esrv_update_item (int flags, object *pl, object *op)
500 {
501 /* If we have a request to send the player item, skip a few checks. */
502 if (op != pl && !op->client_visible ())
503 return;
504
505 client *ns = pl->contr->ns;
506 if (!ns)
507 return;
508
509 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
510 {
511 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
512 * this is happening - we can set a breakpoint here in the debugger
513 * and track back the call.
514 */
515 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
516 }
517
518 packet sl ("upditem");
519
520 sl << uint8 (flags);
521
522 op = op->head_ ();
523
524 sl << uint32 (op->count);
525
526 if (flags & UPD_LOCATION)
527 sl << uint32 (op->env ? op->env->count : 0);
528
529 if (flags & UPD_FLAGS)
530 sl << uint32 (query_flags (op));
531
532 if (flags & UPD_WEIGHT)
533 {
534 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
535
536 if (op)
537 ns->last_weight = weight;
538
539 sl << uint32 (weight);
540 }
541
542 if (flags & UPD_FACE)
543 {
544 ns->send_face (op->face, -50);
545 ns->flush_fx ();
546 sl << uint32 (op->face);
547 }
548
549 if (flags & UPD_NAME)
550 {
551 int len;
552 const char *item_p;
553 char item_n[MAX_BUF];
554
555 if (!op->custom_name)
556 {
557 strncpy (item_n, query_base_name (op, 0), 127);
558 item_n[127] = 0;
559 len = strlen (item_n);
560 item_p = query_base_name (op, 1);
561 }
562 else
563 {
564 strncpy (item_n, op->custom_name, 127);
565 item_n[127] = 0;
566 len = strlen (item_n);
567 item_p = op->custom_name;
568 }
569
570 strncpy (item_n + len + 1, item_p, 127);
571 item_n[254] = 0;
572 len += strlen (item_n + 1 + len) + 1;
573
574 sl << data8 (item_n, len);
575 }
576
577 if (flags & UPD_ANIM)
578 sl << uint16 (op->animation_id);
579
580 if (flags & UPD_ANIMSPEED)
581 {
582 int anim_speed = 0;
583
584 if (QUERY_FLAG (op, FLAG_ANIMATE))
585 {
586 if (op->anim_speed)
587 anim_speed = op->anim_speed;
588 else
589 {
590 if (fabs (op->speed) < 0.001)
591 anim_speed = 255;
592 else if (fabs (op->speed) >= 1.0)
593 anim_speed = 1;
594 else
595 anim_speed = (int) (1.0 / fabs (op->speed));
596 }
597
598 if (anim_speed > 255)
599 anim_speed = 255;
600 }
601
602 sl << uint8 (anim_speed);
603 }
604
605 if (flags & UPD_NROF)
606 sl << uint32 (op->nrof);
607
608 pl->contr->ns->send_packet (sl);
609 }
610
611 /**
612 * Sends item's info to player.
613 */
614 void
615 esrv_send_item (object *pl, object *op)
616 {
617 if (!pl->contr->ns)
618 return;
619
620 /* We only send 'visible' objects to the client, and sometimes the player */
621 if (!op->client_visible () && op->type != PLAYER)
622 return;
623
624 packet sl;
625
626 sl.printf ("item%d ", pl->contr->ns->itemcmd);
627
628 op = op->head_ ();
629
630 sl << uint32 (op->env ? op->env->count : 0);
631
632 add_object_to_socklist (*pl->contr->ns, sl, op);
633
634 pl->contr->ns->send_packet (sl);
635 SET_FLAG (op, FLAG_CLIENT_SENT);
636 }
637
638 /**
639 * Tells the client to delete an item.
640 */
641 void
642 esrv_del_item (player *pl, int tag)
643 {
644 if (!pl->ns)
645 return;
646
647 packet sl ("delitem");
648
649 sl << uint32 (tag);
650
651 pl->ns->send_packet (sl);
652 }
653
654
655 /*******************************************************************************
656 *
657 * Client has requested us to do something with an object.
658 *
659 ******************************************************************************/
660
661 /**
662 * Takes a player and object count (tag) and returns the actual object
663 * pointer, or null if it can't be found.
664 */
665 object *
666 esrv_get_ob_from_count (object *pl, tag_t count)
667 {
668 if (pl->count == count)
669 return pl;
670
671 for (object *op = pl->inv; op; op = op->below)
672 if (op->count == count)
673 return op;
674 else if (op->type == CONTAINER && pl->container == op)
675 for (object *tmp = op->inv; tmp; tmp = tmp->below)
676 if (tmp->count == count)
677 return tmp;
678
679 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
680 if (op->head && op->head->count == count)
681 return op;
682 else if (op->count == count)
683 return op;
684 else if (op->type == CONTAINER && pl->container == op)
685 for (object *tmp = op->inv; tmp; tmp = tmp->below)
686 if (tmp->count == count)
687 return tmp;
688
689 #if 0
690 /* If the high bit is set, player examined a pseudo object. */
691 if (count & 0x80000000)
692 return 0;
693 #endif
694
695 return 0;
696 }
697
698 /** Client wants to examine some object. So lets do so. */
699 void
700 ExamineCmd (char *buf, int len, player *pl)
701 {
702 tag_t tag = atoi (buf);
703
704 object *op = esrv_get_ob_from_count (pl->ob, tag);
705
706 if (!op)
707 {
708 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
709 return;
710 }
711
712 examine (pl->ob, op);
713 }
714
715 /** Client wants to examine some object. So lets do so. */
716 void
717 ExCmd (char *buf, int len, player *pl)
718 {
719 tag_t tag = atoi (buf);
720
721 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
722 {
723 std::string s = op->describe (pl->ob);
724
725 packet sl ("ex");
726 sl << ber32 (tag) << s.c_str ();
727
728 pl->ns->send_packet (sl);
729 }
730 }
731
732 /** Client wants to apply some object. Lets do so. */
733 void
734 ApplyCmd (char *buf, int len, player *pl)
735 {
736 tag_t tag = atoi (buf);
737
738 /* sort of a hack, but if the player saves and the player then manually
739 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
740 */
741 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
742 return;
743
744 /* If the high bit is set, player applied a pseudo object. */
745 if (tag & 0x80000000)
746 {
747 pl->ns->look_position = tag & 0x7fffffff;
748 pl->ns->floorbox_update ();
749 return;
750 }
751
752 object *op = esrv_get_ob_from_count (pl->ob, tag);
753
754 if (!op)
755 {
756 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
757 return;
758 }
759
760 player_apply (pl->ob, op, 0, 0);
761 }
762
763 /** Client wants to lock some object. Lets do so. */
764 void
765 LockItem (char *data, int len, player *pl)
766 {
767 int flag = data[0];
768 tag_t tag = net_uint32 ((uint8 *)data + 1);
769 object *op = esrv_get_ob_from_count (pl->ob, tag);
770
771 if (!op)
772 {
773 pl->failmsg ("Could not find object to lock/unlock");
774 return;
775 }
776
777 if (!flag)
778 CLEAR_FLAG (op, FLAG_INV_LOCKED);
779 else
780 SET_FLAG (op, FLAG_INV_LOCKED);
781
782 esrv_update_item (UPD_FLAGS, pl->ob, op);
783 }
784
785 /** Client wants to mark some object. Lets do so. */
786 void
787 MarkItem (char *data, int len, player *pl)
788 {
789 tag_t tag = net_uint32 ((uint8 *)data);
790 object *op = esrv_get_ob_from_count (pl->ob, tag);
791
792 if (!op)
793 {
794 pl->failmsg ("Could not find object to mark");
795 return;
796 }
797
798 pl->mark = op;
799 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
800 }
801
802 /**
803 * look_at prints items on the specified square.
804 *
805 * [ removed EARTHWALL check and added check for containers inventory.
806 * Tero.Haatanen@lut.fi ]
807 */
808 static void
809 look_at (player *pl, int dx, int dy)
810 {
811 dynbuf_text buf;
812 object *ob = pl->ob;
813
814 if (!pl->observe->map)
815 return;
816
817 mapxy pos (pl->observe);
818 pos.move (dx, dy);
819
820 if (pos.normalise ())
821 for (object *tmp = pos->top; tmp; tmp = tmp->below)
822 {
823 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
824 continue;
825
826 if (QUERY_FLAG (ob, FLAG_WIZ))
827 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
828 else
829 buf.printf ("- %s.\n", query_name (tmp));
830
831 object *head = tmp->head_ ();
832
833 if (head->inv)
834 if ((head->type != CONTAINER && head->type != FLESH)
835 || QUERY_FLAG (ob, FLAG_WIZ))
836 buf << head->query_inventory (ob, " ");
837
838 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
839 break;
840 }
841
842 if (buf.empty ())
843 pl->failmsg ("You see nothing there.");
844 else
845 pl->infobox (MSG_CHANNEL ("lookat"), buf);
846 }
847
848 /** Client wants to look at some object. Lets do so. */
849 void
850 LookAt (char *buf, int len, player *pl)
851 {
852 char *cp;
853
854 int dx = atoi (buf);
855 if (!(cp = strchr (buf, ' ')))
856 return;
857
858 int dy = atoi (cp);
859
860 if (player *opl = pl->observe->contr)
861 if (client *ns = opl->ns)
862 {
863 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
864 return;
865
866 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
867 return;
868 }
869
870 look_at (pl, dx, dy);
871 }
872
873 /** Move an object to a new location */
874 void
875 esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
876 {
877 object *op, *env;
878
879 op = esrv_get_ob_from_count (pl, tag);
880 if (!op)
881 {
882 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
883 return;
884 }
885
886 if (!to)
887 { /* drop it to the ground */
888 if (op->map && !op->env)
889 return;
890
891 /* If it is an active container, then we should drop all objects
892 * in the container and not the container itself.
893 */
894 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
895 {
896 int cnt = MAX_ITEM_PER_DROP;
897
898 for (object *current = op->inv; current; )
899 {
900 object *next = current->below;
901
902 drop_object (pl, current, 0);
903
904 if (--cnt <= 0) break;
905
906 current = next;
907 }
908
909 if (cnt <= 0)
910 op->failmsg ("Only dropped some items, can't drop that many items at once.");
911 }
912 else
913 drop_object (pl, op, nrof);
914
915 return;
916 }
917 else if (to == pl->count)
918 { /* pick it up to the inventory */
919 /* return if player has already picked it up */
920 if (op->env == pl)
921 return;
922
923 pl->contr->count = nrof;
924 pick_up (pl, op);
925 return;
926 }
927
928 env = esrv_get_ob_from_count (pl, to);
929 if (!env)
930 {
931 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
932 return;
933 }
934
935 /* put_object_in_sack presumes that necessary sanity checking
936 * has already been done (eg, it can be picked up and fits in
937 * in a sack, so check for those things. We should also check
938 * an make sure env is in fact a container for that matter.
939 */
940 if (env->type == CONTAINER
941 && can_pick (pl, op)
942 && sack_can_hold (pl, env, op, nrof))
943 put_object_in_sack (pl, env, op, nrof);
944 }
945