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.42 by root, Wed Mar 14 00:04:59 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 270
271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
272 esrv_send_animation (&ns, head->animation_id); 272 ns.send_animation (head->animation_id);
273 273
274 sl << uint32 (head->count) 274 sl << uint32 (head->count)
275 << uint32 (flags) 275 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
277 << uint32 (head->face->number); 277 << uint32 (head->face);
278 278
279 if (!head->custom_name) 279 if (!head->custom_name)
280 { 280 {
281 strncpy (item_n, query_base_name (head, 0), 127); 281 strncpy (item_n, query_base_name (head, 0), 127);
282 item_n[127] = 0; 282 item_n[127] = 0;
… …
303 { 303 {
304 if (head->anim_speed) 304 if (head->anim_speed)
305 anim_speed = head->anim_speed; 305 anim_speed = head->anim_speed;
306 else 306 else
307 { 307 {
308 if (FABS (head->speed) < 0.001) 308 if (fabs (head->speed) < 0.001)
309 anim_speed = 255; 309 anim_speed = 255;
310 else if (FABS (head->speed) >= 1.0) 310 else if (fabs (head->speed) >= 1.0)
311 anim_speed = 1; 311 anim_speed = 1;
312 else 312 else
313 anim_speed = (int) (1.0 / FABS (head->speed)); 313 anim_speed = (int) (1.0 / fabs (head->speed));
314 } 314 }
315 315
316 if (anim_speed > 255) 316 if (anim_speed > 255)
317 anim_speed = 255; 317 anim_speed = 255;
318 } 318 }
… …
323 if (ns.itemcmd == 2) 323 if (ns.itemcmd == 2)
324 sl << uint16 (head->client_type); 324 sl << uint16 (head->client_type);
325 325
326 SET_FLAG (head, FLAG_CLIENT_SENT); 326 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 327}
328
329 328
330/** 329/**
331 * Send the look window. Don't need to do animations here 330 * Send the look window. Don't need to do animations here
332 * This sends all the faces to the client, not just updates. This is 331 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 332 * because object ordering would otherwise be inconsistent.
334 */ 333 */
335void 334void
336esrv_draw_look (object *pl) 335esrv_draw_look (object *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
342 if (!pl->contr->socket->update_look) 339 if (!pl->contr->ns->update_look)
343 { 340 {
344 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
345 return; 342 return;
346 } 343 }
347 else 344 else
348 pl->contr->socket->update_look = 0; 345 pl->contr->ns->update_look = 0;
349 346
350 if (QUERY_FLAG (pl, FLAG_REMOVED) 347 if (QUERY_FLAG (pl, FLAG_REMOVED)
351 || !pl->map 348 || !pl->map
352 || pl->map->in_memory != MAP_IN_MEMORY 349 || pl->map->in_memory != MAP_IN_MEMORY
353 || out_of_map (pl->map, pl->x, pl->y)) 350 || out_of_map (pl->map, pl->x, pl->y))
354 return; 351 return;
355 352
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"); 353 pl->contr->ns->send_packet ("delinv 0");
360 354
361 packet sl; 355 packet sl;
362 sl.printf ("item%d ", pl->contr->socket->itemcmd); 356 sl.printf ("item%d ", pl->contr->ns->itemcmd);
363 357
364 sl << uint32 (0); 358 sl << uint32 (0);
365 359
366 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 360 pl->contr->ns->send_face (empty_face);
367 esrv_send_face (pl->contr->socket, empty_face->number, 0);
368 361
369 if (pl->contr->socket->look_position) 362 if (pl->contr->ns->look_position)
370 { 363 {
371 char buf[80]; 364 char buf[80];
372 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
373 366
374 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
375 << uint32 (0) 368 << uint32 (0)
376 << sint32 (-1) 369 << sint32 (-1)
377 << uint32 (empty_face->number) 370 << uint32 (empty_face)
378 << data8 (buf) 371 << data8 (buf)
379 << uint16 (0) 372 << uint16 (0)
380 << uint8 (0) 373 << uint8 (0)
381 << uint32 (0); 374 << uint32 (0);
382 375
383 if (pl->contr->socket->itemcmd == 2) 376 if (pl->contr->ns->itemcmd == 2)
384 sl << uint16 (0); 377 sl << uint16 (0);
385 } 378 }
386 379
380 object *tmp = pl->ms ().top;
387 for (last = NULL; tmp != last; tmp = tmp->below) 381 for (object *last = 0; tmp != last; tmp = tmp->below)
388 { 382 {
389 object *head; 383 object *head;
390 384
391 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 385 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
392 { 386 {
393 last = tmp->below; /* assumes double floor mode */ 387 last = tmp->below; /* assumes double floor mode */
394 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 388 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
395 last = last->below; 389 last = last->below;
396 } 390 }
397 391
398 if (LOOK_OBJ (tmp)) 392 if (tmp->client_visible ())
399 { 393 {
400 if (++start_look < pl->contr->socket->look_position) 394 if (++start_look < pl->contr->ns->look_position)
401 continue; 395 continue;
402 396
403 end_look++; 397 end_look++;
404 398
405 if (end_look > FLOORBOX_PAGESIZE) 399 if (end_look > FLOORBOX_PAGESIZE)
406 { 400 {
407 /* What we basically do is make a 'fake' object - when the user applies it, 401 /* 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. 402 * we notice the special tag the object has, and act accordingly.
409 */ 403 */
410 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) 404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
411 << uint32 (0) 405 << uint32 (0)
412 << uint32 ((uint32) - 1) 406 << uint32 ((uint32) - 1)
413 << uint32 (empty_face->number) 407 << uint32 (empty_face)
414 << data8 ("Apply this to see next group of items") 408 << data8 ("Apply this to see next group of items")
415 << uint16 (0) 409 << uint16 (0)
416 << uint8 (0) 410 << uint8 (0)
417 << uint32 (0); 411 << uint32 (0);
418 412
419 if (pl->contr->socket->itemcmd == 2) 413 if (pl->contr->ns->itemcmd == 2)
420 sl << uint16 (0); 414 sl << uint16 (0);
421 415
422 break; 416 break;
423 } 417 }
424 418
425 if (tmp->head) 419 if (tmp->head)
426 head = tmp->head; 420 head = tmp->head;
427 else 421 else
428 head = tmp; 422 head = tmp;
429 423
430 add_object_to_socklist (*pl->contr->socket, sl, head); 424 add_object_to_socklist (*pl->contr->ns, sl, head);
431 got_one++; 425 got_one++;
432 426
433 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 427 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
434 { 428 {
435 pl->contr->socket->send_packet (sl); 429 pl->contr->ns->send_packet (sl);
436 430
437 sl.reset (); 431 sl.reset ();
438 sl.printf ("item%d ", pl->contr->socket->itemcmd); 432 sl.printf ("item%d ", pl->contr->ns->itemcmd);
439 sl << uint32 (0); 433 sl << uint32 (0);
440 got_one = 0; 434 got_one = 0;
441 } 435 }
442 } 436 }
443 } 437 }
444 438
445 if (got_one) 439 if (got_one)
446 pl->contr->socket->send_packet (sl); 440 pl->contr->ns->send_packet (sl);
447 441
448} 442}
449 443
450/** 444/**
451 * Sends whole inventory. 445 * Sends whole inventory.
452 */ 446 */
453void 447void
454esrv_send_inventory (object *pl, object *op) 448esrv_send_inventory (object *pl, object *op)
455{ 449{
456 object *tmp; 450 if (!pl->contr->ns)//D
451 return;
452
457 int got_one = 0; 453 int got_one = 0;
458 454
459
460 pl->contr->socket->send_packet_printf ("delinv %d", op->count); 455 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
461 456
462 packet sl; 457 packet sl;
463 sl.printf ("item%d ", pl->contr->socket->itemcmd); 458 sl.printf ("item%d ", pl->contr->ns->itemcmd);
464 459
465 sl << uint32 (op->count); 460 sl << uint32 (op->count);
466 461
467 for (tmp = op->inv; tmp; tmp = tmp->below) 462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
468 { 463 {
469 object *head; 464 object *head;
470 465
471 if (tmp->head) 466 if (tmp->head)
472 head = tmp->head; 467 head = tmp->head;
473 else 468 else
474 head = tmp; 469 head = tmp;
475 470
476 if (LOOK_OBJ (head)) 471 if (head->client_visible ())
477 { 472 {
478 add_object_to_socklist (*pl->contr->socket, sl, head); 473 add_object_to_socklist (*pl->contr->ns, sl, head);
479 474
480 got_one++; 475 got_one++;
481 476
482 /* IT is possible for players to accumulate a huge amount of 477 /* IT is possible for players to accumulate a huge amount of
483 * items (especially with some of the bags out there) to 478 * items (especially with some of the bags out there) to
484 * overflow the buffer. IF so, send multiple item commands. 479 * overflow the buffer. IF so, send multiple item commands.
485 */ 480 */
486 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 481 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
487 { 482 {
488 pl->contr->socket->send_packet (sl); 483 pl->contr->ns->send_packet (sl);
489 484
490 sl.reset (); 485 sl.reset ();
491 sl.printf ("item%d ", pl->contr->socket->itemcmd); 486 sl.printf ("item%d ", pl->contr->ns->itemcmd);
492 sl << uint32 (op->count); 487 sl << uint32 (op->count);
493 got_one = 0; 488 got_one = 0;
494 } 489 }
495 } /* If LOOK_OBJ() */ 490 }
496 } 491 }
497 492
498 if (got_one) 493 if (got_one)
499 pl->contr->socket->send_packet (sl); 494 pl->contr->ns->send_packet (sl);
500} 495}
501 496
502/** 497/**
503 * Updates object *op for player *pl. 498 * Updates object *op for player *pl.
504 * 499 *
505 * flags is a list of values to update 500 * flags is a list of values to update
506 * to the client (as defined in newclient.h - might as well use the 501 * to the client (as defined in newclient.h - might as well use the
507 * same value both places. 502 * same value both places.
508 */ 503 */
509
510void 504void
511esrv_update_item (int flags, object *pl, object *op) 505esrv_update_item (int flags, object *pl, object *op)
512{ 506{
513 /* If we have a request to send the player item, skip a few checks. */ 507 /* If we have a request to send the player item, skip a few checks. */
514 if (op != pl) 508 if (op != pl)
515 { 509 {
516 if (!LOOK_OBJ (op)) 510 if (!op->client_visible ())
517 return; 511 return;
518 /* we remove the check for op->env, because in theory, the object 512 /* we remove the check for op->env, because in theory, the object
519 * is hopefully in the same place, so the client should preserve 513 * is hopefully in the same place, so the client should preserve
520 * order. 514 * order.
521 */ 515 */
522 } 516 }
523 517
518 client *ns = pl->contr->ns;
519 if (!ns)
520 return;
521
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 522 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 523 {
526 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 524 /* 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 525 * this is happening - we can set a breakpoint here in the debugger
528 * and track back the call. 526 * and track back the call.
… …
550 sint32 weight = WEIGHT (op); 548 sint32 weight = WEIGHT (op);
551 549
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 550 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553 551
554 if (pl == op) 552 if (pl == op)
555 op->contr->last_weight = weight; 553 ns->last_weight = weight;
556 } 554 }
557 555
558 if (flags & UPD_FACE) 556 if (flags & UPD_FACE)
559 { 557 {
560 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 558 ns->send_face (op->face);
561 esrv_send_face (pl->contr->socket, op->face->number, 0);
562
563 sl << uint32 (op->face->number); 559 sl << uint32 (op->face);
564 } 560 }
565 561
566 if (flags & UPD_NAME) 562 if (flags & UPD_NAME)
567 { 563 {
568 int len; 564 int len;
… …
602 { 598 {
603 if (op->anim_speed) 599 if (op->anim_speed)
604 anim_speed = op->anim_speed; 600 anim_speed = op->anim_speed;
605 else 601 else
606 { 602 {
607 if (FABS (op->speed) < 0.001) 603 if (fabs (op->speed) < 0.001)
608 anim_speed = 255; 604 anim_speed = 255;
609 else if (FABS (op->speed) >= 1.0) 605 else if (fabs (op->speed) >= 1.0)
610 anim_speed = 1; 606 anim_speed = 1;
611 else 607 else
612 anim_speed = (int) (1.0 / FABS (op->speed)); 608 anim_speed = (int) (1.0 / fabs (op->speed));
613 } 609 }
614 610
615 if (anim_speed > 255) 611 if (anim_speed > 255)
616 anim_speed = 255; 612 anim_speed = 255;
617 } 613 }
… …
620 } 616 }
621 617
622 if (flags & UPD_NROF) 618 if (flags & UPD_NROF)
623 sl << uint32 (op->nrof); 619 sl << uint32 (op->nrof);
624 620
625 pl->contr->socket->send_packet (sl); 621 pl->contr->ns->send_packet (sl);
626} 622}
627 623
628/** 624/**
629 * Sends item's info to player. 625 * Sends item's info to player.
630 */ 626 */
631void 627void
632esrv_send_item (object *pl, object *op) 628esrv_send_item (object *pl, object *op)
633{ 629{
630 if (!pl->contr->ns)
631 return;
632
634 /* If this is not the player object, do some more checks */ 633 /* If this is not the player object, do some more checks */
635 if (op != pl) 634 if (op != pl)
636 { 635 {
637 /* We only send 'visibile' objects to the client */ 636 /* We only send 'visibile' objects to the client */
638 if (!LOOK_OBJ (op)) 637 if (!op->client_visible ())
639 return; 638 return;
639
640 /* if the item is on the ground, mark that the look needs to 640 /* if the item is on the ground, mark that the look needs to
641 * be updated. 641 * be updated.
642 */ 642 */
643 if (!op->env) 643 if (!op->env)
644 { 644 {
645 pl->contr->socket->floorbox_update (); 645 pl->contr->ns->floorbox_update ();
646 return; 646 return;
647 } 647 }
648 } 648 }
649 649
650 packet sl; 650 packet sl;
651 651
652 sl.printf ("item%d ", pl->contr->socket->itemcmd); 652 sl.printf ("item%d ", pl->contr->ns->itemcmd);
653 653
654 if (op->head) 654 if (op->head)
655 op = op->head; 655 op = op->head;
656 656
657 sl << uint32 (op->env ? op->env->count : 0); 657 sl << uint32 (op->env ? op->env->count : 0);
658 658
659 add_object_to_socklist (*pl->contr->socket, sl, op); 659 add_object_to_socklist (*pl->contr->ns, sl, op);
660 660
661 pl->contr->socket->send_packet (sl); 661 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT); 662 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 663}
664 664
665/** 665/**
666 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
667 * command with a -1 location. 667 * command with a -1 location.
668 */ 668 */
669
670void 669void
671esrv_del_item (player *pl, int tag) 670esrv_del_item (player *pl, int tag)
672{ 671{
672 if (!pl->ns)
673 return;
674
673 packet sl ("delitem"); 675 packet sl ("delitem");
674 676
675 sl << uint32 (tag); 677 sl << uint32 (tag);
676 678
677 pl->socket->send_packet (sl); 679 pl->ns->send_packet (sl);
678} 680}
679 681
680 682
681/******************************************************************************* 683/*******************************************************************************
682 * 684 *
… …
753 return; 755 return;
754 756
755 /* If the high bit is set, player applied a pseudo object. */ 757 /* If the high bit is set, player applied a pseudo object. */
756 if (tag & 0x80000000) 758 if (tag & 0x80000000)
757 { 759 {
758 pl->socket->look_position = tag & 0x7fffffff; 760 pl->ns->look_position = tag & 0x7fffffff;
759 pl->socket->floorbox_update (); 761 pl->ns->floorbox_update ();
760 return; 762 return;
761 } 763 }
762 764
763 object *op = esrv_get_ob_from_count (pl->ob, tag); 765 object *op = esrv_get_ob_from_count (pl->ob, tag);
764 766
… …
873 else 875 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
875 } 877 }
876} 878}
877 879
878
879
880/** Client wants to look at some object. Lets do so. */ 880/** Client wants to look at some object. Lets do so. */
881void 881void
882LookAt (char *buf, int len, player *pl) 882LookAt (char *buf, int len, player *pl)
883{ 883{
884 int dx, dy; 884 int dx, dy;
… …
889 { 889 {
890 return; 890 return;
891 } 891 }
892 dy = atoi (cp); 892 dy = atoi (cp);
893 893
894 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return; 895 return;
896 896
897 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
898 return; 898 return;
899 899
900 look_at (pl->ob, dx, dy); 900 look_at (pl->ob, dx, dy);
901} 901}
902 902

Diff Legend

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