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.60 by root, Tue Apr 22 07:01:47 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The author 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 : head->client_weight ())
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_ACTIVE
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 */
523 } 519 }
524 520
521 client *ns = pl->contr->ns;
522 if (!ns)
523 return;
524
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 { 526 {
527 /* 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
528 * 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
529 * and track back the call. 529 * and track back the call.
… …
546 if (flags & UPD_FLAGS) 546 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 547 sl << uint32 (query_flags (op));
548 548
549 if (flags & UPD_WEIGHT) 549 if (flags & UPD_WEIGHT)
550 { 550 {
551 sint32 weight = WEIGHT (op); 551 sint32 weight = op->client_weight ();
552 552
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 554
555#if 0
555 if (pl == op) 556 if (pl == op)
556 op->contr->last_weight = weight; 557 ns->last_weight = weight;
558#endif
557 } 559 }
558 560
559 if (flags & UPD_FACE) 561 if (flags & UPD_FACE)
560 { 562 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 563 ns->send_face (op->face, -50);
562 esrv_send_face (pl->contr->ns, op->face->number, 0); 564 ns->flush_fx ();
563
564 sl << uint32 (op->face->number); 565 sl << uint32 (op->face);
565 } 566 }
566 567
567 if (flags & UPD_NAME) 568 if (flags & UPD_NAME)
568 { 569 {
569 int len; 570 int len;
… …
603 { 604 {
604 if (op->anim_speed) 605 if (op->anim_speed)
605 anim_speed = op->anim_speed; 606 anim_speed = op->anim_speed;
606 else 607 else
607 { 608 {
608 if (FABS (op->speed) < 0.001) 609 if (fabs (op->speed) < 0.001)
609 anim_speed = 255; 610 anim_speed = 255;
610 else if (FABS (op->speed) >= 1.0) 611 else if (fabs (op->speed) >= 1.0)
611 anim_speed = 1; 612 anim_speed = 1;
612 else 613 else
613 anim_speed = (int) (1.0 / FABS (op->speed)); 614 anim_speed = (int) (1.0 / fabs (op->speed));
614 } 615 }
615 616
616 if (anim_speed > 255) 617 if (anim_speed > 255)
617 anim_speed = 255; 618 anim_speed = 255;
618 } 619 }
… …
630 * Sends item's info to player. 631 * Sends item's info to player.
631 */ 632 */
632void 633void
633esrv_send_item (object *pl, object *op) 634esrv_send_item (object *pl, object *op)
634{ 635{
636 if (!pl->contr->ns)
637 return;
638
635 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
636 if (op != pl) 640 if (op != pl)
637 { 641 {
638 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visible' objects to the client */
639 if (!LOOK_OBJ (op)) 643 if (!op->client_visible ())
640 return; 644 return;
645
641 /* if the item is on the ground, mark that the look needs to 646 /* if the item is on the ground, mark that the look needs to
642 * be updated. 647 * be updated.
643 */ 648 */
644 if (!op->env) 649 if (!op->env)
645 { 650 {
… …
662 pl->contr->ns->send_packet (sl); 667 pl->contr->ns->send_packet (sl);
663 SET_FLAG (op, FLAG_CLIENT_SENT); 668 SET_FLAG (op, FLAG_CLIENT_SENT);
664} 669}
665 670
666/** 671/**
667 * Tells the client to delete an item. Uses the item 672 * Tells the client to delete an item.
668 * 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
729 /* If the high bit is set, player examined a pseudo object. */
730 if (tag & 0x80000000)
731 return;
732 736
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)
… …
780 tag_t tag = net_uint32 ((uint8 *)data + 1); 801 tag_t tag = net_uint32 ((uint8 *)data + 1);
781 object *op = esrv_get_ob_from_count (pl->ob, tag); 802 object *op = esrv_get_ob_from_count (pl->ob, tag);
782 803
783 if (!op) 804 if (!op)
784 { 805 {
785 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 806 pl->failmsg ("Could not find object to lock/unlock");
786 return; 807 return;
787 } 808 }
788 809
789 if (!flag) 810 if (!flag)
790 CLEAR_FLAG (op, FLAG_INV_LOCKED); 811 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
801 tag_t tag = net_uint32 ((uint8 *)data); 822 tag_t tag = net_uint32 ((uint8 *)data);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 823 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 824
804 if (!op) 825 if (!op)
805 { 826 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 827 pl->failmsg ("Could not find object to mark");
807 return; 828 return;
808 } 829 }
809 830
810 pl->mark = op; 831 pl->mark = op;
811 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 832 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
812} 833}
813 834
814/** 835/**
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 dynbuf_text buf;
824 int flag = 0; 845 object *ob = pl->ob;
825 sint16 x, y;
826 maptile *m;
827 846
828 x = op->x + dx; 847 if (!pl->observe->map)
829 y = op->y + dy;
830
831 if (out_of_map (op->map, x, y))
832 return; 848 return;
833 849
834 m = get_map_from_coord (op->map, &x, &y); 850 mapxy pos (pl->observe);
835 if (!m) 851 pos.move (dx, dy);
852
853 if (pos.normalise ())
854 for (object *tmp = pos->top; tmp; tmp = tmp->below)
855 {
856 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
857 continue;
858
859 if (QUERY_FLAG (ob, FLAG_WIZ))
860 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
861 else
862 buf.printf ("- %s.\n", query_name (tmp));
863
864 object *head = tmp->head_ ();
865
866 if (head->inv)
867 if ((head->type != CONTAINER && head->type != FLESH)
868 || QUERY_FLAG (ob, FLAG_WIZ))
869 buf << head->query_inventory (ob, " ");
870
871 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
872 break;
873 }
874
875 if (buf.empty ())
876 pl->failmsg ("You see nothing there.");
877 else
878 pl->infobox (MSG_CHANNEL ("lookat"), buf);
879}
880
881/** Client wants to look at some object. Lets do so. */
882void
883LookAt (char *buf, int len, player *pl)
884{
885 char *cp;
886
887 int dx = atoi (buf);
888 if (!(cp = strchr (buf, ' ')))
836 return; 889 return;
837 890
838 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
839
840 for (; tmp != NULL; tmp = tmp->below)
841 {
842 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
843 continue;
844
845 if (!flag)
846 {
847 if (dx || dy)
848 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
849 else
850 {
851 clear_win_info (op);
852 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
853 }
854 flag = 1;
855 }
856
857 if (QUERY_FLAG (op, FLAG_WIZ))
858 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
859 else
860 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
861
862 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
863 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
864 inventory (op, tmp->head == NULL ? tmp : tmp->head);
865
866 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
867 break;
868 }
869
870 if (!flag)
871 {
872 if (dx || dy)
873 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
874 else
875 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
876 }
877}
878
879
880
881/** Client wants to look at some object. Lets do so. */
882void
883LookAt (char *buf, int len, player *pl)
884{
885 int dx, dy;
886 char *cp;
887
888 dx = atoi (buf);
889 if (!(cp = strchr (buf, ' ')))
890 {
891 return;
892 }
893 dy = atoi (cp); 891 int dy = atoi (cp);
894 892
893 if (player *opl = pl->observe->contr)
894 if (client *ns = opl->ns)
895 {
895 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 896 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
896 return; 897 return;
897 898
898 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 899 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
899 return; 900 return;
901 }
900 902
901 look_at (pl->ob, dx, dy); 903 look_at (pl, dx, dy);
902} 904}
903 905
904/** Move an object to a new location */ 906/** Move an object to a new location */
905void 907void
906esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 908esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
922 /* If it is an active container, then we should drop all objects 924 /* If it is an active container, then we should drop all objects
923 * in the container and not the container itself. 925 * in the container and not the container itself.
924 */ 926 */
925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 927 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
926 { 928 {
927 object *current, *next; 929 int cnt = MAX_ITEM_PER_DROP;
928 930
929 for (current = op->inv; current != NULL; current = next) 931 for (object *current = op->inv; current; )
930 { 932 {
931 next = current->below; 933 object *next = current->below;
934
932 drop_object (pl, current, 0); 935 drop_object (pl, current, 0);
936
937 if (--cnt <= 0) break;
938
939 current = next;
933 } 940 }
934 941
935 esrv_update_item (UPD_WEIGHT, pl, op); 942 if (cnt <= 0)
943 op->failmsg ("Only dropped some items, can't drop that many items at once.");
936 } 944 }
937 else 945 else
938 drop_object (pl, op, nrof); 946 drop_object (pl, op, nrof);
947
948 update_after_inventory_change (pl);
939 949
940 return; 950 return;
941 } 951 }
942 else if (to == pl->count) 952 else if (to == pl->count)
943 { /* pick it up to the inventory */ 953 { /* pick it up to the inventory */
… …
961 * has already been done (eg, it can be picked up and fits in 971 * has already been done (eg, it can be picked up and fits in
962 * in a sack, so check for those things. We should also check 972 * in a sack, so check for those things. We should also check
963 * an make sure env is in fact a container for that matter. 973 * an make sure env is in fact a container for that matter.
964 */ 974 */
965 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 975 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
976 {
966 put_object_in_sack (pl, env, op, nrof); 977 put_object_in_sack (pl, env, op, nrof);
978 update_after_inventory_change (pl);
979 }
967} 980}
968 981

Diff Legend

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