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.29 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.61 by root, Tue Apr 22 07:28:05 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 authors can be reached via e-mail to <support@deliantra.net>
21 The author 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 : head->client_weight ())
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->ns->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->ns->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_ACTIVE
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->ns->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->ns->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->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 pl->ns->send_face (empty_face, -50);
367 esrv_send_face (pl->contr->ns, empty_face->number, 0); 363 pl->ns->flush_fx ();
368 364
369 if (pl->contr->ns->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->ns->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->ns->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->ns->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->ns->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->ns->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->ns, 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->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
436 433
437 sl.reset (); 434 sl.reset ();
438 sl.printf ("item%d ", pl->contr->ns->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->ns->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
459 457
460 pl->contr->ns->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->ns->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->ns, 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->ns->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->ns->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->ns->send_packet (sl); 497 pl->contr->ns->send_packet (sl);
500} 498}
… …
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 && !op->client_visible ())
515 {
516 if (!LOOK_OBJ (op))
517 return; 512 return;
518 /* we remove the check for op->env, because in theory, the object 513
519 * is hopefully in the same place, so the client should preserve 514 client *ns = pl->contr->ns;
520 * order. 515 if (!ns)
521 */ 516 return;
522 }
523 517
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 518 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 519 {
526 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 520 /* 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 521 * this is happening - we can set a breakpoint here in the debugger
… …
545 if (flags & UPD_FLAGS) 539 if (flags & UPD_FLAGS)
546 sl << uint32 (query_flags (op)); 540 sl << uint32 (query_flags (op));
547 541
548 if (flags & UPD_WEIGHT) 542 if (flags & UPD_WEIGHT)
549 { 543 {
550 sint32 weight = WEIGHT (op); 544 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
551 545
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553
554 if (pl == op) 546 if (op)
555 op->contr->last_weight = weight; 547 ns->last_weight = weight;
548
549 sl << uint32 (weight);
556 } 550 }
557 551
558 if (flags & UPD_FACE) 552 if (flags & UPD_FACE)
559 { 553 {
560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 554 ns->send_face (op->face, -50);
561 esrv_send_face (pl->contr->ns, op->face->number, 0); 555 ns->flush_fx ();
562
563 sl << uint32 (op->face->number); 556 sl << uint32 (op->face);
564 } 557 }
565 558
566 if (flags & UPD_NAME) 559 if (flags & UPD_NAME)
567 { 560 {
568 int len; 561 int len;
… …
602 { 595 {
603 if (op->anim_speed) 596 if (op->anim_speed)
604 anim_speed = op->anim_speed; 597 anim_speed = op->anim_speed;
605 else 598 else
606 { 599 {
607 if (FABS (op->speed) < 0.001) 600 if (fabs (op->speed) < 0.001)
608 anim_speed = 255; 601 anim_speed = 255;
609 else if (FABS (op->speed) >= 1.0) 602 else if (fabs (op->speed) >= 1.0)
610 anim_speed = 1; 603 anim_speed = 1;
611 else 604 else
612 anim_speed = (int) (1.0 / FABS (op->speed)); 605 anim_speed = (int) (1.0 / fabs (op->speed));
613 } 606 }
614 607
615 if (anim_speed > 255) 608 if (anim_speed > 255)
616 anim_speed = 255; 609 anim_speed = 255;
617 } 610 }
… …
629 * Sends item's info to player. 622 * Sends item's info to player.
630 */ 623 */
631void 624void
632esrv_send_item (object *pl, object *op) 625esrv_send_item (object *pl, object *op)
633{ 626{
627 if (!pl->contr->ns)
628 return;
629
634 /* If this is not the player object, do some more checks */ 630 /* If this is not the player object, do some more checks */
635 if (op != pl) 631 if (op != pl)
636 { 632 {
637 /* We only send 'visibile' objects to the client */ 633 /* We only send 'visible' objects to the client */
638 if (!LOOK_OBJ (op)) 634 if (!op->client_visible ())
639 return; 635 return;
636
640 /* if the item is on the ground, mark that the look needs to 637 /* if the item is on the ground, mark that the look needs to
641 * be updated. 638 * be updated.
642 */ 639 */
643 if (!op->env) 640 if (!op->env)
644 { 641 {
… …
661 pl->contr->ns->send_packet (sl); 658 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT); 659 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 660}
664 661
665/** 662/**
666 * Tells the client to delete an item. Uses the item 663 * Tells the client to delete an item.
667 * command with a -1 location.
668 */ 664 */
669
670void 665void
671esrv_del_item (player *pl, int tag) 666esrv_del_item (player *pl, int tag)
672{ 667{
668 if (!pl->ns)
669 return;
670
673 packet sl ("delitem"); 671 packet sl ("delitem");
674 672
675 sl << uint32 (tag); 673 sl << uint32 (tag);
676 674
677 pl->ns->send_packet (sl); 675 pl->ns->send_packet (sl);
… …
686 684
687/** 685/**
688 * Takes a player and object count (tag) and returns the actual object 686 * Takes a player and object count (tag) and returns the actual object
689 * pointer, or null if it can't be found. 687 * pointer, or null if it can't be found.
690 */ 688 */
691
692object * 689object *
693esrv_get_ob_from_count (object *pl, tag_t count) 690esrv_get_ob_from_count (object *pl, tag_t count)
694{ 691{
695 object *op, *tmp;
696
697 if (pl->count == count) 692 if (pl->count == count)
698 return pl; 693 return pl;
699 694
700 for (op = pl->inv; op; op = op->below) 695 for (object *op = pl->inv; op; op = op->below)
701 if (op->count == count) 696 if (op->count == count)
702 return op; 697 return op;
703 else if (op->type == CONTAINER && pl->container == op) 698 else if (op->type == CONTAINER && pl->container == op)
704 for (tmp = op->inv; tmp; tmp = tmp->below) 699 for (object *tmp = op->inv; tmp; tmp = tmp->below)
705 if (tmp->count == count) 700 if (tmp->count == count)
706 return tmp; 701 return tmp;
707 702
708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 703 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
709 if (op->head && op->head->count == count) 704 if (op->head && op->head->count == count)
710 return op; 705 return op;
711 else if (op->count == count) 706 else if (op->count == count)
712 return op; 707 return op;
713 else if (op->type == CONTAINER && pl->container == op) 708 else if (op->type == CONTAINER && pl->container == op)
714 for (tmp = op->inv; tmp; tmp = tmp->below) 709 for (object *tmp = op->inv; tmp; tmp = tmp->below)
715 if (tmp->count == count) 710 if (tmp->count == count)
716 return tmp; 711 return tmp;
717 712
713#if 0
714 /* If the high bit is set, player examined a pseudo object. */
715 if (count & 0x80000000)
716 return 0;
717#endif
718
718 return 0; 719 return 0;
719} 720}
720 721
721
722/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
723void 723void
724ExamineCmd (char *buf, int len, player *pl) 724ExamineCmd (char *buf, int len, player *pl)
725{ 725{
726 tag_t tag = atoi (buf); 726 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 727
732 object *op = esrv_get_ob_from_count (pl->ob, tag); 728 object *op = esrv_get_ob_from_count (pl->ob, tag);
733 729
734 if (!op) 730 if (!op)
735 { 731 {
736 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 732 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
737 return; 733 return;
738 } 734 }
739 735
740 examine (pl->ob, op); 736 examine (pl->ob, op);
737}
738
739/** Client wants to examine some object. So lets do so. */
740void
741ExCmd (char *buf, int len, player *pl)
742{
743 tag_t tag = atoi (buf);
744
745 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
746 {
747 std::string s = op->describe (pl->ob);
748
749 packet sl ("ex");
750 sl << ber32 (tag) << s.c_str ();
751
752 pl->ns->send_packet (sl);
753 }
741} 754}
742 755
743/** Client wants to apply some object. Lets do so. */ 756/** Client wants to apply some object. Lets do so. */
744void 757void
745ApplyCmd (char *buf, int len, player *pl) 758ApplyCmd (char *buf, int len, player *pl)
… …
779 tag_t tag = net_uint32 ((uint8 *)data + 1); 792 tag_t tag = net_uint32 ((uint8 *)data + 1);
780 object *op = esrv_get_ob_from_count (pl->ob, tag); 793 object *op = esrv_get_ob_from_count (pl->ob, tag);
781 794
782 if (!op) 795 if (!op)
783 { 796 {
784 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 797 pl->failmsg ("Could not find object to lock/unlock");
785 return; 798 return;
786 } 799 }
787 800
788 if (!flag) 801 if (!flag)
789 CLEAR_FLAG (op, FLAG_INV_LOCKED); 802 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
800 tag_t tag = net_uint32 ((uint8 *)data); 813 tag_t tag = net_uint32 ((uint8 *)data);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 814 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 815
803 if (!op) 816 if (!op)
804 { 817 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 818 pl->failmsg ("Could not find object to mark");
806 return; 819 return;
807 } 820 }
808 821
809 pl->mark = op; 822 pl->mark = op;
810 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 823 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
811} 824}
812 825
813/** 826/**
814 * look_at prints items on the specified square. 827 * look_at prints items on the specified square.
815 * 828 *
816 * [ removed EARTHWALL check and added check for containers inventory. 829 * [ removed EARTHWALL check and added check for containers inventory.
817 * Tero.Haatanen@lut.fi ] 830 * Tero.Haatanen@lut.fi ]
818 */ 831 */
819void 832static void
820look_at (object *op, int dx, int dy) 833look_at (player *pl, int dx, int dy)
821{ 834{
822 object *tmp; 835 dynbuf_text buf;
823 int flag = 0; 836 object *ob = pl->ob;
824 sint16 x, y;
825 maptile *m;
826 837
827 x = op->x + dx; 838 if (!pl->observe->map)
828 y = op->y + dy;
829
830 if (out_of_map (op->map, x, y))
831 return; 839 return;
832 840
833 m = get_map_from_coord (op->map, &x, &y); 841 mapxy pos (pl->observe);
834 if (!m) 842 pos.move (dx, dy);
843
844 if (pos.normalise ())
845 for (object *tmp = pos->top; tmp; tmp = tmp->below)
846 {
847 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
848 continue;
849
850 if (QUERY_FLAG (ob, FLAG_WIZ))
851 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
852 else
853 buf.printf ("- %s.\n", query_name (tmp));
854
855 object *head = tmp->head_ ();
856
857 if (head->inv)
858 if ((head->type != CONTAINER && head->type != FLESH)
859 || QUERY_FLAG (ob, FLAG_WIZ))
860 buf << head->query_inventory (ob, " ");
861
862 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
863 break;
864 }
865
866 if (buf.empty ())
867 pl->failmsg ("You see nothing there.");
868 else
869 pl->infobox (MSG_CHANNEL ("lookat"), buf);
870}
871
872/** Client wants to look at some object. Lets do so. */
873void
874LookAt (char *buf, int len, player *pl)
875{
876 char *cp;
877
878 int dx = atoi (buf);
879 if (!(cp = strchr (buf, ' ')))
835 return; 880 return;
836 881
837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
838
839 for (; tmp != NULL; tmp = tmp->below)
840 {
841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
842 continue;
843
844 if (!flag)
845 {
846 if (dx || dy)
847 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
848 else
849 {
850 clear_win_info (op);
851 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
852 }
853 flag = 1;
854 }
855
856 if (QUERY_FLAG (op, FLAG_WIZ))
857 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
858 else
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
860
861 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
862 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
863 inventory (op, tmp->head == NULL ? tmp : tmp->head);
864
865 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
866 break;
867 }
868
869 if (!flag)
870 {
871 if (dx || dy)
872 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
873 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
875 }
876}
877
878
879
880/** Client wants to look at some object. Lets do so. */
881void
882LookAt (char *buf, int len, player *pl)
883{
884 int dx, dy;
885 char *cp;
886
887 dx = atoi (buf);
888 if (!(cp = strchr (buf, ' ')))
889 {
890 return;
891 }
892 dy = atoi (cp); 882 int dy = atoi (cp);
893 883
884 if (player *opl = pl->observe->contr)
885 if (client *ns = opl->ns)
886 {
894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 887 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return; 888 return;
896 889
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 890 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return; 891 return;
892 }
899 893
900 look_at (pl->ob, dx, dy); 894 look_at (pl, dx, dy);
901} 895}
902 896
903/** Move an object to a new location */ 897/** Move an object to a new location */
904void 898void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 899esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
921 /* If it is an active container, then we should drop all objects 915 /* If it is an active container, then we should drop all objects
922 * in the container and not the container itself. 916 * in the container and not the container itself.
923 */ 917 */
924 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 918 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
925 { 919 {
926 object *current, *next; 920 int cnt = MAX_ITEM_PER_DROP;
927 921
928 for (current = op->inv; current != NULL; current = next) 922 for (object *current = op->inv; current; )
929 { 923 {
930 next = current->below; 924 object *next = current->below;
925
931 drop_object (pl, current, 0); 926 drop_object (pl, current, 0);
927
928 if (--cnt <= 0) break;
929
930 current = next;
932 } 931 }
933 932
934 esrv_update_item (UPD_WEIGHT, pl, op); 933 if (cnt <= 0)
934 op->failmsg ("Only dropped some items, can't drop that many items at once.");
935 } 935 }
936 else 936 else
937 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
938
939 update_after_inventory_change (pl);
938 940
939 return; 941 return;
940 } 942 }
941 else if (to == pl->count) 943 else if (to == pl->count)
942 { /* pick it up to the inventory */ 944 { /* pick it up to the inventory */
… …
960 * has already been done (eg, it can be picked up and fits in 962 * has already been done (eg, it can be picked up and fits in
961 * in a sack, so check for those things. We should also check 963 * in a sack, so check for those things. We should also check
962 * an make sure env is in fact a container for that matter. 964 * an make sure env is in fact a container for that matter.
963 */ 965 */
964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 966 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
967 {
965 put_object_in_sack (pl, env, op, nrof); 968 put_object_in_sack (pl, env, op, nrof);
969 update_after_inventory_change (pl);
970 }
966} 971}
967 972

Diff Legend

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