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.78 by root, Mon Apr 27 01:38:49 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
47 48
48/** 49/**
49 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
50 * to be sent to client. 51 * to be sent to client.
51 */ 52 */
52unsigned int 53static unsigned int
53query_flags (object *op) 54query_flags (object *op)
54{ 55{
55 unsigned int flags = 0; 56 unsigned int flags = 0;
56 57
57 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (QUERY_FLAG (op, FLAG_APPLIED))
… …
85 default: 86 default:
86 flags = a_applied; 87 flags = a_applied;
87 break; 88 break;
88 } 89 }
89 90
90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 91 if (op->is_open_container ())
91 flags |= F_OPEN; 92 flags |= F_OPEN;
92 93
93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
94 { 95 {
95 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
113 * animation of face to the client. 114 * animation of face to the client.
114 */ 115 */
115static void 116static void
116add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
117{ 118{
118 char item_n[MAX_BUF];
119 const char *item_p;
120
121 int flags = query_flags (head); 119 int flags = query_flags (head);
120
122 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121 if (QUERY_FLAG (head, FLAG_NO_PICK))
123 flags |= F_NOPICK; 122 flags |= F_NOPICK;
124 123
125 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
126 ns.flush_fx ();
127 125
128 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])
129 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
130 128
131 sl << uint32 (head->count) 129 sl << uint32 (head->count)
132 << uint32 (flags) 130 << uint32 (flags)
133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 131 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
134 << uint32 (head->face); 132 << uint32 (head->face);
135 133
136 int len;
137
138 if (!head->custom_name) 134 if (!head->custom_name)
139 { 135 {
140 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
141 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
142 len = strlen (item_n); 138
143 item_p = query_base_name (head, 1); 139 name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
140 sl << uint8 (0);
141 name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
142
143 *len = sl.cur - len - 1;
144 } 144 }
145 else 145 else
146 { 146 {
147 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
148 item_n[127] = 0;
149 len = strlen (item_n);
150 item_p = head->custom_name;
151 }
152 148
153 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
154 item_n[254] = 0; 150 << data (head->custom_name, len)
155 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
156 154
157 sl << data8 (item_n, len)
158 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
159 156
160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
161 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 159 : 1. / clamp (head->speed, 1./255., 1./1.);
163 160
164 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
165 << uint32 (head->nrof); 162 << uint32 (head->nrof);
166 163
167 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
… …
281 dirty = true; 278 dirty = true;
282 279
283 // 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
284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 281 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
285 { 282 {
283 pl->ns->flush_fx ();
286 pl->ns->send_packet (sl); 284 pl->ns->send_packet (sl);
287 285
288 sl.reset (); 286 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd); 287 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0); 288 sl << uint32 (0);
… …
309 307
310 dirty = true; 308 dirty = true;
311 } 309 }
312 310
313 if (dirty) 311 if (dirty)
312 {
313 pl->ns->flush_fx ();
314 pl->ns->send_packet (sl); 314 pl->ns->send_packet (sl);
315 }
315} 316}
316 317
317/** 318/**
318 * Sends whole inventory. 319 * Sends whole inventory.
319 */ 320 */
… …
351 * items (especially with some of the bags out there) to 352 * items (especially with some of the bags out there) to
352 * overflow the buffer. IF so, send multiple item commands. 353 * overflow the buffer. IF so, send multiple item commands.
353 */ 354 */
354 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 355 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
355 { 356 {
357 pl->contr->ns->flush_fx ();
356 pl->contr->ns->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
357 359
358 sl.reset (); 360 sl.reset ();
359 sl.printf ("item%d ", pl->contr->ns->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
360 sl << uint32 (op->count); 362 sl << uint32 (op->count);
… …
362 } 364 }
363 } 365 }
364 } 366 }
365 367
366 if (got_one) 368 if (got_one)
369 {
370 pl->contr->ns->flush_fx ();
367 pl->contr->ns->send_packet (sl); 371 pl->contr->ns->send_packet (sl);
372 }
368} 373}
369 374
370/** 375/**
371 * Updates object *op for player *pl. 376 * Updates object *op for player *pl.
372 * 377 *
… …
449 { 454 {
450 if (op->anim_speed) 455 if (op->anim_speed)
451 anim_speed = op->anim_speed; 456 anim_speed = op->anim_speed;
452 else 457 else
453 { 458 {
454 if (fabs (op->speed) < 0.001) 459 if (op->speed < 0.001)
455 anim_speed = 255; 460 anim_speed = 255;
456 else if (fabs (op->speed) >= 1.0) 461 else if (op->speed >= 1.0)
457 anim_speed = 1; 462 anim_speed = 1;
458 else 463 else
459 anim_speed = (int) (1.0 / fabs (op->speed)); 464 anim_speed = 1. / op->speed;
460 } 465 }
461 466
462 if (anim_speed > 255) 467 if (anim_speed > 255)
463 anim_speed = 255; 468 anim_speed = 255;
464 } 469 }
… …
493 498
494 sl << uint32 (op->env ? op->env->count : 0); 499 sl << uint32 (op->env ? op->env->count : 0);
495 500
496 add_object_to_socklist (*pl->contr->ns, sl, op); 501 add_object_to_socklist (*pl->contr->ns, sl, op);
497 502
503 pl->contr->ns->flush_fx ();
498 pl->contr->ns->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
499} 505}
500 506
501/** 507/**
502 * Tells the client to delete an item. 508 * Tells the client to delete an item.
… …
523 529
524/** 530/**
525 * 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
526 * pointer, or null if it can't be found. 532 * pointer, or null if it can't be found.
527 */ 533 */
528object * 534static object *
529esrv_get_ob_from_count (object *pl, tag_t count) 535esrv_get_ob_from_count (object *pl, tag_t count)
530{ 536{
531 if (pl->count == count) 537 if (pl->count == count)
532 return pl; 538 return pl;
533 539
534 for (object *op = pl->inv; op; op = op->below) 540 for (object *op = pl->inv; op; op = op->below)
535 if (op->count == count) 541 if (op->count == count)
536 return op; 542 return op;
537 else if (op->type == CONTAINER && pl->container == op) 543 else if (op->type == CONTAINER && pl->container_ () == op)
538 for (object *tmp = op->inv; tmp; tmp = tmp->below) 544 for (object *tmp = op->inv; tmp; tmp = tmp->below)
539 if (tmp->count == count) 545 if (tmp->count == count)
540 return tmp; 546 return tmp;
541 547
542 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 548 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
543 if (op->head && op->head->count == count) 549 if (op->head && op->head->count == count)
544 return op; 550 return op;
545 else if (op->count == count) 551 else if (op->count == count)
546 return op; 552 return op;
547 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container_ () == op)
548 for (object *tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
549 if (tmp->count == count) 555 if (tmp->count == count)
550 return tmp; 556 return tmp;
551 557
552#if 0 558#if 0
… …
621 { 627 {
622 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);
623 return; 629 return;
624 } 630 }
625 631
626 player_apply (pl->ob, op, 0, 0); 632 pl->ob->apply (op, AP_TOGGLE);
627} 633}
628 634
629/** Client wants to lock some object. Lets do so. */ 635/** Client wants to lock some object. Lets do so. */
630void 636void
631LockItem (char *data, int len, player *pl) 637LockItem (char *data, int len, player *pl)
… …
691 { 697 {
692 mapspace &ms = *pos; 698 mapspace &ms = *pos;
693 ms.update (); 699 ms.update ();
694 700
695 buf.printf (" map: %s%+d%+d (%+d%+d)\n" 701 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
696 " 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",
697 &pos.m->path, pos.x, pos.y, dx, dy, 703 &pos.m->path, pos.x, pos.y, dx, dy,
698 (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,
699 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 ()
700 ); 706 );
701 } 707 }
702 else 708 else
703 buf << "off-map\n\n"; 709 buf << "off-map\n\n";
704 } 710 }
… …
716 { 722 {
717 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 723 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
718 continue; 724 continue;
719 725
720 if (wiz) 726 if (wiz)
721 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 ());
722 else 728 else
723 buf.printf (" - %s.\n", query_name (tmp)); 729 buf.printf (" - %s.\n", query_name (tmp));
724 730
725 object *head = tmp->head_ (); 731 object *head = tmp->head_ ();
726 732
… …
774 /* 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
775 * in the container and not the container itself. 781 * in the container and not the container itself.
776 */ 782 */
777 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
778 { 784 {
779 int cnt = MAX_ITEM_PER_DROP; 785 int cnt = MAX_ITEM_PER_ACTION;
780 786
781 for (object *current = op->inv; current && cnt--; ) 787 for (object *current = op->inv; current && cnt--; )
782 { 788 {
783 object *next = current->below; 789 object *next = current->below;
784 drop_object (pl, current, 0); 790 drop_object (pl, current, 0);

Diff Legend

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