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.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) 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);
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 : WEIGHT (head))
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 (object *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
343 if (!pl->contr->ns->update_look) 339 if (!pl->contr->ns->update_look)
344 { 340 {
345 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);
346 return; 342 return;
347 } 343 }
348 else 344 else
349 pl->contr->ns->update_look = 0; 345 pl->contr->ns->update_look = 0;
350 346
… …
352 || !pl->map 348 || !pl->map
353 || pl->map->in_memory != MAP_IN_MEMORY 349 || pl->map->in_memory != MAP_IN_MEMORY
354 || out_of_map (pl->map, pl->x, pl->y)) 350 || out_of_map (pl->map, pl->x, pl->y))
355 return; 351 return;
356 352
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"); 353 pl->contr->ns->send_packet ("delinv 0");
361 354
362 packet sl; 355 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->contr->ns->itemcmd);
364 357
365 sl << uint32 (0); 358 sl << uint32 (0);
366 359
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 360 pl->contr->ns->send_face (empty_face);
368 esrv_send_face (pl->contr->ns, empty_face->number, 0);
369 361
370 if (pl->contr->ns->look_position) 362 if (pl->contr->ns->look_position)
371 { 363 {
372 char buf[80]; 364 char buf[80];
373 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);
374 366
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
376 << uint32 (0) 368 << uint32 (0)
377 << sint32 (-1) 369 << sint32 (-1)
378 << uint32 (empty_face->number) 370 << uint32 (empty_face)
379 << data8 (buf) 371 << data8 (buf)
380 << uint16 (0) 372 << uint16 (0)
381 << uint8 (0) 373 << uint8 (0)
382 << uint32 (0); 374 << uint32 (0);
383 375
384 if (pl->contr->ns->itemcmd == 2) 376 if (pl->contr->ns->itemcmd == 2)
385 sl << uint16 (0); 377 sl << uint16 (0);
386 } 378 }
387 379
380 object *tmp = pl->ms ().top;
388 for (last = NULL; tmp != last; tmp = tmp->below) 381 for (object *last = 0; tmp != last; tmp = tmp->below)
389 { 382 {
390 object *head; 383 object *head;
391 384
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 385 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
393 { 386 {
394 last = tmp->below; /* assumes double floor mode */ 387 last = tmp->below; /* assumes double floor mode */
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 388 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
396 last = last->below; 389 last = last->below;
397 } 390 }
398 391
399 if (LOOK_OBJ (tmp)) 392 if (tmp->client_visible ())
400 { 393 {
401 if (++start_look < pl->contr->ns->look_position) 394 if (++start_look < pl->contr->ns->look_position)
402 continue; 395 continue;
403 396
404 end_look++; 397 end_look++;
… …
409 * we notice the special tag the object has, and act accordingly. 402 * we notice the special tag the object has, and act accordingly.
410 */ 403 */
411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
412 << uint32 (0) 405 << uint32 (0)
413 << uint32 ((uint32) - 1) 406 << uint32 ((uint32) - 1)
414 << uint32 (empty_face->number) 407 << uint32 (empty_face)
415 << data8 ("Apply this to see next group of items") 408 << data8 ("Apply this to see next group of items")
416 << uint16 (0) 409 << uint16 (0)
417 << uint8 (0) 410 << uint8 (0)
418 << uint32 (0); 411 << uint32 (0);
419 412
… …
452 * Sends whole inventory. 445 * Sends whole inventory.
453 */ 446 */
454void 447void
455esrv_send_inventory (object *pl, object *op) 448esrv_send_inventory (object *pl, object *op)
456{ 449{
457 object *tmp; 450 if (!pl->contr->ns)//D
451 return;
452
458 int got_one = 0; 453 int got_one = 0;
459
460 454
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 455 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 456
463 packet sl; 457 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 458 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 459
466 sl << uint32 (op->count); 460 sl << uint32 (op->count);
467 461
468 for (tmp = op->inv; tmp; tmp = tmp->below) 462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 463 {
470 object *head; 464 object *head;
471 465
472 if (tmp->head) 466 if (tmp->head)
473 head = tmp->head; 467 head = tmp->head;
474 else 468 else
475 head = tmp; 469 head = tmp;
476 470
477 if (LOOK_OBJ (head)) 471 if (head->client_visible ())
478 { 472 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 473 add_object_to_socklist (*pl->contr->ns, sl, head);
480 474
481 got_one++; 475 got_one++;
482 476
… …
491 sl.reset (); 485 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 486 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 487 sl << uint32 (op->count);
494 got_one = 0; 488 got_one = 0;
495 } 489 }
496 } /* If LOOK_OBJ() */ 490 }
497 } 491 }
498 492
499 if (got_one) 493 if (got_one)
500 pl->contr->ns->send_packet (sl); 494 pl->contr->ns->send_packet (sl);
501} 495}
… …
505 * 499 *
506 * flags is a list of values to update 500 * flags is a list of values to update
507 * 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
508 * same value both places. 502 * same value both places.
509 */ 503 */
510
511void 504void
512esrv_update_item (int flags, object *pl, object *op) 505esrv_update_item (int flags, object *pl, object *op)
513{ 506{
514 /* 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. */
515 if (op != pl) 508 if (op != pl)
516 { 509 {
517 if (!LOOK_OBJ (op)) 510 if (!op->client_visible ())
518 return; 511 return;
519 /* 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
520 * is hopefully in the same place, so the client should preserve 513 * is hopefully in the same place, so the client should preserve
521 * order. 514 * order.
522 */ 515 */
523 } 516 }
524 517
518 client *ns = pl->contr->ns;
519 if (!ns)
520 return;
521
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 522 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 { 523 {
527 /* 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
528 * 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
529 * and track back the call. 526 * and track back the call.
… …
551 sint32 weight = WEIGHT (op); 548 sint32 weight = WEIGHT (op);
552 549
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 550 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 551
555 if (pl == op) 552 if (pl == op)
556 op->contr->last_weight = weight; 553 ns->last_weight = weight;
557 } 554 }
558 555
559 if (flags & UPD_FACE) 556 if (flags & UPD_FACE)
560 { 557 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 558 ns->send_face (op->face);
562 esrv_send_face (pl->contr->ns, op->face->number, 0);
563
564 sl << uint32 (op->face->number); 559 sl << uint32 (op->face);
565 } 560 }
566 561
567 if (flags & UPD_NAME) 562 if (flags & UPD_NAME)
568 { 563 {
569 int len; 564 int len;
… …
603 { 598 {
604 if (op->anim_speed) 599 if (op->anim_speed)
605 anim_speed = op->anim_speed; 600 anim_speed = op->anim_speed;
606 else 601 else
607 { 602 {
608 if (FABS (op->speed) < 0.001) 603 if (fabs (op->speed) < 0.001)
609 anim_speed = 255; 604 anim_speed = 255;
610 else if (FABS (op->speed) >= 1.0) 605 else if (fabs (op->speed) >= 1.0)
611 anim_speed = 1; 606 anim_speed = 1;
612 else 607 else
613 anim_speed = (int) (1.0 / FABS (op->speed)); 608 anim_speed = (int) (1.0 / fabs (op->speed));
614 } 609 }
615 610
616 if (anim_speed > 255) 611 if (anim_speed > 255)
617 anim_speed = 255; 612 anim_speed = 255;
618 } 613 }
… …
630 * Sends item's info to player. 625 * Sends item's info to player.
631 */ 626 */
632void 627void
633esrv_send_item (object *pl, object *op) 628esrv_send_item (object *pl, object *op)
634{ 629{
630 if (!pl->contr->ns)
631 return;
632
635 /* If this is not the player object, do some more checks */ 633 /* If this is not the player object, do some more checks */
636 if (op != pl) 634 if (op != pl)
637 { 635 {
638 /* We only send 'visibile' objects to the client */ 636 /* We only send 'visibile' objects to the client */
639 if (!LOOK_OBJ (op)) 637 if (!op->client_visible ())
640 return; 638 return;
639
641 /* 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
642 * be updated. 641 * be updated.
643 */ 642 */
644 if (!op->env) 643 if (!op->env)
645 { 644 {
… …
665 664
666/** 665/**
667 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
668 * command with a -1 location. 667 * command with a -1 location.
669 */ 668 */
670
671void 669void
672esrv_del_item (player *pl, int tag) 670esrv_del_item (player *pl, int tag)
673{ 671{
672 if (!pl->ns)
673 return;
674
674 packet sl ("delitem"); 675 packet sl ("delitem");
675 676
676 sl << uint32 (tag); 677 sl << uint32 (tag);
677 678
678 pl->ns->send_packet (sl); 679 pl->ns->send_packet (sl);
… …
874 else 875 else
875 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
876 } 877 }
877} 878}
878 879
879
880
881/** Client wants to look at some object. Lets do so. */ 880/** Client wants to look at some object. Lets do so. */
882void 881void
883LookAt (char *buf, int len, player *pl) 882LookAt (char *buf, int len, player *pl)
884{ 883{
885 int dx, dy; 884 int dx, dy;
… …
890 { 889 {
891 return; 890 return;
892 } 891 }
893 dy = atoi (cp); 892 dy = atoi (cp);
894 893
895 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
896 return; 895 return;
897 896
898 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
899 return; 898 return;
900 899

Diff Legend

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