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.33 by root, Fri Jan 12 01:29:13 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
… …
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 329
330
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]; 339 char buf[MAX_BUF];
342 340
343 if (!pl->contr->ns->update_look) 341 if (!pl->contr->ns->update_look)
344 { 342 {
… …
351 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (pl, FLAG_REMOVED)
352 || !pl->map 350 || !pl->map
353 || pl->map->in_memory != MAP_IN_MEMORY 351 || pl->map->in_memory != MAP_IN_MEMORY
354 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (pl->map, pl->x, pl->y))
355 return; 353 return;
356
357 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
358 ;
359 354
360 pl->contr->ns->send_packet ("delinv 0"); 355 pl->contr->ns->send_packet ("delinv 0");
361 356
362 packet sl; 357 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 358 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
383 378
384 if (pl->contr->ns->itemcmd == 2) 379 if (pl->contr->ns->itemcmd == 2)
385 sl << uint16 (0); 380 sl << uint16 (0);
386 } 381 }
387 382
383 object *tmp = pl->ms ().top;
388 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
389 { 385 {
390 object *head; 386 object *head;
391 387
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
393 { 389 {
394 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
396 last = last->below; 392 last = last->below;
397 } 393 }
398 394
399 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
400 { 396 {
401 if (++start_look < pl->contr->ns->look_position) 397 if (++start_look < pl->contr->ns->look_position)
402 continue; 398 continue;
403 399
404 end_look++; 400 end_look++;
… …
452 * Sends whole inventory. 448 * Sends whole inventory.
453 */ 449 */
454void 450void
455esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
456{ 452{
457 object *tmp; 453 if (!pl->contr->ns)//D
454 return;
455
458 int got_one = 0; 456 int got_one = 0;
459
460 457
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 458 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 459
463 packet sl; 460 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 461 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 462
466 sl << uint32 (op->count); 463 sl << uint32 (op->count);
467 464
468 for (tmp = op->inv; tmp; tmp = tmp->below) 465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 466 {
470 object *head; 467 object *head;
471 468
472 if (tmp->head) 469 if (tmp->head)
473 head = tmp->head; 470 head = tmp->head;
474 else 471 else
475 head = tmp; 472 head = tmp;
476 473
477 if (LOOK_OBJ (head)) 474 if (head->client_visible ())
478 { 475 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 476 add_object_to_socklist (*pl->contr->ns, sl, head);
480 477
481 got_one++; 478 got_one++;
482 479
… …
491 sl.reset (); 488 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 490 sl << uint32 (op->count);
494 got_one = 0; 491 got_one = 0;
495 } 492 }
496 } /* If LOOK_OBJ() */ 493 }
497 } 494 }
498 495
499 if (got_one) 496 if (got_one)
500 pl->contr->ns->send_packet (sl); 497 pl->contr->ns->send_packet (sl);
501} 498}
… …
512esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
513{ 510{
514 /* If we have a request to send the player item, skip a few checks. */ 511 /* If we have a request to send the player item, skip a few checks. */
515 if (op != pl) 512 if (op != pl)
516 { 513 {
517 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
518 return; 515 return;
519 /* we remove the check for op->env, because in theory, the object 516 /* we remove the check for op->env, because in theory, the object
520 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
521 * order. 518 * order.
522 */ 519 */
523 } 520 }
524 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 { 527 {
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 528 /* 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 529 * this is happening - we can set a breakpoint here in the debugger
529 * and track back the call. 530 * and track back the call.
… …
551 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
552 553
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 555
555 if (pl == op) 556 if (pl == op)
556 op->contr->last_weight = weight; 557 ns->last_weight = weight;
557 } 558 }
558 559
559 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
560 { 561 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
562 esrv_send_face (pl->contr->ns, op->face->number, 0); 563 esrv_send_face (ns, op->face->number, 0);
563 564
564 sl << uint32 (op->face->number); 565 sl << uint32 (op->face->number);
565 } 566 }
566 567
567 if (flags & UPD_NAME) 568 if (flags & UPD_NAME)
… …
634{ 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 {

Diff Legend

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