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.69 by root, Mon Jul 14 23:47:06 2008 UTC vs.
Revision 1.85 by root, Sun Nov 29 09:41:28 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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 (); 125 ns.flush_fx ();
… …
131 sl << uint32 (head->count) 130 sl << uint32 (head->count)
132 << uint32 (flags) 131 << uint32 (flags)
133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 132 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
134 << uint32 (head->face); 133 << uint32 (head->face);
135 134
136 int len;
137
138 if (!head->custom_name) 135 if (!head->custom_name)
139 { 136 {
140 strncpy (item_n, query_base_name (head, 0), 127); 137 const char *name;
141 item_n[127] = 0; 138 uint8 *len = sl.cur++; // patch up length later
142 len = strlen (item_n); 139
143 item_p = query_base_name (head, 1); 140 name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
141 sl << uint8 (0);
142 name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
143
144 *len = sl.cur - len - 1;
144 } 145 }
145 else 146 else
146 { 147 {
147 strncpy (item_n, head->custom_name, 127); 148 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 149
153 strncpy (item_n + len + 1, item_p, 127); 150 sl << uint8 (len * 2 + 1)
154 item_n[254] = 0; 151 << data (head->custom_name, len)
155 len += strlen (item_n + 1 + len) + 1; 152 << uint8 (0)
153 << data (head->custom_name, len);
154 }
156 155
157 sl << data8 (item_n, len)
158 << uint16 (head->animation_id); 156 sl << uint16 (head->animation_id);
159 157
160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
161 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 159 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 160 : 1. / clamp (head->speed, 1./255., 1./1.);
163 161
164 sl << uint8 (anim_speed) 162 sl << uint8 (anim_speed)
165 << uint32 (head->nrof); 163 << uint32 (head->nrof);
166 164
167 if (ns.itemcmd == 2) 165 if (ns.itemcmd == 2)
168 sl << uint16 (head->client_type); 166 sl << uint16 (head->client_type);
169
170 SET_FLAG (head, FLAG_CLIENT_SENT);
171} 167}
172 168
173static faceidx 169static faceidx
174need_face_now (player *pl, const char *name) 170need_face_now (player *pl, const char *name)
175{ 171{
… …
385 381
386 client *ns = pl->contr->ns; 382 client *ns = pl->contr->ns;
387 if (!ns) 383 if (!ns)
388 return; 384 return;
389 385
390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
391 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
392 * this is happening - we can set a breakpoint here in the debugger
393 * and track back the call.
394 */
395 LOG (llevDebug | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count);
396
397 packet sl ("upditem"); 386 packet sl ("upditem");
398 387
399 sl << uint8 (flags); 388 sl << uint8 (flags);
400 389
401 op = op->head_ (); 390 op = op->head_ ();
… …
408 if (flags & UPD_FLAGS) 397 if (flags & UPD_FLAGS)
409 sl << uint32 (query_flags (op)); 398 sl << uint32 (query_flags (op));
410 399
411 if (flags & UPD_WEIGHT) 400 if (flags & UPD_WEIGHT)
412 { 401 {
413 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 402 sint32 weight = op->client_weight ();
414 403
415 if (op) 404 if (op == pl)
416 ns->last_weight = weight; 405 ns->last_weight = weight;
417 406
418 sl << uint32 (weight); 407 sl << uint32 (weight);
419 } 408 }
420 409
… …
427 416
428 if (flags & UPD_NAME) 417 if (flags & UPD_NAME)
429 { 418 {
430 int len; 419 int len;
431 const char *item_p; 420 const char *item_p;
432 char item_n[MAX_BUF]; 421 char item_n[127 * 2];
433 422
434 if (!op->custom_name) 423 if (!op->custom_name)
435 { 424 {
436 strncpy (item_n, query_base_name (op, 0), 127); 425 len = assign (item_n, query_base_name (op, 0), 127);
437 item_n[127] = 0;
438 len = strlen (item_n);
439 item_p = query_base_name (op, 1); 426 item_p = query_base_name (op, 1);
440 } 427 }
441 else 428 else
442 { 429 {
443 strncpy (item_n, op->custom_name, 127); 430 len = assign (item_n, &op->custom_name, 127);
444 item_n[127] = 0;
445 len = strlen (item_n);
446 item_p = op->custom_name; 431 item_p = &op->custom_name;
447 } 432 }
448 433
449 strncpy (item_n + len + 1, item_p, 127); 434 len += assign (item_n + len, item_p, 127);
450 item_n[254] = 0;
451 len += strlen (item_n + 1 + len) + 1;
452 435
453 sl << data8 (item_n, len); 436 sl << data8 (item_n, len);
454 } 437 }
455 438
456 if (flags & UPD_ANIM) 439 if (flags & UPD_ANIM)
… …
464 { 447 {
465 if (op->anim_speed) 448 if (op->anim_speed)
466 anim_speed = op->anim_speed; 449 anim_speed = op->anim_speed;
467 else 450 else
468 { 451 {
469 if (fabs (op->speed) < 0.001) 452 if (op->speed < 0.001)
470 anim_speed = 255; 453 anim_speed = 255;
471 else if (fabs (op->speed) >= 1.0) 454 else if (op->speed >= 1.0)
472 anim_speed = 1; 455 anim_speed = 1;
473 else 456 else
474 anim_speed = (int) (1.0 / fabs (op->speed)); 457 anim_speed = 1. / op->speed;
475 } 458 }
476 459
477 if (anim_speed > 255) 460 if (anim_speed > 255)
478 anim_speed = 255; 461 anim_speed = 255;
479 } 462 }
… …
509 sl << uint32 (op->env ? op->env->count : 0); 492 sl << uint32 (op->env ? op->env->count : 0);
510 493
511 add_object_to_socklist (*pl->contr->ns, sl, op); 494 add_object_to_socklist (*pl->contr->ns, sl, op);
512 495
513 pl->contr->ns->send_packet (sl); 496 pl->contr->ns->send_packet (sl);
514 SET_FLAG (op, FLAG_CLIENT_SENT);
515} 497}
516 498
517/** 499/**
518 * Tells the client to delete an item. 500 * Tells the client to delete an item.
519 */ 501 */
… …
539 521
540/** 522/**
541 * Takes a player and object count (tag) and returns the actual object 523 * Takes a player and object count (tag) and returns the actual object
542 * pointer, or null if it can't be found. 524 * pointer, or null if it can't be found.
543 */ 525 */
544object * 526static object *
545esrv_get_ob_from_count (object *pl, tag_t count) 527esrv_get_ob_from_count (object *pl, tag_t count)
546{ 528{
547 if (pl->count == count) 529 if (pl->count == count)
548 return pl; 530 return pl;
549 531
550 for (object *op = pl->inv; op; op = op->below) 532 for (object *op = pl->inv; op; op = op->below)
551 if (op->count == count) 533 if (op->count == count)
552 return op; 534 return op;
553 else if (op->type == CONTAINER && pl->container == op) 535 else if (op->type == CONTAINER && pl->container_ () == op)
554 for (object *tmp = op->inv; tmp; tmp = tmp->below) 536 for (object *tmp = op->inv; tmp; tmp = tmp->below)
555 if (tmp->count == count) 537 if (tmp->count == count)
556 return tmp; 538 return tmp;
557 539
558 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 540 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
559 if (op->head && op->head->count == count) 541 if (op->head && op->head->count == count)
560 return op; 542 return op;
561 else if (op->count == count) 543 else if (op->count == count)
562 return op; 544 return op;
563 else if (op->type == CONTAINER && pl->container == op) 545 else if (op->type == CONTAINER && pl->container_ () == op)
564 for (object *tmp = op->inv; tmp; tmp = tmp->below) 546 for (object *tmp = op->inv; tmp; tmp = tmp->below)
565 if (tmp->count == count) 547 if (tmp->count == count)
566 return tmp; 548 return tmp;
567 549
568#if 0 550#if 0
… …
607 589
608 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 590 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
609 { 591 {
610 std::string s = op->describe (pl->ob); 592 std::string s = op->describe (pl->ob);
611 593
612 if (msg_is_special (s.c_str (), false))
613 cfperl_expand_cfpod (pl, s);
614
615 packet sl ("ex"); 594 packet sl ("ex");
616 sl << ber32 (tag) << s.c_str (); 595 sl << ber32 (tag)
596 << data (*pl->expand_cfpod (s.c_str ()));
617 597
618 pl->ns->send_packet (sl); 598 pl->ns->send_packet (sl);
619 } 599 }
620} 600}
621 601
… …
690 * Tero.Haatanen@lut.fi ] 670 * Tero.Haatanen@lut.fi ]
691 */ 671 */
692static void 672static void
693look_at (player *pl, int dx, int dy) 673look_at (player *pl, int dx, int dy)
694{ 674{
695 dynbuf_text buf; 675 dynbuf_text &buf = msg_dynbuf; buf.clear ();
696 object *ob = pl->ob; 676 object *ob = pl->ob;
697 677
698 if (!pl->observe->map) 678 if (!pl->observe->map)
699 return; 679 return;
700 680
681 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
682
701 mapxy pos (pl->observe); 683 mapxy pos (pl->observe);
702 pos.move (dx, dy); 684 pos.move (dx, dy);
703 685
686 if (wiz)
687 {
704 if (pos.normalise ()) 688 if (pos.normalise ())
689 {
690 mapspace &ms = *pos;
691 ms.update ();
692
693 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; items %d, volume %lld\n\n",
695 &pos.m->path, pos.x, pos.y, dx, dy,
696 (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, (int)ms.items (), (long long)ms.volume ()
698 );
699 }
700 else
701 buf << "off-map\n\n";
702 }
703
704 int darkness = pl->blocked_los (dx, dy);
705
706 if (darkness == LOS_BLOCKED)
707 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
708 else if (darkness == LOS_MAX)
709 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
710 else
711 {
712 if (pos.normalise ())
705 for (object *tmp = pos->top; tmp; tmp = tmp->below) 713 for (object *tmp = pos->top; tmp; tmp = tmp->below)
706 { 714 {
707 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 715 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
708 continue; 716 continue;
709 717
710 if (QUERY_FLAG (ob, FLAG_WIZ)) 718 if (wiz)
711 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 719 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
712 else 720 else
713 buf.printf ("- %s.\n", query_name (tmp)); 721 buf.printf (" - %s.\n", query_name (tmp));
714 722
715 object *head = tmp->head_ (); 723 object *head = tmp->head_ ();
716 724
717 if (head->inv) 725 if (head->inv)
718 if ((head->type != CONTAINER && head->type != FLESH) 726 if ((head->type != CONTAINER && head->type != FLESH)
719 || QUERY_FLAG (ob, FLAG_WIZ)) 727 || QUERY_FLAG (ob, FLAG_WIZ))
720 buf << head->query_inventory (ob, " "); 728 buf << head->query_inventory (ob, " ");
721 729
722 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 730 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
723 break; 731 break;
732 }
724 } 733 }
725 734
726 if (buf.empty ()) 735 if (buf.empty ())
727 pl->failmsg ("You see nothing there."); 736 buf << "You see nothing there.";
728 else 737
729 pl->infobox (MSG_CHANNEL ("lookat"), buf); 738 pl->infobox (MSG_CHANNEL ("lookat"), buf);
730} 739}
731 740
732/** Client wants to look at some object. Lets do so. */ 741/** Client wants to look at some object. Lets do so. */
733void 742void
734LookAt (char *buf, int len, player *pl) 743LookAt (char *buf, int len, player *pl)
… …
738 int dx = atoi (buf); 747 int dx = atoi (buf);
739 if (!(cp = strchr (buf, ' '))) 748 if (!(cp = strchr (buf, ' ')))
740 return; 749 return;
741 750
742 int dy = atoi (cp); 751 int dy = atoi (cp);
743
744 if (player *opl = pl->observe->contr)
745 if (client *ns = opl->ns)
746 {
747 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
748 return;
749
750 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
751 return;
752 }
753 752
754 look_at (pl, dx, dy); 753 look_at (pl, dx, dy);
755} 754}
756 755
757/** Move an object to a new location */ 756/** Move an object to a new location */
… …
773 /* If it is an active container, then we should drop all objects 772 /* If it is an active container, then we should drop all objects
774 * in the container and not the container itself. 773 * in the container and not the container itself.
775 */ 774 */
776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 775 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
777 { 776 {
778 int cnt = MAX_ITEM_PER_DROP; 777 int cnt = MAX_ITEM_PER_ACTION;
779 778
780 for (object *current = op->inv; current && cnt--; ) 779 for (object *current = op->inv; current && cnt--; )
781 { 780 {
782 object *next = current->below; 781 object *next = current->below;
783 drop_object (pl, current, 0); 782 drop_object (pl, current, 0);

Diff Legend

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