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.29 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.48 by root, Fri Jun 8 09:18:31 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client/server logic. 27 * Client/server logic.
27 * 28 *
28 * \date 2003-12-02 29 * \date 2003-12-02
29 * 30 *
30 * This containes item logic for client/server. It doesn't contain 31 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 32 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 33 * the logic for what items should be sent.
33 */ 34 */
34 35
35#include <global.h> 36#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
37#include <sproto.h> 38#include <sproto.h>
38 39
39/** This is the maximum number of bytes we expect any one item to take up */ 40/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 41#define MAXITEMLEN 300
41 42
… …
263 264
264 flags = query_flags (head); 265 flags = query_flags (head);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
266 flags |= F_NOPICK; 267 flags |= F_NOPICK;
267 268
268 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
269 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
270 271
271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
272 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
273 274
274 sl << uint32 (head->count) 275 sl << uint32 (head->count)
275 << uint32 (flags) 276 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
277 << uint32 (head->face->number); 278 << uint32 (head->face);
278 279
279 if (!head->custom_name) 280 if (!head->custom_name)
280 { 281 {
281 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
282 item_n[127] = 0; 283 item_n[127] = 0;
… …
303 { 304 {
304 if (head->anim_speed) 305 if (head->anim_speed)
305 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
306 else 307 else
307 { 308 {
308 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
309 anim_speed = 255; 310 anim_speed = 255;
310 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
311 anim_speed = 1; 312 anim_speed = 1;
312 else 313 else
313 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
314 } 315 }
315 316
316 if (anim_speed > 255) 317 if (anim_speed > 255)
317 anim_speed = 255; 318 anim_speed = 255;
318 } 319 }
… …
323 if (ns.itemcmd == 2) 324 if (ns.itemcmd == 2)
324 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
325 326
326 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 328}
328
329 329
330/** 330/**
331 * Send the look window. Don't need to do animations here 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 332 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 333 * because object ordering would otherwise be inconsistent.
334 */ 334 */
335void 335void
336esrv_draw_look (object *pl) 336esrv_draw_look (player *pl)
337{ 337{
338 object *tmp, *last;
339 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
340 char buf[MAX_BUF];
341 339
340 object *ob = pl->ob;
341
342 if (!pl->contr->ns->update_look) 342 if (!pl->ns->update_look)
343 { 343 {
344 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
345 return; 345 return;
346 } 346 }
347 else 347 else
348 pl->contr->ns->update_look = 0; 348 pl->ns->update_look = 0;
349 349
350 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (ob, FLAG_REMOVED)
351 || !pl->map 351 || !ob->map
352 || pl->map->in_memory != MAP_IN_MEMORY 352 || ob->map->in_memory != MAP_IN_MEMORY
353 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (ob->map, ob->x, ob->y))
354 return; 354 return;
355 355
356 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
357 ;
358
359 pl->contr->ns->send_packet ("delinv 0"); 356 pl->ns->send_packet ("delinv 0");
360 357
361 packet sl; 358 packet sl;
362 sl.printf ("item%d ", pl->contr->ns->itemcmd); 359 sl.printf ("item%d ", pl->ns->itemcmd);
363 360
364 sl << uint32 (0); 361 sl << uint32 (0);
365 362
366 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 363 pl->ns->send_face (empty_face);
367 esrv_send_face (pl->contr->ns, empty_face->number, 0); 364 pl->ns->flush_fx ();
368 365
369 if (pl->contr->ns->look_position) 366 if (pl->ns->look_position)
370 { 367 {
371 char buf[80]; 368 char buf[80];
372 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
373 370
374 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
375 << uint32 (0) 372 << uint32 (0)
376 << sint32 (-1) 373 << sint32 (-1)
377 << uint32 (empty_face->number) 374 << uint32 (empty_face)
378 << data8 (buf) 375 << data8 (buf)
379 << uint16 (0) 376 << uint16 (0)
380 << uint8 (0) 377 << uint8 (0)
381 << uint32 (0); 378 << uint32 (0);
382 379
383 if (pl->contr->ns->itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
384 sl << uint16 (0); 381 sl << uint16 (0);
385 } 382 }
386 383
384 object *tmp = ob->ms ().top;
387 for (last = NULL; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
388 { 386 {
389 object *head; 387 object *head;
390 388
391 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
392 { 390 {
393 last = tmp->below; /* assumes double floor mode */ 391 last = tmp->below; /* assumes double floor mode */
394 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
395 last = last->below; 393 last = last->below;
396 } 394 }
397 395
398 if (LOOK_OBJ (tmp)) 396 if (tmp->client_visible ())
399 { 397 {
400 if (++start_look < pl->contr->ns->look_position) 398 if (++start_look < pl->ns->look_position)
401 continue; 399 continue;
402 400
403 end_look++; 401 end_look++;
404 402
405 if (end_look > FLOORBOX_PAGESIZE) 403 if (end_look > FLOORBOX_PAGESIZE)
406 { 404 {
407 /* What we basically do is make a 'fake' object - when the user applies it, 405 /* What we basically do is make a 'fake' object - when the user applies it,
408 * we notice the special tag the object has, and act accordingly. 406 * we notice the special tag the object has, and act accordingly.
409 */ 407 */
410 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
411 << uint32 (0) 409 << uint32 (0)
412 << uint32 ((uint32) - 1) 410 << uint32 ((uint32) - 1)
413 << uint32 (empty_face->number) 411 << uint32 (empty_face)
414 << data8 ("Apply this to see next group of items") 412 << data8 ("Apply this to see next group of items")
415 << uint16 (0) 413 << uint16 (0)
416 << uint8 (0) 414 << uint8 (0)
417 << uint32 (0); 415 << uint32 (0);
418 416
419 if (pl->contr->ns->itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
420 sl << uint16 (0); 418 sl << uint16 (0);
421 419
422 break; 420 break;
423 } 421 }
424 422
425 if (tmp->head) 423 if (tmp->head)
426 head = tmp->head; 424 head = tmp->head;
427 else 425 else
428 head = tmp; 426 head = tmp;
429 427
430 add_object_to_socklist (*pl->contr->ns, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
431 got_one++; 429 got_one++;
432 430
433 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
434 { 432 {
435 pl->contr->ns->send_packet (sl); 433 pl->ns->send_packet (sl);
436 434
437 sl.reset (); 435 sl.reset ();
438 sl.printf ("item%d ", pl->contr->ns->itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
439 sl << uint32 (0); 437 sl << uint32 (0);
440 got_one = 0; 438 got_one = 0;
441 } 439 }
442 } 440 }
443 } 441 }
444 442
445 if (got_one) 443 if (got_one)
446 pl->contr->ns->send_packet (sl); 444 pl->ns->send_packet (sl);
447 445
448} 446}
449 447
450/** 448/**
451 * Sends whole inventory. 449 * Sends whole inventory.
452 */ 450 */
453void 451void
454esrv_send_inventory (object *pl, object *op) 452esrv_send_inventory (object *pl, object *op)
455{ 453{
456 object *tmp; 454 if (!pl->contr->ns)//D
455 return;
456
457 int got_one = 0; 457 int got_one = 0;
458
459 458
460 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 459 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
461 460
462 packet sl; 461 packet sl;
463 sl.printf ("item%d ", pl->contr->ns->itemcmd); 462 sl.printf ("item%d ", pl->contr->ns->itemcmd);
464 463
465 sl << uint32 (op->count); 464 sl << uint32 (op->count);
466 465
467 for (tmp = op->inv; tmp; tmp = tmp->below) 466 for (object *tmp = op->inv; tmp; tmp = tmp->below)
468 { 467 {
469 object *head; 468 object *head;
470 469
471 if (tmp->head) 470 if (tmp->head)
472 head = tmp->head; 471 head = tmp->head;
473 else 472 else
474 head = tmp; 473 head = tmp;
475 474
476 if (LOOK_OBJ (head)) 475 if (head->client_visible ())
477 { 476 {
478 add_object_to_socklist (*pl->contr->ns, sl, head); 477 add_object_to_socklist (*pl->contr->ns, sl, head);
479 478
480 got_one++; 479 got_one++;
481 480
… …
490 sl.reset (); 489 sl.reset ();
491 sl.printf ("item%d ", pl->contr->ns->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
492 sl << uint32 (op->count); 491 sl << uint32 (op->count);
493 got_one = 0; 492 got_one = 0;
494 } 493 }
495 } /* If LOOK_OBJ() */ 494 }
496 } 495 }
497 496
498 if (got_one) 497 if (got_one)
499 pl->contr->ns->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
500} 499}
… …
504 * 503 *
505 * flags is a list of values to update 504 * flags is a list of values to update
506 * to the client (as defined in newclient.h - might as well use the 505 * to the client (as defined in newclient.h - might as well use the
507 * same value both places. 506 * same value both places.
508 */ 507 */
509
510void 508void
511esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
512{ 510{
513 /* If we have a request to send the player item, skip a few checks. */ 511 /* If we have a request to send the player item, skip a few checks. */
514 if (op != pl) 512 if (op != pl)
515 { 513 {
516 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
517 return; 515 return;
518 /* we remove the check for op->env, because in theory, the object 516 /* we remove the check for op->env, because in theory, the object
519 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
520 * order. 518 * order.
521 */ 519 */
522 } 520 }
523 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 527 {
526 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 528 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
527 * this is happening - we can set a breakpoint here in the debugger 529 * this is happening - we can set a breakpoint here in the debugger
528 * and track back the call. 530 * and track back the call.
… …
550 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
551 553
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553 555
554 if (pl == op) 556 if (pl == op)
555 op->contr->last_weight = weight; 557 ns->last_weight = weight;
556 } 558 }
557 559
558 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
559 { 561 {
560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 ns->send_face (op->face);
561 esrv_send_face (pl->contr->ns, op->face->number, 0); 563 ns->flush_fx ();
562
563 sl << uint32 (op->face->number); 564 sl << uint32 (op->face);
564 } 565 }
565 566
566 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
567 { 568 {
568 int len; 569 int len;
… …
602 { 603 {
603 if (op->anim_speed) 604 if (op->anim_speed)
604 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
605 else 606 else
606 { 607 {
607 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
608 anim_speed = 255; 609 anim_speed = 255;
609 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
610 anim_speed = 1; 611 anim_speed = 1;
611 else 612 else
612 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
613 } 614 }
614 615
615 if (anim_speed > 255) 616 if (anim_speed > 255)
616 anim_speed = 255; 617 anim_speed = 255;
617 } 618 }
… …
629 * Sends item's info to player. 630 * Sends item's info to player.
630 */ 631 */
631void 632void
632esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
633{ 634{
635 if (!pl->contr->ns)
636 return;
637
634 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
635 if (op != pl) 639 if (op != pl)
636 { 640 {
637 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
638 if (!LOOK_OBJ (op)) 642 if (!op->client_visible ())
639 return; 643 return;
644
640 /* if the item is on the ground, mark that the look needs to 645 /* if the item is on the ground, mark that the look needs to
641 * be updated. 646 * be updated.
642 */ 647 */
643 if (!op->env) 648 if (!op->env)
644 { 649 {
… …
664 669
665/** 670/**
666 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
667 * command with a -1 location. 672 * command with a -1 location.
668 */ 673 */
669
670void 674void
671esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
672{ 676{
677 if (!pl->ns)
678 return;
679
673 packet sl ("delitem"); 680 packet sl ("delitem");
674 681
675 sl << uint32 (tag); 682 sl << uint32 (tag);
676 683
677 pl->ns->send_packet (sl); 684 pl->ns->send_packet (sl);
… …
686 693
687/** 694/**
688 * Takes a player and object count (tag) and returns the actual object 695 * Takes a player and object count (tag) and returns the actual object
689 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
690 */ 697 */
691
692object * 698object *
693esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
694{ 700{
695 object *op, *tmp;
696
697 if (pl->count == count) 701 if (pl->count == count)
698 return pl; 702 return pl;
699 703
700 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
701 if (op->count == count) 705 if (op->count == count)
702 return op; 706 return op;
703 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
704 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
705 if (tmp->count == count) 709 if (tmp->count == count)
706 return tmp; 710 return tmp;
707 711
708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 712 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
709 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
710 return op; 714 return op;
711 else if (op->count == count) 715 else if (op->count == count)
712 return op; 716 return op;
713 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
714 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
715 if (tmp->count == count) 719 if (tmp->count == count)
716 return tmp; 720 return tmp;
717 721
722#if 0
723 /* If the high bit is set, player examined a pseudo object. */
724 if (count & 0x80000000)
725 return 0;
726#endif
727
718 return 0; 728 return 0;
719} 729}
720 730
721
722/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
723void 732void
724ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
725{ 734{
726 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
727 736
728 /* If the high bit is set, player examined a pseudo object. */
729 if (tag & 0x80000000)
730 return;
731
732 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
733 738
734 if (!op) 739 if (!op)
735 { 740 {
736 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
737 return; 742 return;
738 } 743 }
739 744
740 examine (pl->ob, op); 745 examine (pl->ob, op);
746}
747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (char *buf, int len, player *pl)
751{
752 tag_t tag = atoi (buf);
753
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 {
756 std::string s = op->describe (pl->ob);
757
758 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str ();
760
761 pl->ns->send_packet (sl);
762 }
741} 763}
742 764
743/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
744void 766void
745ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
814 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
815 * 837 *
816 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
817 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
818 */ 840 */
819void 841static void
820look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
821{ 843{
822 object *tmp; 844 object *ob = pl->ob;
845
846 maptile *m = 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;
854 }
855
823 int flag = 0; 856 int flag = 0;
824 sint16 x, y;
825 maptile *m;
826 857
827 x = op->x + dx; 858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
828 y = op->y + dy; 859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue;
829 862
830 if (out_of_map (op->map, x, y)) 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))
874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
875 else
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
877
878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
881
882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
883 break;
884 }
885
886 if (!flag)
887 {
888 if (dx || dy)
889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
890 else
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
892 }
893}
894
895/** Client wants to look at some object. Lets do so. */
896void
897LookAt (char *buf, int len, player *pl)
898{
899 char *cp;
900
901 int dx = atoi (buf);
902 if (!(cp = strchr (buf, ' ')))
831 return; 903 return;
832 904
833 m = get_map_from_coord (op->map, &x, &y);
834 if (!m)
835 return;
836
837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
838
839 for (; tmp != NULL; tmp = tmp->below)
840 {
841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
842 continue;
843
844 if (!flag)
845 {
846 if (dx || dy)
847 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
848 else
849 {
850 clear_win_info (op);
851 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
852 }
853 flag = 1;
854 }
855
856 if (QUERY_FLAG (op, FLAG_WIZ))
857 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
858 else
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
860
861 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
862 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
863 inventory (op, tmp->head == NULL ? tmp : tmp->head);
864
865 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
866 break;
867 }
868
869 if (!flag)
870 {
871 if (dx || dy)
872 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
873 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
875 }
876}
877
878
879
880/** Client wants to look at some object. Lets do so. */
881void
882LookAt (char *buf, int len, player *pl)
883{
884 int dx, dy;
885 char *cp;
886
887 dx = atoi (buf);
888 if (!(cp = strchr (buf, ' ')))
889 {
890 return;
891 }
892 dy = atoi (cp); 905 int dy = atoi (cp);
893 906
907 if (player *opl = pl->observe->contr)
908 if (client *ns = opl->ns)
909 {
894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 910 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return; 911 return;
896 912
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 913 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return; 914 return;
915 }
899 916
900 look_at (pl->ob, dx, dy); 917 look_at (pl, dx, dy);
901} 918}
902 919
903/** Move an object to a new location */ 920/** Move an object to a new location */
904void 921void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 922esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

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