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.81 by root, Tue Oct 20 07:18:11 2009 UTC vs.
Revision 1.91 by root, Thu Apr 8 04:49:02 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
48 48
49/** 49/**
50 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
51 * to be sent to client. 51 * to be sent to client.
52 */ 52 */
53unsigned int 53static unsigned int
54query_flags (object *op) 54query_flags (object *op)
55{ 55{
56 unsigned int flags = 0; 56 unsigned int flags = 0;
57 57
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (QUERY_FLAG (op, FLAG_APPLIED))
… …
120 120
121 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121 if (QUERY_FLAG (head, FLAG_NO_PICK))
122 flags |= F_NOPICK; 122 flags |= F_NOPICK;
123 123
124 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
125 ns.flush_fx ();
126 125
127 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
128 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
129 128
130 sl << uint32 (head->count) 129 sl << uint32 (head->count)
… …
155 154
156 sl << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
157 156
158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
159 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
160 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 159 : 1. / clamp (head->speed, 1./255., 1./1.);
161 160
162 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
163 << uint32 (head->nrof); 162 << uint32 (head->nrof);
164 163
165 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
… …
279 dirty = true; 278 dirty = true;
280 279
281 // if packet got too large, send it and begin a new one 280 // if packet got too large, send it and begin a new one
282 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 281 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
283 { 282 {
283 pl->ns->flush_fx ();
284 pl->ns->send_packet (sl); 284 pl->ns->send_packet (sl);
285 285
286 sl.reset (); 286 sl.reset ();
287 sl.printf ("item%d ", pl->ns->itemcmd); 287 sl.printf ("item%d ", pl->ns->itemcmd);
288 sl << uint32 (0); 288 sl << uint32 (0);
… …
307 307
308 dirty = true; 308 dirty = true;
309 } 309 }
310 310
311 if (dirty) 311 if (dirty)
312 {
313 pl->ns->flush_fx ();
312 pl->ns->send_packet (sl); 314 pl->ns->send_packet (sl);
315 }
313} 316}
314 317
315/** 318/**
316 * Sends whole inventory. 319 * Sends whole inventory.
317 */ 320 */
… …
349 * items (especially with some of the bags out there) to 352 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 353 * overflow the buffer. IF so, send multiple item commands.
351 */ 354 */
352 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 355 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
353 { 356 {
357 pl->contr->ns->flush_fx ();
354 pl->contr->ns->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
355 359
356 sl.reset (); 360 sl.reset ();
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 sl << uint32 (op->count); 362 sl << uint32 (op->count);
… …
360 } 364 }
361 } 365 }
362 } 366 }
363 367
364 if (got_one) 368 if (got_one)
369 {
370 pl->contr->ns->flush_fx ();
365 pl->contr->ns->send_packet (sl); 371 pl->contr->ns->send_packet (sl);
372 }
366} 373}
367 374
368/** 375/**
369 * Updates object *op for player *pl. 376 * Updates object *op for player *pl.
370 * 377 *
… …
447 { 454 {
448 if (op->anim_speed) 455 if (op->anim_speed)
449 anim_speed = op->anim_speed; 456 anim_speed = op->anim_speed;
450 else 457 else
451 { 458 {
452 if (fabs (op->speed) < 0.001) 459 if (op->speed < 0.001)
453 anim_speed = 255; 460 anim_speed = 255;
454 else if (fabs (op->speed) >= 1.0) 461 else if (op->speed >= 1.0)
455 anim_speed = 1; 462 anim_speed = 1;
456 else 463 else
457 anim_speed = (int) (1.0 / fabs (op->speed)); 464 anim_speed = 1. / op->speed;
458 } 465 }
459 466
460 if (anim_speed > 255) 467 if (anim_speed > 255)
461 anim_speed = 255; 468 anim_speed = 255;
462 } 469 }
… …
491 498
492 sl << uint32 (op->env ? op->env->count : 0); 499 sl << uint32 (op->env ? op->env->count : 0);
493 500
494 add_object_to_socklist (*pl->contr->ns, sl, op); 501 add_object_to_socklist (*pl->contr->ns, sl, op);
495 502
503 pl->contr->ns->flush_fx ();
496 pl->contr->ns->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
497} 505}
498 506
499/** 507/**
500 * Tells the client to delete an item. 508 * Tells the client to delete an item.
… …
521 529
522/** 530/**
523 * Takes a player and object count (tag) and returns the actual object 531 * Takes a player and object count (tag) and returns the actual object
524 * pointer, or null if it can't be found. 532 * pointer, or null if it can't be found.
525 */ 533 */
526object * 534static object *
527esrv_get_ob_from_count (object *pl, tag_t count) 535esrv_get_ob_from_count (object *pl, tag_t count)
528{ 536{
529 if (pl->count == count) 537 if (pl->count == count)
530 return pl; 538 return pl;
531 539
… …
619 { 627 {
620 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 628 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
621 return; 629 return;
622 } 630 }
623 631
624 player_apply (pl->ob, op, 0, 0); 632 pl->ob->apply (op, AP_TOGGLE);
625} 633}
626 634
627/** Client wants to lock some object. Lets do so. */ 635/** Client wants to lock some object. Lets do so. */
628void 636void
629LockItem (char *data, int len, player *pl) 637LockItem (char *data, int len, player *pl)
… …
689 { 697 {
690 mapspace &ms = *pos; 698 mapspace &ms = *pos;
691 ms.update (); 699 ms.update ();
692 700
693 buf.printf (" map: %s%+d%+d (%+d%+d)\n" 701 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
694 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n", 702 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
695 &pos.m->path, pos.x, pos.y, dx, dy, 703 &pos.m->path, pos.x, pos.y, dx, dy,
696 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, 704 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
697 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume () 705 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
698 ); 706 );
699 } 707 }
700 else 708 else
701 buf << "off-map\n\n"; 709 buf << "off-map\n\n";
702 } 710 }
… …
714 { 722 {
715 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 723 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
716 continue; 724 continue;
717 725
718 if (wiz) 726 if (wiz)
719 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count); 727 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
720 else 728 else
721 buf.printf (" - %s.\n", query_name (tmp)); 729 buf.printf (" - %s.\n", query_name (tmp));
722 730
723 object *head = tmp->head_ (); 731 object *head = tmp->head_ ();
724 732
… …
772 /* If it is an active container, then we should drop all objects 780 /* If it is an active container, then we should drop all objects
773 * in the container and not the container itself. 781 * in the container and not the container itself.
774 */ 782 */
775 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
776 { 784 {
777 int cnt = MAX_ITEM_PER_DROP; 785 int cnt = MAX_ITEM_PER_ACTION;
778 786
779 for (object *current = op->inv; current && cnt--; ) 787 for (object *current = op->inv; current && cnt--; )
780 { 788 {
781 object *next = current->below; 789 object *next = current->below;
782 drop_object (pl, current, 0); 790 drop_object (pl, current, 0);

Diff Legend

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