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

Diff Legend

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