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

Diff Legend

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