ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
Revision: 1.37
Committed: Sat Feb 10 01:52:29 2007 UTC (17 years, 3 months ago) by root
Content type: text/plain
Branch: MAIN
Changes since 1.36: +0 -2 lines
Log Message:
hell on earth, rewrote the container code
- it really was a mess before
- open/close events should now be very reliable.
- make container an object_ptr, just to be on the safe side
  (the old code is known to crash, the new code should be reliable, but...).
- its also smaller, much smaller/clearer in sourcecode size and a bit
  smaller in text segment size.

also disable big worldmap again: is this still causing memleaks?

File Contents

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