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.32 by root, Tue Jan 9 21:32:43 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
… …
324 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
325 326
326 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 328}
328 329
329
330/** 330/**
331 * Send the look window. Don't need to do animations here 331 * 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 332 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 333 * because object ordering would otherwise be inconsistent.
334 */ 334 */
335void 335void
336esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
337{ 337{
338 object *tmp, *last;
339 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
340 char buf[MAX_BUF]; 339 char buf[MAX_BUF];
341 340
342 if (!pl->contr->ns->update_look) 341 if (!pl->contr->ns->update_look)
343 { 342 {
… …
350 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (pl, FLAG_REMOVED)
351 || !pl->map 350 || !pl->map
352 || pl->map->in_memory != MAP_IN_MEMORY 351 || pl->map->in_memory != MAP_IN_MEMORY
353 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (pl->map, pl->x, pl->y))
354 return; 353 return;
355
356 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
357 ;
358 354
359 pl->contr->ns->send_packet ("delinv 0"); 355 pl->contr->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->contr->ns->itemcmd);
… …
382 378
383 if (pl->contr->ns->itemcmd == 2) 379 if (pl->contr->ns->itemcmd == 2)
384 sl << uint16 (0); 380 sl << uint16 (0);
385 } 381 }
386 382
383 object *tmp = pl->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->contr->ns->look_position)
401 continue; 398 continue;
402 399
403 end_look++; 400 end_look++;
… …
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;
457 int got_one = 0; 453 int got_one = 0;
458
459 454
460 pl->contr->ns->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->ns->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->ns, sl, head); 473 add_object_to_socklist (*pl->contr->ns, sl, head);
479 474
480 got_one++; 475 got_one++;
481 476
… …
490 sl.reset (); 485 sl.reset ();
491 sl.printf ("item%d ", pl->contr->ns->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->ns->send_packet (sl); 494 pl->contr->ns->send_packet (sl);
500} 495}
… …
511esrv_update_item (int flags, object *pl, object *op) 506esrv_update_item (int flags, object *pl, object *op)
512{ 507{
513 /* If we have a request to send the player item, skip a few checks. */ 508 /* If we have a request to send the player item, skip a few checks. */
514 if (op != pl) 509 if (op != pl)
515 { 510 {
516 if (!LOOK_OBJ (op)) 511 if (!op->client_visible ())
517 return; 512 return;
518 /* we remove the check for op->env, because in theory, the object 513 /* we remove the check for op->env, because in theory, the object
519 * is hopefully in the same place, so the client should preserve 514 * is hopefully in the same place, so the client should preserve
520 * order. 515 * order.
521 */ 516 */
522 } 517 }
523 518
519 client *ns = pl->contr->ns;
520 if (!ns)
521 return;
522
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 523 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 524 {
526 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 525 /* 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 526 * this is happening - we can set a breakpoint here in the debugger
528 * and track back the call. 527 * and track back the call.
… …
550 sint32 weight = WEIGHT (op); 549 sint32 weight = WEIGHT (op);
551 550
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 551 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553 552
554 if (pl == op) 553 if (pl == op)
555 op->contr->last_weight = weight; 554 ns->last_weight = weight;
556 } 555 }
557 556
558 if (flags & UPD_FACE) 557 if (flags & UPD_FACE)
559 { 558 {
560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 559 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
561 esrv_send_face (pl->contr->ns, op->face->number, 0); 560 esrv_send_face (ns, op->face->number, 0);
562 561
563 sl << uint32 (op->face->number); 562 sl << uint32 (op->face->number);
564 } 563 }
565 564
566 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
… …
633{ 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 {

Diff Legend

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