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

Diff Legend

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