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.31 by root, Mon Jan 8 18:18:36 2007 UTC vs.
Revision 1.54 by root, Fri Oct 19 04:25:10 2007 UTC

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

Diff Legend

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