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.44 by root, Mon Apr 23 19:10:17 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author 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 (object *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
342 if (!pl->contr->socket->update_look) 340 if (!pl->contr->ns->update_look)
343 { 341 {
344 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 342 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
345 return; 343 return;
346 } 344 }
347 else 345 else
348 pl->contr->socket->update_look = 0; 346 pl->contr->ns->update_look = 0;
349 347
350 if (QUERY_FLAG (pl, FLAG_REMOVED) 348 if (QUERY_FLAG (pl, FLAG_REMOVED)
351 || !pl->map 349 || !pl->map
352 || pl->map->in_memory != MAP_IN_MEMORY 350 || pl->map->in_memory != MAP_IN_MEMORY
353 || out_of_map (pl->map, pl->x, pl->y)) 351 || out_of_map (pl->map, pl->x, pl->y))
354 return; 352 return;
355 353
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"); 354 pl->contr->ns->send_packet ("delinv 0");
360 355
361 packet sl; 356 packet sl;
362 sl.printf ("item%d ", pl->contr->socket->itemcmd); 357 sl.printf ("item%d ", pl->contr->ns->itemcmd);
363 358
364 sl << uint32 (0); 359 sl << uint32 (0);
365 360
366 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 361 pl->contr->ns->send_face (empty_face);
367 esrv_send_face (pl->contr->socket, empty_face->number, 0); 362 pl->contr->ns->flush_fx ();
368 363
369 if (pl->contr->socket->look_position) 364 if (pl->contr->ns->look_position)
370 { 365 {
371 char buf[80]; 366 char buf[80];
372 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
373 368
374 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
375 << uint32 (0) 370 << uint32 (0)
376 << sint32 (-1) 371 << sint32 (-1)
377 << uint32 (empty_face->number) 372 << uint32 (empty_face)
378 << data8 (buf) 373 << data8 (buf)
379 << uint16 (0) 374 << uint16 (0)
380 << uint8 (0) 375 << uint8 (0)
381 << uint32 (0); 376 << uint32 (0);
382 377
383 if (pl->contr->socket->itemcmd == 2) 378 if (pl->contr->ns->itemcmd == 2)
384 sl << uint16 (0); 379 sl << uint16 (0);
385 } 380 }
386 381
382 object *tmp = pl->ms ().top;
387 for (last = NULL; tmp != last; tmp = tmp->below) 383 for (object *last = 0; tmp != last; tmp = tmp->below)
388 { 384 {
389 object *head; 385 object *head;
390 386
391 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
392 { 388 {
393 last = tmp->below; /* assumes double floor mode */ 389 last = tmp->below; /* assumes double floor mode */
394 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 390 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
395 last = last->below; 391 last = last->below;
396 } 392 }
397 393
398 if (LOOK_OBJ (tmp)) 394 if (tmp->client_visible ())
399 { 395 {
400 if (++start_look < pl->contr->socket->look_position) 396 if (++start_look < pl->contr->ns->look_position)
401 continue; 397 continue;
402 398
403 end_look++; 399 end_look++;
404 400
405 if (end_look > FLOORBOX_PAGESIZE) 401 if (end_look > FLOORBOX_PAGESIZE)
406 { 402 {
407 /* What we basically do is make a 'fake' object - when the user applies it, 403 /* 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. 404 * we notice the special tag the object has, and act accordingly.
409 */ 405 */
410 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
411 << uint32 (0) 407 << uint32 (0)
412 << uint32 ((uint32) - 1) 408 << uint32 ((uint32) - 1)
413 << uint32 (empty_face->number) 409 << uint32 (empty_face)
414 << data8 ("Apply this to see next group of items") 410 << data8 ("Apply this to see next group of items")
415 << uint16 (0) 411 << uint16 (0)
416 << uint8 (0) 412 << uint8 (0)
417 << uint32 (0); 413 << uint32 (0);
418 414
419 if (pl->contr->socket->itemcmd == 2) 415 if (pl->contr->ns->itemcmd == 2)
420 sl << uint16 (0); 416 sl << uint16 (0);
421 417
422 break; 418 break;
423 } 419 }
424 420
425 if (tmp->head) 421 if (tmp->head)
426 head = tmp->head; 422 head = tmp->head;
427 else 423 else
428 head = tmp; 424 head = tmp;
429 425
430 add_object_to_socklist (*pl->contr->socket, sl, head); 426 add_object_to_socklist (*pl->contr->ns, sl, head);
431 got_one++; 427 got_one++;
432 428
433 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
434 { 430 {
435 pl->contr->socket->send_packet (sl); 431 pl->contr->ns->send_packet (sl);
436 432
437 sl.reset (); 433 sl.reset ();
438 sl.printf ("item%d ", pl->contr->socket->itemcmd); 434 sl.printf ("item%d ", pl->contr->ns->itemcmd);
439 sl << uint32 (0); 435 sl << uint32 (0);
440 got_one = 0; 436 got_one = 0;
441 } 437 }
442 } 438 }
443 } 439 }
444 440
445 if (got_one) 441 if (got_one)
446 pl->contr->socket->send_packet (sl); 442 pl->contr->ns->send_packet (sl);
447 443
448} 444}
449 445
450/** 446/**
451 * Sends whole inventory. 447 * Sends whole inventory.
452 */ 448 */
453void 449void
454esrv_send_inventory (object *pl, object *op) 450esrv_send_inventory (object *pl, object *op)
455{ 451{
456 object *tmp; 452 if (!pl->contr->ns)//D
453 return;
454
457 int got_one = 0; 455 int got_one = 0;
458 456
459
460 pl->contr->socket->send_packet_printf ("delinv %d", op->count); 457 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
461 458
462 packet sl; 459 packet sl;
463 sl.printf ("item%d ", pl->contr->socket->itemcmd); 460 sl.printf ("item%d ", pl->contr->ns->itemcmd);
464 461
465 sl << uint32 (op->count); 462 sl << uint32 (op->count);
466 463
467 for (tmp = op->inv; tmp; tmp = tmp->below) 464 for (object *tmp = op->inv; tmp; tmp = tmp->below)
468 { 465 {
469 object *head; 466 object *head;
470 467
471 if (tmp->head) 468 if (tmp->head)
472 head = tmp->head; 469 head = tmp->head;
473 else 470 else
474 head = tmp; 471 head = tmp;
475 472
476 if (LOOK_OBJ (head)) 473 if (head->client_visible ())
477 { 474 {
478 add_object_to_socklist (*pl->contr->socket, sl, head); 475 add_object_to_socklist (*pl->contr->ns, sl, head);
479 476
480 got_one++; 477 got_one++;
481 478
482 /* IT is possible for players to accumulate a huge amount of 479 /* IT is possible for players to accumulate a huge amount of
483 * items (especially with some of the bags out there) to 480 * items (especially with some of the bags out there) to
484 * overflow the buffer. IF so, send multiple item commands. 481 * overflow the buffer. IF so, send multiple item commands.
485 */ 482 */
486 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 483 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
487 { 484 {
488 pl->contr->socket->send_packet (sl); 485 pl->contr->ns->send_packet (sl);
489 486
490 sl.reset (); 487 sl.reset ();
491 sl.printf ("item%d ", pl->contr->socket->itemcmd); 488 sl.printf ("item%d ", pl->contr->ns->itemcmd);
492 sl << uint32 (op->count); 489 sl << uint32 (op->count);
493 got_one = 0; 490 got_one = 0;
494 } 491 }
495 } /* If LOOK_OBJ() */ 492 }
496 } 493 }
497 494
498 if (got_one) 495 if (got_one)
499 pl->contr->socket->send_packet (sl); 496 pl->contr->ns->send_packet (sl);
500} 497}
501 498
502/** 499/**
503 * Updates object *op for player *pl. 500 * Updates object *op for player *pl.
504 * 501 *
505 * flags is a list of values to update 502 * flags is a list of values to update
506 * to the client (as defined in newclient.h - might as well use the 503 * to the client (as defined in newclient.h - might as well use the
507 * same value both places. 504 * same value both places.
508 */ 505 */
509
510void 506void
511esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
512{ 508{
513 /* If we have a request to send the player item, skip a few checks. */ 509 /* If we have a request to send the player item, skip a few checks. */
514 if (op != pl) 510 if (op != pl)
515 { 511 {
516 if (!LOOK_OBJ (op)) 512 if (!op->client_visible ())
517 return; 513 return;
518 /* we remove the check for op->env, because in theory, the object 514 /* we remove the check for op->env, because in theory, the object
519 * is hopefully in the same place, so the client should preserve 515 * is hopefully in the same place, so the client should preserve
520 * order. 516 * order.
521 */ 517 */
522 } 518 }
523 519
520 client *ns = pl->contr->ns;
521 if (!ns)
522 return;
523
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 525 {
526 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 526 /* 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 527 * this is happening - we can set a breakpoint here in the debugger
528 * and track back the call. 528 * and track back the call.
… …
550 sint32 weight = WEIGHT (op); 550 sint32 weight = WEIGHT (op);
551 551
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553 553
554 if (pl == op) 554 if (pl == op)
555 op->contr->last_weight = weight; 555 ns->last_weight = weight;
556 } 556 }
557 557
558 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
559 { 559 {
560 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
561 esrv_send_face (pl->contr->socket, op->face->number, 0); 561 ns->flush_fx ();
562
563 sl << uint32 (op->face->number); 562 sl << uint32 (op->face);
564 } 563 }
565 564
566 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
567 { 566 {
568 int len; 567 int len;
… …
602 { 601 {
603 if (op->anim_speed) 602 if (op->anim_speed)
604 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
605 else 604 else
606 { 605 {
607 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
608 anim_speed = 255; 607 anim_speed = 255;
609 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
610 anim_speed = 1; 609 anim_speed = 1;
611 else 610 else
612 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
613 } 612 }
614 613
615 if (anim_speed > 255) 614 if (anim_speed > 255)
616 anim_speed = 255; 615 anim_speed = 255;
617 } 616 }
… …
620 } 619 }
621 620
622 if (flags & UPD_NROF) 621 if (flags & UPD_NROF)
623 sl << uint32 (op->nrof); 622 sl << uint32 (op->nrof);
624 623
625 pl->contr->socket->send_packet (sl); 624 pl->contr->ns->send_packet (sl);
626} 625}
627 626
628/** 627/**
629 * Sends item's info to player. 628 * Sends item's info to player.
630 */ 629 */
631void 630void
632esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
633{ 632{
633 if (!pl->contr->ns)
634 return;
635
634 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
635 if (op != pl) 637 if (op != pl)
636 { 638 {
637 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
638 if (!LOOK_OBJ (op)) 640 if (!op->client_visible ())
639 return; 641 return;
642
640 /* if the item is on the ground, mark that the look needs to 643 /* if the item is on the ground, mark that the look needs to
641 * be updated. 644 * be updated.
642 */ 645 */
643 if (!op->env) 646 if (!op->env)
644 { 647 {
645 pl->contr->socket->floorbox_update (); 648 pl->contr->ns->floorbox_update ();
646 return; 649 return;
647 } 650 }
648 } 651 }
649 652
650 packet sl; 653 packet sl;
651 654
652 sl.printf ("item%d ", pl->contr->socket->itemcmd); 655 sl.printf ("item%d ", pl->contr->ns->itemcmd);
653 656
654 if (op->head) 657 if (op->head)
655 op = op->head; 658 op = op->head;
656 659
657 sl << uint32 (op->env ? op->env->count : 0); 660 sl << uint32 (op->env ? op->env->count : 0);
658 661
659 add_object_to_socklist (*pl->contr->socket, sl, op); 662 add_object_to_socklist (*pl->contr->ns, sl, op);
660 663
661 pl->contr->socket->send_packet (sl); 664 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT); 665 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 666}
664 667
665/** 668/**
666 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
667 * command with a -1 location. 670 * command with a -1 location.
668 */ 671 */
669
670void 672void
671esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
672{ 674{
675 if (!pl->ns)
676 return;
677
673 packet sl ("delitem"); 678 packet sl ("delitem");
674 679
675 sl << uint32 (tag); 680 sl << uint32 (tag);
676 681
677 pl->socket->send_packet (sl); 682 pl->ns->send_packet (sl);
678} 683}
679 684
680 685
681/******************************************************************************* 686/*******************************************************************************
682 * 687 *
… …
686 691
687/** 692/**
688 * Takes a player and object count (tag) and returns the actual object 693 * Takes a player and object count (tag) and returns the actual object
689 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
690 */ 695 */
691
692object * 696object *
693esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
694{ 698{
695 object *op, *tmp;
696
697 if (pl->count == count) 699 if (pl->count == count)
698 return pl; 700 return pl;
699 701
700 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
701 if (op->count == count) 703 if (op->count == count)
702 return op; 704 return op;
703 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
704 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
705 if (tmp->count == count) 707 if (tmp->count == count)
706 return tmp; 708 return tmp;
707 709
708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 710 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
709 if (op->head && op->head->count == count) 711 if (op->head && op->head->count == count)
710 return op; 712 return op;
711 else if (op->count == count) 713 else if (op->count == count)
712 return op; 714 return op;
713 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
714 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
715 if (tmp->count == count) 717 if (tmp->count == count)
716 return tmp; 718 return tmp;
717 719
720#if 0
721 /* If the high bit is set, player examined a pseudo object. */
722 if (count & 0x80000000)
723 return 0;
724#endif
725
718 return 0; 726 return 0;
719} 727}
720 728
721
722/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
723void 730void
724ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
725{ 732{
726 tag_t tag = atoi (buf); 733 tag_t tag = atoi (buf);
727
728 /* If the high bit is set, player examined a pseudo object. */
729 if (tag & 0x80000000)
730 return;
731 734
732 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
733 736
734 if (!op) 737 if (!op)
735 { 738 {
736 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 739 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
737 return; 740 return;
738 } 741 }
739 742
740 examine (pl->ob, op); 743 examine (pl->ob, op);
744}
745
746/** Client wants to examine some object. So lets do so. */
747void
748ExCmd (char *buf, int len, player *pl)
749{
750 tag_t tag = atoi (buf);
751
752 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
753 {
754 std::string s = op->describe (pl->ob);
755
756 packet sl ("ex");
757 sl << ber32 (tag) << s.c_str ();
758
759 pl->ns->send_packet (sl);
760 }
741} 761}
742 762
743/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
744void 764void
745ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
… …
753 return; 773 return;
754 774
755 /* If the high bit is set, player applied a pseudo object. */ 775 /* If the high bit is set, player applied a pseudo object. */
756 if (tag & 0x80000000) 776 if (tag & 0x80000000)
757 { 777 {
758 pl->socket->look_position = tag & 0x7fffffff; 778 pl->ns->look_position = tag & 0x7fffffff;
759 pl->socket->floorbox_update (); 779 pl->ns->floorbox_update ();
760 return; 780 return;
761 } 781 }
762 782
763 object *op = esrv_get_ob_from_count (pl->ob, tag); 783 object *op = esrv_get_ob_from_count (pl->ob, tag);
764 784
… …
832 852
833 m = get_map_from_coord (op->map, &x, &y); 853 m = get_map_from_coord (op->map, &x, &y);
834 if (!m) 854 if (!m)
835 return; 855 return;
836 856
837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 857 for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
858 ;
838 859
839 for (; tmp != NULL; tmp = tmp->below) 860 for (; tmp; tmp = tmp->below)
840 { 861 {
841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
842 continue; 863 continue;
843 864
844 if (!flag) 865 if (!flag)
… …
873 else 894 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
875 } 896 }
876} 897}
877 898
878
879
880/** Client wants to look at some object. Lets do so. */ 899/** Client wants to look at some object. Lets do so. */
881void 900void
882LookAt (char *buf, int len, player *pl) 901LookAt (char *buf, int len, player *pl)
883{ 902{
884 int dx, dy; 903 int dx, dy;
885 char *cp; 904 char *cp;
886 905
887 dx = atoi (buf); 906 dx = atoi (buf);
888 if (!(cp = strchr (buf, ' '))) 907 if (!(cp = strchr (buf, ' ')))
889 {
890 return; 908 return;
891 } 909
892 dy = atoi (cp); 910 dy = atoi (cp);
893
894 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 911 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return; 912 return;
896 913
897 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 914 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
898 return; 915 return;
899 916
900 look_at (pl->ob, dx, dy); 917 look_at (pl->ob, dx, dy);
901} 918}
902 919

Diff Legend

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