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.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.63 by root, Thu Apr 24 00:30:52 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.
… …
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);
267 ns.flush_fx ();
270 268
271 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])
272 ns.send_animation (head->animation_id); 270 ns.send_animation (head->animation_id);
273 271
274 sl << uint32 (head->count) 272 sl << uint32 (head->count)
275 << uint32 (flags) 273 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277 << uint32 (head->face); 275 << uint32 (head->face);
278 276
279 if (!head->custom_name) 277 if (!head->custom_name)
280 { 278 {
281 strncpy (item_n, query_base_name (head, 0), 127); 279 strncpy (item_n, query_base_name (head, 0), 127);
… …
330 * Send the look window. Don't need to do animations here 328 * Send the look window. Don't need to do animations here
331 * This sends all the faces to the client, not just updates. This is 329 * This sends all the faces to the client, not just updates. This is
332 * because object ordering would otherwise be inconsistent. 330 * because object ordering would otherwise be inconsistent.
333 */ 331 */
334void 332void
335esrv_draw_look (object *pl) 333esrv_draw_look (player *pl)
336{ 334{
337 int got_one = 0, start_look = 0, end_look = 0; 335 int got_one = 0, start_look = 0, end_look = 0;
338 336
337 object *ob = pl->ob;
338
339 if (!pl->contr->ns->update_look) 339 if (!pl->ns->update_look)
340 { 340 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); 341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
342 return; 342 return;
343 } 343 }
344 else 344
345 pl->contr->ns->update_look = 0; 345 pl->ns->update_look = 0;
346 346
347 if (QUERY_FLAG (pl, FLAG_REMOVED) 347 if (QUERY_FLAG (ob, FLAG_REMOVED)
348 || !pl->map 348 || !ob->map
349 || pl->map->in_memory != MAP_IN_MEMORY 349 || ob->map->in_memory != MAP_ACTIVE
350 || out_of_map (pl->map, pl->x, pl->y)) 350 || out_of_map (ob->map, ob->x, ob->y))
351 return; 351 return;
352 352
353 pl->contr->ns->send_packet ("delinv 0"); 353 pl->ns->send_packet ("delinv 0");
354 354
355 packet sl; 355 packet sl;
356 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->ns->itemcmd);
357 357
358 sl << uint32 (0); 358 sl << uint32 (0);
359 359
360 pl->contr->ns->send_face (empty_face); 360 pl->ns->send_face (empty_face, -50);
361 pl->ns->flush_fx ();
361 362
362 if (pl->contr->ns->look_position) 363 if (pl->ns->look_position)
363 { 364 {
364 char buf[80]; 365 char buf[80];
365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 366 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
366 367
367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 368 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
368 << uint32 (0) 369 << uint32 (0)
369 << sint32 (-1) 370 << sint32 (-1)
370 << uint32 (empty_face) 371 << uint32 (empty_face)
371 << data8 (buf) 372 << data8 (buf)
372 << uint16 (0) 373 << uint16 (0)
373 << uint8 (0) 374 << uint8 (0)
374 << uint32 (0); 375 << uint32 (0);
375 376
376 if (pl->contr->ns->itemcmd == 2) 377 if (pl->ns->itemcmd == 2)
377 sl << uint16 (0); 378 sl << uint16 (0);
378 } 379 }
379 380
380 object *tmp = pl->ms ().top; 381 object *tmp = ob->ms ().top;
381 for (object *last = 0; tmp != last; tmp = tmp->below) 382 for (object *last = 0; tmp != last; tmp = tmp->below)
382 { 383 {
383 object *head;
384
385 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 384 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
386 { 385 {
387 last = tmp->below; /* assumes double floor mode */ 386 last = tmp->below; /* assumes double floor mode */
388 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 387 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
389 last = last->below; 388 last = last->below;
390 } 389 }
391 390
392 if (tmp->client_visible ()) 391 if (tmp->client_visible ())
393 { 392 {
394 if (++start_look < pl->contr->ns->look_position) 393 if (++start_look < pl->ns->look_position)
395 continue; 394 continue;
396 395
397 end_look++; 396 end_look++;
398 397
399 if (end_look > FLOORBOX_PAGESIZE) 398 if (end_look > FLOORBOX_PAGESIZE)
400 { 399 {
401 /* What we basically do is make a 'fake' object - when the user applies it, 400 /* What we basically do is make a 'fake' object - when the user applies it,
402 * we notice the special tag the object has, and act accordingly. 401 * we notice the special tag the object has, and act accordingly.
403 */ 402 */
404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 403 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
405 << uint32 (0) 404 << uint32 (0)
406 << uint32 ((uint32) - 1) 405 << uint32 ((uint32) - 1)
407 << uint32 (empty_face) 406 << uint32 (empty_face)
408 << data8 ("Apply this to see next group of items") 407 << data8 ("Apply this to see next group of items")
409 << uint16 (0) 408 << uint16 (0)
410 << uint8 (0) 409 << uint8 (0)
411 << uint32 (0); 410 << uint32 (0);
412 411
413 if (pl->contr->ns->itemcmd == 2) 412 if (pl->ns->itemcmd == 2)
414 sl << uint16 (0); 413 sl << uint16 (0);
415 414
416 break; 415 break;
417 } 416 }
418 417
419 if (tmp->head)
420 head = tmp->head;
421 else
422 head = tmp;
423
424 add_object_to_socklist (*pl->contr->ns, sl, head); 418 add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
425 got_one++; 419 got_one++;
426 420
427 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 421 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
428 { 422 {
429 pl->contr->ns->send_packet (sl); 423 pl->ns->send_packet (sl);
430 424
431 sl.reset (); 425 sl.reset ();
432 sl.printf ("item%d ", pl->contr->ns->itemcmd); 426 sl.printf ("item%d ", pl->ns->itemcmd);
433 sl << uint32 (0); 427 sl << uint32 (0);
434 got_one = 0; 428 got_one = 0;
435 } 429 }
436 } 430 }
437 } 431 }
438 432
439 if (got_one) 433 if (got_one)
440 pl->contr->ns->send_packet (sl); 434 pl->ns->send_packet (sl);
441 435
442} 436}
443 437
444/** 438/**
445 * Sends whole inventory. 439 * Sends whole inventory.
… …
476 470
477 /* IT is possible for players to accumulate a huge amount of 471 /* IT is possible for players to accumulate a huge amount of
478 * items (especially with some of the bags out there) to 472 * items (especially with some of the bags out there) to
479 * overflow the buffer. IF so, send multiple item commands. 473 * overflow the buffer. IF so, send multiple item commands.
480 */ 474 */
481 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 475 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
482 { 476 {
483 pl->contr->ns->send_packet (sl); 477 pl->contr->ns->send_packet (sl);
484 478
485 sl.reset (); 479 sl.reset ();
486 sl.printf ("item%d ", pl->contr->ns->itemcmd); 480 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
503 */ 497 */
504void 498void
505esrv_update_item (int flags, object *pl, object *op) 499esrv_update_item (int flags, object *pl, object *op)
506{ 500{
507 /* If we have a request to send the player item, skip a few checks. */ 501 /* If we have a request to send the player item, skip a few checks. */
508 if (op != pl)
509 {
510 if (!op->client_visible ()) 502 if (op != pl && !op->client_visible ())
511 return; 503 return;
512 /* we remove the check for op->env, because in theory, the object
513 * is hopefully in the same place, so the client should preserve
514 * order.
515 */
516 }
517 504
518 client *ns = pl->contr->ns; 505 client *ns = pl->contr->ns;
519 if (!ns) 506 if (!ns)
520 return; 507 return;
521 508
… …
530 517
531 packet sl ("upditem"); 518 packet sl ("upditem");
532 519
533 sl << uint8 (flags); 520 sl << uint8 (flags);
534 521
535 if (op->head)
536 op = op->head; 522 op = op->head_ ();
537 523
538 sl << uint32 (op->count); 524 sl << uint32 (op->count);
539 525
540 if (flags & UPD_LOCATION) 526 if (flags & UPD_LOCATION)
541 sl << uint32 (op->env ? op->env->count : 0); 527 sl << uint32 (op->env ? op->env->count : 0);
… …
543 if (flags & UPD_FLAGS) 529 if (flags & UPD_FLAGS)
544 sl << uint32 (query_flags (op)); 530 sl << uint32 (query_flags (op));
545 531
546 if (flags & UPD_WEIGHT) 532 if (flags & UPD_WEIGHT)
547 { 533 {
548 sint32 weight = WEIGHT (op); 534 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
549 535
550 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
551
552 if (pl == op) 536 if (op)
553 ns->last_weight = weight; 537 ns->last_weight = weight;
538
539 sl << uint32 (weight);
554 } 540 }
555 541
556 if (flags & UPD_FACE) 542 if (flags & UPD_FACE)
557 { 543 {
558 ns->send_face (op->face); 544 ns->send_face (op->face, -50);
545 ns->flush_fx ();
559 sl << uint32 (op->face); 546 sl << uint32 (op->face);
560 } 547 }
561 548
562 if (flags & UPD_NAME) 549 if (flags & UPD_NAME)
563 { 550 {
… …
628esrv_send_item (object *pl, object *op) 615esrv_send_item (object *pl, object *op)
629{ 616{
630 if (!pl->contr->ns) 617 if (!pl->contr->ns)
631 return; 618 return;
632 619
633 /* If this is not the player object, do some more checks */
634 if (op != pl)
635 {
636 /* We only send 'visibile' objects to the client */ 620 /* We only send 'visible' objects to the client, and sometimes the player */
637 if (!op->client_visible ()) 621 if (!op->client_visible () && op->type != PLAYER)
638 return; 622 return;
639
640 /* if the item is on the ground, mark that the look needs to
641 * be updated.
642 */
643 if (!op->env)
644 {
645 pl->contr->ns->floorbox_update ();
646 return;
647 }
648 }
649 623
650 packet sl; 624 packet sl;
651 625
652 sl.printf ("item%d ", pl->contr->ns->itemcmd); 626 sl.printf ("item%d ", pl->contr->ns->itemcmd);
653 627
654 if (op->head)
655 op = op->head; 628 op = op->head_ ();
656 629
657 sl << uint32 (op->env ? op->env->count : 0); 630 sl << uint32 (op->env ? op->env->count : 0);
658 631
659 add_object_to_socklist (*pl->contr->ns, sl, op); 632 add_object_to_socklist (*pl->contr->ns, sl, op);
660 633
661 pl->contr->ns->send_packet (sl); 634 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT); 635 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 636}
664 637
665/** 638/**
666 * Tells the client to delete an item. Uses the item 639 * Tells the client to delete an item.
667 * command with a -1 location.
668 */ 640 */
669void 641void
670esrv_del_item (player *pl, int tag) 642esrv_del_item (player *pl, int tag)
671{ 643{
672 if (!pl->ns) 644 if (!pl->ns)
… …
688 660
689/** 661/**
690 * Takes a player and object count (tag) and returns the actual object 662 * Takes a player and object count (tag) and returns the actual object
691 * pointer, or null if it can't be found. 663 * pointer, or null if it can't be found.
692 */ 664 */
693
694object * 665object *
695esrv_get_ob_from_count (object *pl, tag_t count) 666esrv_get_ob_from_count (object *pl, tag_t count)
696{ 667{
697 object *op, *tmp;
698
699 if (pl->count == count) 668 if (pl->count == count)
700 return pl; 669 return pl;
701 670
702 for (op = pl->inv; op; op = op->below) 671 for (object *op = pl->inv; op; op = op->below)
703 if (op->count == count) 672 if (op->count == count)
704 return op; 673 return op;
705 else if (op->type == CONTAINER && pl->container == op) 674 else if (op->type == CONTAINER && pl->container == op)
706 for (tmp = op->inv; tmp; tmp = tmp->below) 675 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 676 if (tmp->count == count)
708 return tmp; 677 return tmp;
709 678
710 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 679 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
711 if (op->head && op->head->count == count) 680 if (op->head && op->head->count == count)
712 return op; 681 return op;
713 else if (op->count == count) 682 else if (op->count == count)
714 return op; 683 return op;
715 else if (op->type == CONTAINER && pl->container == op) 684 else if (op->type == CONTAINER && pl->container == op)
716 for (tmp = op->inv; tmp; tmp = tmp->below) 685 for (object *tmp = op->inv; tmp; tmp = tmp->below)
717 if (tmp->count == count) 686 if (tmp->count == count)
718 return tmp; 687 return tmp;
719 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
720 return 0; 695 return 0;
721} 696}
722 697
723
724/** Client wants to examine some object. So lets do so. */ 698/** Client wants to examine some object. So lets do so. */
725void 699void
726ExamineCmd (char *buf, int len, player *pl) 700ExamineCmd (char *buf, int len, player *pl)
727{ 701{
728 tag_t tag = atoi (buf); 702 tag_t tag = atoi (buf);
729
730 /* If the high bit is set, player examined a pseudo object. */
731 if (tag & 0x80000000)
732 return;
733 703
734 object *op = esrv_get_ob_from_count (pl->ob, tag); 704 object *op = esrv_get_ob_from_count (pl->ob, tag);
735 705
736 if (!op) 706 if (!op)
737 { 707 {
738 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 708 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
739 return; 709 return;
740 } 710 }
741 711
742 examine (pl->ob, op); 712 examine (pl->ob, op);
713}
714
715/** Client wants to examine some object. So lets do so. */
716void
717ExCmd (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 }
743} 730}
744 731
745/** Client wants to apply some object. Lets do so. */ 732/** Client wants to apply some object. Lets do so. */
746void 733void
747ApplyCmd (char *buf, int len, player *pl) 734ApplyCmd (char *buf, int len, player *pl)
… …
781 tag_t tag = net_uint32 ((uint8 *)data + 1); 768 tag_t tag = net_uint32 ((uint8 *)data + 1);
782 object *op = esrv_get_ob_from_count (pl->ob, tag); 769 object *op = esrv_get_ob_from_count (pl->ob, tag);
783 770
784 if (!op) 771 if (!op)
785 { 772 {
786 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 773 pl->failmsg ("Could not find object to lock/unlock");
787 return; 774 return;
788 } 775 }
789 776
790 if (!flag) 777 if (!flag)
791 CLEAR_FLAG (op, FLAG_INV_LOCKED); 778 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
802 tag_t tag = net_uint32 ((uint8 *)data); 789 tag_t tag = net_uint32 ((uint8 *)data);
803 object *op = esrv_get_ob_from_count (pl->ob, tag); 790 object *op = esrv_get_ob_from_count (pl->ob, tag);
804 791
805 if (!op) 792 if (!op)
806 { 793 {
807 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 794 pl->failmsg ("Could not find object to mark");
808 return; 795 return;
809 } 796 }
810 797
811 pl->mark = op; 798 pl->mark = op;
812 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 799 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
813} 800}
814 801
815/** 802/**
816 * look_at prints items on the specified square. 803 * look_at prints items on the specified square.
817 * 804 *
818 * [ removed EARTHWALL check and added check for containers inventory. 805 * [ removed EARTHWALL check and added check for containers inventory.
819 * Tero.Haatanen@lut.fi ] 806 * Tero.Haatanen@lut.fi ]
820 */ 807 */
821void 808static void
822look_at (object *op, int dx, int dy) 809look_at (player *pl, int dx, int dy)
823{ 810{
824 object *tmp; 811 dynbuf_text buf;
825 int flag = 0; 812 object *ob = pl->ob;
826 sint16 x, y;
827 maptile *m;
828 813
829 x = op->x + dx; 814 if (!pl->observe->map)
830 y = op->y + dy;
831
832 if (out_of_map (op->map, x, y))
833 return; 815 return;
834 816
835 m = get_map_from_coord (op->map, &x, &y); 817 mapxy pos (pl->observe);
836 if (!m) 818 pos.move (dx, dy);
837 return;
838 819
839 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 820 if (pos.normalise ())
840 821 for (object *tmp = pos->top; tmp; tmp = tmp->below)
841 for (; tmp != NULL; tmp = tmp->below)
842 { 822 {
843 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 823 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
844 continue; 824 continue;
845 825
846 if (!flag)
847 {
848 if (dx || dy)
849 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
850 else
851 {
852 clear_win_info (op);
853 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
854 }
855 flag = 1;
856 }
857
858 if (QUERY_FLAG (op, FLAG_WIZ)) 826 if (QUERY_FLAG (ob, FLAG_WIZ))
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 827 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
860 else 828 else
861 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 829 buf.printf ("- %s.\n", query_name (tmp));
862 830
863 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 831 object *head = tmp->head_ ();
864 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
865 inventory (op, tmp->head == NULL ? tmp : tmp->head);
866 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
867 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 838 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
868 break; 839 break;
869 } 840 }
870 841
871 if (!flag) 842 if (buf.empty ())
872 { 843 pl->failmsg ("You see nothing there.");
873 if (dx || dy)
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
875 else 844 else
876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 845 pl->infobox (MSG_CHANNEL ("lookat"), buf);
877 }
878} 846}
879 847
880/** Client wants to look at some object. Lets do so. */ 848/** Client wants to look at some object. Lets do so. */
881void 849void
882LookAt (char *buf, int len, player *pl) 850LookAt (char *buf, int len, player *pl)
883{ 851{
884 int dx, dy;
885 char *cp; 852 char *cp;
886 853
887 dx = atoi (buf); 854 int dx = atoi (buf);
888 if (!(cp = strchr (buf, ' '))) 855 if (!(cp = strchr (buf, ' ')))
889 {
890 return; 856 return;
891 } 857
892 dy = atoi (cp); 858 int dy = atoi (cp);
893 859
860 if (player *opl = pl->observe->contr)
861 if (client *ns = opl->ns)
862 {
894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 863 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return; 864 return;
896 865
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 866 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return; 867 return;
868 }
899 869
900 look_at (pl->ob, dx, dy); 870 look_at (pl, dx, dy);
901} 871}
902 872
903/** Move an object to a new location */ 873/** Move an object to a new location */
904void 874void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 875esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
921 /* If it is an active container, then we should drop all objects 891 /* If it is an active container, then we should drop all objects
922 * in the container and not the container itself. 892 * in the container and not the container itself.
923 */ 893 */
924 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 894 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
925 { 895 {
926 object *current, *next; 896 int cnt = MAX_ITEM_PER_DROP;
927 897
928 for (current = op->inv; current != NULL; current = next) 898 for (object *current = op->inv; current; )
929 { 899 {
930 next = current->below; 900 object *next = current->below;
901
931 drop_object (pl, current, 0); 902 drop_object (pl, current, 0);
903
904 if (--cnt <= 0) break;
905
906 current = next;
932 } 907 }
933 908
934 esrv_update_item (UPD_WEIGHT, pl, op); 909 if (cnt <= 0)
910 op->failmsg ("Only dropped some items, can't drop that many items at once.");
935 } 911 }
936 else 912 else
937 drop_object (pl, op, nrof); 913 drop_object (pl, op, nrof);
938 914
939 return; 915 return;
… …
959 /* put_object_in_sack presumes that necessary sanity checking 935 /* put_object_in_sack presumes that necessary sanity checking
960 * has already been done (eg, it can be picked up and fits in 936 * has already been done (eg, it can be picked up and fits in
961 * in a sack, so check for those things. We should also check 937 * in a sack, so check for those things. We should also check
962 * an make sure env is in fact a container for that matter. 938 * an make sure env is in fact a container for that matter.
963 */ 939 */
964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 940 if (env->type == CONTAINER
941 && can_pick (pl, op)
942 && sack_can_hold (pl, env, op, nrof))
965 put_object_in_sack (pl, env, op, nrof); 943 put_object_in_sack (pl, env, op, nrof);
966} 944}
967 945

Diff Legend

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