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.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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
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 2 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, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client/server logic. 27 * Client/server logic.
28 * 28 *
29 * \date 2003-12-02 29 * \date 2003-12-02
30 * 30 *
31 * This containes item logic for client/server. It doesn't contain 31 * This contains item logic for client/server. It doesn't contain
32 * the actual commands that send the data, but does contain 32 * the actual commands that send the data, but does contain
33 * the logic for what items should be sent. 33 * the logic for what items should be sent.
34 */ 34 */
35 35
36#include <global.h> 36#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
38#include <sproto.h> 38#include <sproto.h>
39 39
40/** 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 */
41#define MAXITEMLEN 300 41#define MAXITEMLEN 300
42 42
… …
264 264
265 flags = query_flags (head); 265 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 267 flags |= F_NOPICK;
268 268
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
270 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
271 271
272 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])
273 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
274 274
275 sl << uint32 (head->count) 275 sl << uint32 (head->count)
276 << uint32 (flags) 276 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
278 << uint32 (head->face->number); 278 << uint32 (head->face);
279 279
280 if (!head->custom_name) 280 if (!head->custom_name)
281 { 281 {
282 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 283 item_n[127] = 0;
… …
304 { 304 {
305 if (head->anim_speed) 305 if (head->anim_speed)
306 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
307 else 307 else
308 { 308 {
309 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
310 anim_speed = 255; 310 anim_speed = 255;
311 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
312 anim_speed = 1; 312 anim_speed = 1;
313 else 313 else
314 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
315 } 315 }
316 316
317 if (anim_speed > 255) 317 if (anim_speed > 255)
318 anim_speed = 255; 318 anim_speed = 255;
319 } 319 }
… …
324 if (ns.itemcmd == 2) 324 if (ns.itemcmd == 2)
325 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
326 326
327 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
328} 328}
329
330 329
331/** 330/**
332 * Send the look window. Don't need to do animations here 331 * 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 332 * This sends all the faces to the client, not just updates. This is
334 * because object ordering would otherwise be inconsistent. 333 * because object ordering would otherwise be inconsistent.
335 */ 334 */
336void 335void
337esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
338{ 337{
339 object *tmp, *last;
340 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
341 char buf[MAX_BUF];
342 339
343 if (!pl->contr->ns->update_look) 340 if (!pl->contr->ns->update_look)
344 { 341 {
345 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);
346 return; 343 return;
347 } 344 }
348 else 345 else
349 pl->contr->ns->update_look = 0; 346 pl->contr->ns->update_look = 0;
350 347
… …
352 || !pl->map 349 || !pl->map
353 || pl->map->in_memory != MAP_IN_MEMORY 350 || pl->map->in_memory != MAP_IN_MEMORY
354 || out_of_map (pl->map, pl->x, pl->y)) 351 || out_of_map (pl->map, pl->x, pl->y))
355 return; 352 return;
356 353
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"); 354 pl->contr->ns->send_packet ("delinv 0");
361 355
362 packet sl; 356 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 357 sl.printf ("item%d ", pl->contr->ns->itemcmd);
364 358
365 sl << uint32 (0); 359 sl << uint32 (0);
366 360
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 361 pl->contr->ns->send_face (empty_face);
368 esrv_send_face (pl->contr->ns, empty_face->number, 0); 362 pl->contr->ns->flush_fx ();
369 363
370 if (pl->contr->ns->look_position) 364 if (pl->contr->ns->look_position)
371 { 365 {
372 char buf[80]; 366 char buf[80];
373 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);
374 368
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
376 << uint32 (0) 370 << uint32 (0)
377 << sint32 (-1) 371 << sint32 (-1)
378 << uint32 (empty_face->number) 372 << uint32 (empty_face)
379 << data8 (buf) 373 << data8 (buf)
380 << uint16 (0) 374 << uint16 (0)
381 << uint8 (0) 375 << uint8 (0)
382 << uint32 (0); 376 << uint32 (0);
383 377
384 if (pl->contr->ns->itemcmd == 2) 378 if (pl->contr->ns->itemcmd == 2)
385 sl << uint16 (0); 379 sl << uint16 (0);
386 } 380 }
387 381
382 object *tmp = pl->ms ().top;
388 for (last = NULL; tmp != last; tmp = tmp->below) 383 for (object *last = 0; tmp != last; tmp = tmp->below)
389 { 384 {
390 object *head; 385 object *head;
391 386
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
393 { 388 {
394 last = tmp->below; /* assumes double floor mode */ 389 last = tmp->below; /* assumes double floor mode */
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 390 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
396 last = last->below; 391 last = last->below;
397 } 392 }
398 393
399 if (LOOK_OBJ (tmp)) 394 if (tmp->client_visible ())
400 { 395 {
401 if (++start_look < pl->contr->ns->look_position) 396 if (++start_look < pl->contr->ns->look_position)
402 continue; 397 continue;
403 398
404 end_look++; 399 end_look++;
… …
409 * we notice the special tag the object has, and act accordingly. 404 * we notice the special tag the object has, and act accordingly.
410 */ 405 */
411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
412 << uint32 (0) 407 << uint32 (0)
413 << uint32 ((uint32) - 1) 408 << uint32 ((uint32) - 1)
414 << uint32 (empty_face->number) 409 << uint32 (empty_face)
415 << data8 ("Apply this to see next group of items") 410 << data8 ("Apply this to see next group of items")
416 << uint16 (0) 411 << uint16 (0)
417 << uint8 (0) 412 << uint8 (0)
418 << uint32 (0); 413 << uint32 (0);
419 414
… …
452 * Sends whole inventory. 447 * Sends whole inventory.
453 */ 448 */
454void 449void
455esrv_send_inventory (object *pl, object *op) 450esrv_send_inventory (object *pl, object *op)
456{ 451{
457 object *tmp; 452 if (!pl->contr->ns)//D
453 return;
454
458 int got_one = 0; 455 int got_one = 0;
459
460 456
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 457 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 458
463 packet sl; 459 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 460 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 461
466 sl << uint32 (op->count); 462 sl << uint32 (op->count);
467 463
468 for (tmp = op->inv; tmp; tmp = tmp->below) 464 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 465 {
470 object *head; 466 object *head;
471 467
472 if (tmp->head) 468 if (tmp->head)
473 head = tmp->head; 469 head = tmp->head;
474 else 470 else
475 head = tmp; 471 head = tmp;
476 472
477 if (LOOK_OBJ (head)) 473 if (head->client_visible ())
478 { 474 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 475 add_object_to_socklist (*pl->contr->ns, sl, head);
480 476
481 got_one++; 477 got_one++;
482 478
… …
491 sl.reset (); 487 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 488 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 489 sl << uint32 (op->count);
494 got_one = 0; 490 got_one = 0;
495 } 491 }
496 } /* If LOOK_OBJ() */ 492 }
497 } 493 }
498 494
499 if (got_one) 495 if (got_one)
500 pl->contr->ns->send_packet (sl); 496 pl->contr->ns->send_packet (sl);
501} 497}
… …
505 * 501 *
506 * flags is a list of values to update 502 * flags is a list of values to update
507 * 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
508 * same value both places. 504 * same value both places.
509 */ 505 */
510
511void 506void
512esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
513{ 508{
514 /* 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. */
515 if (op != pl) 510 if (op != pl)
516 { 511 {
517 if (!LOOK_OBJ (op)) 512 if (!op->client_visible ())
518 return; 513 return;
519 /* 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
520 * is hopefully in the same place, so the client should preserve 515 * is hopefully in the same place, so the client should preserve
521 * order. 516 * order.
522 */ 517 */
523 } 518 }
524 519
520 client *ns = pl->contr->ns;
521 if (!ns)
522 return;
523
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 { 525 {
527 /* 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
528 * 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
529 * and track back the call. 528 * and track back the call.
… …
551 sint32 weight = WEIGHT (op); 550 sint32 weight = WEIGHT (op);
552 551
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 553
555 if (pl == op) 554 if (pl == op)
556 op->contr->last_weight = weight; 555 ns->last_weight = weight;
557 } 556 }
558 557
559 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
560 { 559 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
562 esrv_send_face (pl->contr->ns, op->face->number, 0); 561 ns->flush_fx ();
563
564 sl << uint32 (op->face->number); 562 sl << uint32 (op->face);
565 } 563 }
566 564
567 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
568 { 566 {
569 int len; 567 int len;
… …
603 { 601 {
604 if (op->anim_speed) 602 if (op->anim_speed)
605 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
606 else 604 else
607 { 605 {
608 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
609 anim_speed = 255; 607 anim_speed = 255;
610 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
611 anim_speed = 1; 609 anim_speed = 1;
612 else 610 else
613 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
614 } 612 }
615 613
616 if (anim_speed > 255) 614 if (anim_speed > 255)
617 anim_speed = 255; 615 anim_speed = 255;
618 } 616 }
… …
630 * Sends item's info to player. 628 * Sends item's info to player.
631 */ 629 */
632void 630void
633esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
634{ 632{
633 if (!pl->contr->ns)
634 return;
635
635 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
636 if (op != pl) 637 if (op != pl)
637 { 638 {
638 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
639 if (!LOOK_OBJ (op)) 640 if (!op->client_visible ())
640 return; 641 return;
642
641 /* 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
642 * be updated. 644 * be updated.
643 */ 645 */
644 if (!op->env) 646 if (!op->env)
645 { 647 {
… …
665 667
666/** 668/**
667 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
668 * command with a -1 location. 670 * command with a -1 location.
669 */ 671 */
670
671void 672void
672esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
673{ 674{
675 if (!pl->ns)
676 return;
677
674 packet sl ("delitem"); 678 packet sl ("delitem");
675 679
676 sl << uint32 (tag); 680 sl << uint32 (tag);
677 681
678 pl->ns->send_packet (sl); 682 pl->ns->send_packet (sl);
… …
687 691
688/** 692/**
689 * 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
690 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
691 */ 695 */
692
693object * 696object *
694esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
695{ 698{
696 object *op, *tmp;
697
698 if (pl->count == count) 699 if (pl->count == count)
699 return pl; 700 return pl;
700 701
701 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
702 if (op->count == count) 703 if (op->count == count)
703 return op; 704 return op;
704 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
705 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
706 if (tmp->count == count) 707 if (tmp->count == count)
707 return tmp; 708 return tmp;
708 709
709 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)
710 if (op->head && op->head->count == count) 711 if (op->head && op->head->count == count)
711 return op; 712 return op;
712 else if (op->count == count) 713 else if (op->count == count)
713 return op; 714 return op;
714 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
715 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
716 if (tmp->count == count) 717 if (tmp->count == count)
717 return tmp; 718 return tmp;
718 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
719 return 0; 726 return 0;
720} 727}
721 728
722
723/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
724void 730void
725ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
726{ 732{
727 tag_t tag = atoi (buf); 733 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 734
733 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
734 736
735 if (!op) 737 if (!op)
736 { 738 {
737 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);
738 return; 740 return;
739 } 741 }
740 742
741 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 }
742} 761}
743 762
744/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
745void 764void
746ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
… …
833 852
834 m = get_map_from_coord (op->map, &x, &y); 853 m = get_map_from_coord (op->map, &x, &y);
835 if (!m) 854 if (!m)
836 return; 855 return;
837 856
838 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 ;
839 859
840 for (; tmp != NULL; tmp = tmp->below) 860 for (; tmp; tmp = tmp->below)
841 { 861 {
842 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
843 continue; 863 continue;
844 864
845 if (!flag) 865 if (!flag)
… …
874 else 894 else
875 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
876 } 896 }
877} 897}
878 898
879
880
881/** Client wants to look at some object. Lets do so. */ 899/** Client wants to look at some object. Lets do so. */
882void 900void
883LookAt (char *buf, int len, player *pl) 901LookAt (char *buf, int len, player *pl)
884{ 902{
885 int dx, dy; 903 int dx, dy;
886 char *cp; 904 char *cp;
887 905
888 dx = atoi (buf); 906 dx = atoi (buf);
889 if (!(cp = strchr (buf, ' '))) 907 if (!(cp = strchr (buf, ' ')))
890 {
891 return; 908 return;
892 } 909
893 dy = atoi (cp); 910 dy = atoi (cp);
894
895 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 911 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
896 return; 912 return;
897 913
898 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 914 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
899 return; 915 return;
900 916

Diff Legend

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