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.64 by root, Mon May 5 22:03:22 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.
… …
194query_flags (object *op) 193query_flags (object *op)
195{ 194{
196 unsigned int flags = 0; 195 unsigned int flags = 0;
197 196
198 if (QUERY_FLAG (op, FLAG_APPLIED)) 197 if (QUERY_FLAG (op, FLAG_APPLIED))
199 {
200 switch (op->type) 198 switch (op->type)
201 { 199 {
202 case BOW: 200 case BOW:
203 case WAND: 201 case WAND:
204 case ROD: 202 case ROD:
205 case HORN: 203 case HORN:
206 flags = a_readied; 204 flags = a_readied;
207 break; 205 break;
208 case WEAPON: 206 case WEAPON:
209 flags = a_wielded; 207 flags = a_wielded;
210 break; 208 break;
211 case SKILL: 209 case SKILL:
212 case ARMOUR: 210 case ARMOUR:
213 case HELMET: 211 case HELMET:
214 case SHIELD: 212 case SHIELD:
215 case RING: 213 case RING:
216 case BOOTS: 214 case BOOTS:
217 case GLOVES: 215 case GLOVES:
218 case AMULET: 216 case AMULET:
219 case GIRDLE: 217 case GIRDLE:
220 case BRACERS: 218 case BRACERS:
221 case CLOAK: 219 case CLOAK:
222 flags = a_worn; 220 flags = a_worn;
223 break; 221 break;
224 case CONTAINER: 222 case CONTAINER:
225 flags = a_active; 223 flags = a_active;
226 break; 224 break;
227 default: 225 default:
228 flags = a_applied; 226 flags = a_applied;
229 break; 227 break;
230 } 228 }
231 }
232 229
233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 230 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
234 flags |= F_OPEN; 231 flags |= F_OPEN;
235 232
236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
264 261
265 flags = query_flags (head); 262 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 263 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 264 flags |= F_NOPICK;
268 265
269 ns.send_face (head->face); 266 ns.send_face (head->face, -50);
270 ns.flush_fx (); 267 ns.flush_fx ();
271 268
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 269 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 ns.send_animation (head->animation_id); 270 ns.send_animation (head->animation_id);
274 271
275 sl << uint32 (head->count) 272 sl << uint32 (head->count)
276 << uint32 (flags) 273 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278 << uint32 (head->face); 275 << uint32 (head->face);
279 276
280 if (!head->custom_name) 277 if (!head->custom_name)
281 { 278 {
282 strncpy (item_n, query_base_name (head, 0), 127); 279 strncpy (item_n, query_base_name (head, 0), 127);
… …
325 sl << uint16 (head->client_type); 322 sl << uint16 (head->client_type);
326 323
327 SET_FLAG (head, FLAG_CLIENT_SENT); 324 SET_FLAG (head, FLAG_CLIENT_SENT);
328} 325}
329 326
327static faceidx
328need_face_now (player *pl, const char *name)
329{
330 faceidx face = face_find (name, empty_face);
331
332 pl->ns->send_face (face, -50);
333 pl->ns->flush_fx ();
334
335 return face;
336}
337
338#define FINGER_UP "finger_up.x11"
339#define FINGER_DOWN "finger_down.x11"
340
330/** 341/**
331 * Send the look window. Don't need to do animations here 342 * 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 343 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 344 * because object ordering would otherwise be inconsistent.
334 */ 345 */
335void 346void
336esrv_draw_look (player *pl) 347esrv_draw_look (player *pl)
337{ 348{
338 int got_one = 0, start_look = 0, end_look = 0;
339
340 object *ob = pl->ob; 349 object *ob = pl->ob;
341 350
342 if (!pl->ns->update_look) 351 if (!pl->ns->update_look)
343 { 352 {
344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 353 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
345 return; 354 return;
346 } 355 }
347 else 356
348 pl->ns->update_look = 0; 357 pl->ns->update_look = 0;
349 358
350 if (QUERY_FLAG (ob, FLAG_REMOVED) 359 if (QUERY_FLAG (ob, FLAG_REMOVED)
351 || !ob->map 360 || !ob->map
352 || ob->map->in_memory != MAP_IN_MEMORY 361 || ob->map->in_memory != MAP_ACTIVE
353 || out_of_map (ob->map, ob->x, ob->y)) 362 || out_of_map (ob->map, ob->x, ob->y))
354 return; 363 return;
355 364
356 pl->ns->send_packet ("delinv 0"); 365 pl->ns->send_packet ("delinv 0");
357 366
358 packet sl; 367 packet sl;
359 sl.printf ("item%d ", pl->ns->itemcmd); 368 sl.printf ("item%d ", pl->ns->itemcmd);
360 369
361 sl << uint32 (0); 370 sl << uint32 (0);
362 371
363 pl->ns->send_face (empty_face); 372 int start_pos = pl->ns->look_position;
364 pl->ns->flush_fx (); 373 bool dirty = false;
365 374
366 if (pl->ns->look_position) 375 mapspace &ms = ob->ms ();
376
377 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
378 // start from the top
379 object *items [FLOORBOX_PAGESIZE];
380 int item_idx = 0, item_cnt = 0;
381 int pos = 0;
382
383 // find our items by walking down
384 object *item = ms.top;
385
386 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
387 {
388 if (!item->client_visible ())
389 continue;
390
391 if (++pos < start_pos)
392 continue;
393
394 // record item
395 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
396 item_cnt++;
397
398 // stop at first floor
399 if (item->flag [FLAG_IS_FLOOR])
400 {
401 // we are finished, don't append "next group of items"
402 // by setting item to ms.bot it becomes zero which is checked after the while loop
403 item = ms.bot;
404 }
367 { 405 }
368 char buf[80];
369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
370 406
407 // see if there are more if we cared - we ignore invisible objects
408 if (item)
409 {
410 /* What we basically do is make a 'fake' object - when the user applies it,
411 * we notice the special tag the object has, and act accordingly.
412 */
371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 413 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
372 << uint32 (0) 414 << uint32 (0)
373 << sint32 (-1) 415 << uint32 ((uint32) - 1)
374 << uint32 (empty_face) 416 << uint32 (need_face_now (pl, FINGER_DOWN))
375 << data8 (buf) 417 << data8 ("Apply this to see the items below")
376 << uint16 (0) 418 << uint16 (0)
377 << uint8 (0) 419 << uint8 (0)
378 << uint32 (0); 420 << uint32 (0);
379 421
380 if (pl->ns->itemcmd == 2) 422 if (pl->ns->itemcmd == 2)
381 sl << uint16 (0); 423 sl << uint16 (0);
382 }
383 424
384 object *tmp = ob->ms ().top; 425 dirty = true;
385 for (object *last = 0; tmp != last; tmp = tmp->below)
386 { 426 }
387 object *head;
388 427
389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 428 // now send out all items in the ring buffer in reverse order
429 while (item_cnt)
430 {
431 --item_cnt;
432 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
433 object *item = items [item_idx];
434
435 add_object_to_socklist (*pl->ns, sl, item->head_ ());
436
437 dirty = true;
438
439 // if packet got too large, send it and begin a new one
440 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
390 { 441 {
391 last = tmp->below; /* assumes double floor mode */ 442 pl->ns->send_packet (sl);
392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 443
393 last = last->below; 444 sl.reset ();
445 sl.printf ("item%d ", pl->ns->itemcmd);
446 sl << uint32 (0);
447
448 dirty = false;
394 } 449 }
395
396 if (tmp->client_visible ())
397 {
398 if (++start_look < pl->ns->look_position)
399 continue;
400
401 end_look++;
402
403 if (end_look > FLOORBOX_PAGESIZE)
404 {
405 /* What we basically do is make a 'fake' object - when the user applies it,
406 * we notice the special tag the object has, and act accordingly.
407 */
408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
409 << uint32 (0)
410 << uint32 ((uint32) - 1)
411 << uint32 (empty_face)
412 << data8 ("Apply this to see next group of items")
413 << uint16 (0)
414 << uint8 (0)
415 << uint32 (0);
416
417 if (pl->ns->itemcmd == 2)
418 sl << uint16 (0);
419
420 break;
421 }
422
423 if (tmp->head)
424 head = tmp->head;
425 else
426 head = tmp;
427
428 add_object_to_socklist (*pl->ns, sl, head);
429 got_one++;
430
431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
432 {
433 pl->ns->send_packet (sl);
434
435 sl.reset ();
436 sl.printf ("item%d ", pl->ns->itemcmd);
437 sl << uint32 (0);
438 got_one = 0;
439 }
440 }
441 } 450 }
442 451
443 if (got_one) 452 if (start_pos)
453 {
454 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
455 << uint32 (0)
456 << sint32 (-1)
457 << uint32 (need_face_now (pl, FINGER_UP))
458 << data8 ("Apply this to see the items higher up")
459 << uint16 (0)
460 << uint8 (0)
461 << uint32 (0);
462
463 if (pl->ns->itemcmd == 2)
464 sl << uint16 (0);
465
466 dirty = true;
467 }
468
469 if (dirty)
444 pl->ns->send_packet (sl); 470 pl->ns->send_packet (sl);
445
446} 471}
447 472
448/** 473/**
449 * Sends whole inventory. 474 * Sends whole inventory.
450 */ 475 */
… …
480 505
481 /* IT is possible for players to accumulate a huge amount of 506 /* IT is possible for players to accumulate a huge amount of
482 * items (especially with some of the bags out there) to 507 * items (especially with some of the bags out there) to
483 * overflow the buffer. IF so, send multiple item commands. 508 * overflow the buffer. IF so, send multiple item commands.
484 */ 509 */
485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 510 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
486 { 511 {
487 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
488 513
489 sl.reset (); 514 sl.reset ();
490 sl.printf ("item%d ", pl->contr->ns->itemcmd); 515 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
507 */ 532 */
508void 533void
509esrv_update_item (int flags, object *pl, object *op) 534esrv_update_item (int flags, object *pl, object *op)
510{ 535{
511 /* If we have a request to send the player item, skip a few checks. */ 536 /* If we have a request to send the player item, skip a few checks. */
512 if (op != pl)
513 {
514 if (!op->client_visible ()) 537 if (op != pl && !op->client_visible ())
515 return; 538 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 539
522 client *ns = pl->contr->ns; 540 client *ns = pl->contr->ns;
523 if (!ns) 541 if (!ns)
524 return; 542 return;
525 543
… …
534 552
535 packet sl ("upditem"); 553 packet sl ("upditem");
536 554
537 sl << uint8 (flags); 555 sl << uint8 (flags);
538 556
539 if (op->head)
540 op = op->head; 557 op = op->head_ ();
541 558
542 sl << uint32 (op->count); 559 sl << uint32 (op->count);
543 560
544 if (flags & UPD_LOCATION) 561 if (flags & UPD_LOCATION)
545 sl << uint32 (op->env ? op->env->count : 0); 562 sl << uint32 (op->env ? op->env->count : 0);
… …
547 if (flags & UPD_FLAGS) 564 if (flags & UPD_FLAGS)
548 sl << uint32 (query_flags (op)); 565 sl << uint32 (query_flags (op));
549 566
550 if (flags & UPD_WEIGHT) 567 if (flags & UPD_WEIGHT)
551 { 568 {
552 sint32 weight = WEIGHT (op); 569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
553 570
554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
555
556 if (pl == op) 571 if (op)
557 ns->last_weight = weight; 572 ns->last_weight = weight;
573
574 sl << uint32 (weight);
558 } 575 }
559 576
560 if (flags & UPD_FACE) 577 if (flags & UPD_FACE)
561 { 578 {
562 ns->send_face (op->face); 579 ns->send_face (op->face, -50);
563 ns->flush_fx (); 580 ns->flush_fx ();
564 sl << uint32 (op->face); 581 sl << uint32 (op->face);
565 } 582 }
566 583
567 if (flags & UPD_NAME) 584 if (flags & UPD_NAME)
… …
633esrv_send_item (object *pl, object *op) 650esrv_send_item (object *pl, object *op)
634{ 651{
635 if (!pl->contr->ns) 652 if (!pl->contr->ns)
636 return; 653 return;
637 654
638 /* If this is not the player object, do some more checks */
639 if (op != pl)
640 {
641 /* We only send 'visibile' objects to the client */ 655 /* We only send 'visible' objects to the client, and sometimes the player */
642 if (!op->client_visible ()) 656 if (!op->client_visible () && op->type != PLAYER)
643 return; 657 return;
644
645 /* if the item is on the ground, mark that the look needs to
646 * be updated.
647 */
648 if (!op->env)
649 {
650 pl->contr->ns->floorbox_update ();
651 return;
652 }
653 }
654 658
655 packet sl; 659 packet sl;
656 660
657 sl.printf ("item%d ", pl->contr->ns->itemcmd); 661 sl.printf ("item%d ", pl->contr->ns->itemcmd);
658 662
659 if (op->head)
660 op = op->head; 663 op = op->head_ ();
661 664
662 sl << uint32 (op->env ? op->env->count : 0); 665 sl << uint32 (op->env ? op->env->count : 0);
663 666
664 add_object_to_socklist (*pl->contr->ns, sl, op); 667 add_object_to_socklist (*pl->contr->ns, sl, op);
665 668
666 pl->contr->ns->send_packet (sl); 669 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT); 670 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 671}
669 672
670/** 673/**
671 * Tells the client to delete an item. Uses the item 674 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 675 */
674void 676void
675esrv_del_item (player *pl, int tag) 677esrv_del_item (player *pl, int tag)
676{ 678{
677 if (!pl->ns) 679 if (!pl->ns)
… …
732void 734void
733ExamineCmd (char *buf, int len, player *pl) 735ExamineCmd (char *buf, int len, player *pl)
734{ 736{
735 tag_t tag = atoi (buf); 737 tag_t tag = atoi (buf);
736 738
739 /* If the high bit is set, player applied a pseudo object. */
740 if (tag & 0x80000000)
741 {
742 pl->ns->look_position = tag & 0x7fffffff;
743 pl->ns->floorbox_update ();
744 return;
745 }
746
737 object *op = esrv_get_ob_from_count (pl->ob, tag); 747 object *op = esrv_get_ob_from_count (pl->ob, tag);
738 748
739 if (!op) 749 if (!op)
740 { 750 {
741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 751 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
765/** Client wants to apply some object. Lets do so. */ 775/** Client wants to apply some object. Lets do so. */
766void 776void
767ApplyCmd (char *buf, int len, player *pl) 777ApplyCmd (char *buf, int len, player *pl)
768{ 778{
769 tag_t tag = atoi (buf); 779 tag_t tag = atoi (buf);
770
771 /* sort of a hack, but if the player saves and the player then manually
772 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
773 */
774 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
775 return;
776 780
777 /* If the high bit is set, player applied a pseudo object. */ 781 /* If the high bit is set, player applied a pseudo object. */
778 if (tag & 0x80000000) 782 if (tag & 0x80000000)
779 { 783 {
780 pl->ns->look_position = tag & 0x7fffffff; 784 pl->ns->look_position = tag & 0x7fffffff;
… …
801 tag_t tag = net_uint32 ((uint8 *)data + 1); 805 tag_t tag = net_uint32 ((uint8 *)data + 1);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 806 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 807
804 if (!op) 808 if (!op)
805 { 809 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 810 pl->failmsg ("Could not find object to lock/unlock");
807 return; 811 return;
808 } 812 }
809 813
810 if (!flag) 814 if (!flag)
811 CLEAR_FLAG (op, FLAG_INV_LOCKED); 815 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
822 tag_t tag = net_uint32 ((uint8 *)data); 826 tag_t tag = net_uint32 ((uint8 *)data);
823 object *op = esrv_get_ob_from_count (pl->ob, tag); 827 object *op = esrv_get_ob_from_count (pl->ob, tag);
824 828
825 if (!op) 829 if (!op)
826 { 830 {
827 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 831 pl->failmsg ("Could not find object to mark");
828 return; 832 return;
829 } 833 }
830 834
831 pl->mark = op; 835 pl->mark = op;
832 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 836 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
833} 837}
834 838
835/** 839/**
836 * look_at prints items on the specified square. 840 * look_at prints items on the specified square.
837 * 841 *
… …
839 * Tero.Haatanen@lut.fi ] 843 * Tero.Haatanen@lut.fi ]
840 */ 844 */
841static void 845static void
842look_at (player *pl, int dx, int dy) 846look_at (player *pl, int dx, int dy)
843{ 847{
848 dynbuf_text buf;
844 object *ob = pl->ob; 849 object *ob = pl->ob;
845 850
846 maptile *m = pl->observe->map; 851 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; 852 return;
854 }
855 853
856 int flag = 0; 854 mapxy pos (pl->observe);
855 pos.move (dx, dy);
857 856
857 if (pos.normalise ())
858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) 858 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 { 859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue; 861 continue;
862 862
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)) 863 if (QUERY_FLAG (ob, FLAG_WIZ))
874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); 864 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
875 else 865 else
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 866 buf.printf ("- %s.\n", query_name (tmp));
877 867
878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 868 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 869
870 if (head->inv)
871 if ((head->type != CONTAINER && head->type != FLESH)
872 || QUERY_FLAG (ob, FLAG_WIZ))
873 buf << head->query_inventory (ob, " ");
874
882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 875 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
883 break; 876 break;
884 } 877 }
885 878
886 if (!flag) 879 if (buf.empty ())
887 { 880 pl->failmsg ("You see nothing there.");
888 if (dx || dy)
889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
890 else 881 else
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 882 pl->infobox (MSG_CHANNEL ("lookat"), buf);
892 }
893} 883}
894 884
895/** Client wants to look at some object. Lets do so. */ 885/** Client wants to look at some object. Lets do so. */
896void 886void
897LookAt (char *buf, int len, player *pl) 887LookAt (char *buf, int len, player *pl)
… …
938 /* If it is an active container, then we should drop all objects 928 /* If it is an active container, then we should drop all objects
939 * in the container and not the container itself. 929 * in the container and not the container itself.
940 */ 930 */
941 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
942 { 932 {
943 object *current, *next; 933 int cnt = MAX_ITEM_PER_DROP;
944 934
945 for (current = op->inv; current != NULL; current = next) 935 for (object *current = op->inv; current; )
946 { 936 {
947 next = current->below; 937 object *next = current->below;
938
948 drop_object (pl, current, 0); 939 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next;
949 } 944 }
950 945
951 esrv_update_item (UPD_WEIGHT, pl, op); 946 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once.");
952 } 948 }
953 else 949 else
954 drop_object (pl, op, nrof); 950 drop_object (pl, op, nrof);
955 951
956 return; 952 return;
… …
976 /* put_object_in_sack presumes that necessary sanity checking 972 /* put_object_in_sack presumes that necessary sanity checking
977 * has already been done (eg, it can be picked up and fits in 973 * 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 974 * 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. 975 * an make sure env is in fact a container for that matter.
980 */ 976 */
981 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 977 if (env->type == CONTAINER
978 && can_pick (pl, op)
979 && sack_can_hold (pl, env, op, nrof))
982 put_object_in_sack (pl, env, op, nrof); 980 put_object_in_sack (pl, env, op, nrof);
983} 981}
984 982

Diff Legend

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