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.80 by root, Mon Oct 19 21:48:49 2009 UTC vs.
Revision 1.85 by root, Sun Nov 29 09:41:28 2009 UTC

… …
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))
… …
114 * animation of face to the client. 114 * animation of face to the client.
115 */ 115 */
116static void 116static void
117add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
118{ 118{
119 char item_n[MAX_BUF];
120 const char *item_p;
121
122 int flags = query_flags (head); 119 int flags = query_flags (head);
120
123 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121 if (QUERY_FLAG (head, FLAG_NO_PICK))
124 flags |= F_NOPICK; 122 flags |= F_NOPICK;
125 123
126 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
127 ns.flush_fx (); 125 ns.flush_fx ();
… …
132 sl << uint32 (head->count) 130 sl << uint32 (head->count)
133 << uint32 (flags) 131 << uint32 (flags)
134 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 132 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
135 << uint32 (head->face); 133 << uint32 (head->face);
136 134
137 int len;
138
139 if (!head->custom_name) 135 if (!head->custom_name)
140 { 136 {
141 strncpy (item_n, query_base_name (head, 0), 127); 137 const char *name;
142 item_n[127] = 0; 138 uint8 *len = sl.cur++; // patch up length later
143 len = strlen (item_n); 139
144 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;
145 } 145 }
146 else 146 else
147 { 147 {
148 strncpy (item_n, head->custom_name, 127); 148 int len = min (head->custom_name.length (), 127);
149 item_n[127] = 0;
150 len = strlen (item_n);
151 item_p = head->custom_name;
152 }
153 149
154 strncpy (item_n + len + 1, item_p, 127); 150 sl << uint8 (len * 2 + 1)
155 item_n[254] = 0; 151 << data (head->custom_name, len)
156 len += strlen (item_n + 1 + len) + 1; 152 << uint8 (0)
153 << data (head->custom_name, len);
154 }
157 155
158 sl << data8 (item_n, len)
159 << uint16 (head->animation_id); 156 sl << uint16 (head->animation_id);
160 157
161 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
162 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 159 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
163 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 160 : 1. / clamp (head->speed, 1./255., 1./1.);
164 161
165 sl << uint8 (anim_speed) 162 sl << uint8 (anim_speed)
166 << uint32 (head->nrof); 163 << uint32 (head->nrof);
167 164
168 if (ns.itemcmd == 2) 165 if (ns.itemcmd == 2)
… …
450 { 447 {
451 if (op->anim_speed) 448 if (op->anim_speed)
452 anim_speed = op->anim_speed; 449 anim_speed = op->anim_speed;
453 else 450 else
454 { 451 {
455 if (fabs (op->speed) < 0.001) 452 if (op->speed < 0.001)
456 anim_speed = 255; 453 anim_speed = 255;
457 else if (fabs (op->speed) >= 1.0) 454 else if (op->speed >= 1.0)
458 anim_speed = 1; 455 anim_speed = 1;
459 else 456 else
460 anim_speed = (int) (1.0 / fabs (op->speed)); 457 anim_speed = 1. / op->speed;
461 } 458 }
462 459
463 if (anim_speed > 255) 460 if (anim_speed > 255)
464 anim_speed = 255; 461 anim_speed = 255;
465 } 462 }
… …
524 521
525/** 522/**
526 * 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
527 * pointer, or null if it can't be found. 524 * pointer, or null if it can't be found.
528 */ 525 */
529object * 526static object *
530esrv_get_ob_from_count (object *pl, tag_t count) 527esrv_get_ob_from_count (object *pl, tag_t count)
531{ 528{
532 if (pl->count == count) 529 if (pl->count == count)
533 return pl; 530 return pl;
534 531
… …
692 { 689 {
693 mapspace &ms = *pos; 690 mapspace &ms = *pos;
694 ms.update (); 691 ms.update ();
695 692
696 buf.printf (" map: %s%+d%+d (%+d%+d)\n" 693 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
697 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n", 694 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
698 &pos.m->path, pos.x, pos.y, dx, dy, 695 &pos.m->path, pos.x, pos.y, dx, dy,
699 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, 696 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
700 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume () 697 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
701 ); 698 );
702 } 699 }
703 else 700 else
704 buf << "off-map\n\n"; 701 buf << "off-map\n\n";
705 } 702 }
… …
775 /* 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
776 * in the container and not the container itself. 773 * in the container and not the container itself.
777 */ 774 */
778 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 775 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
779 { 776 {
780 int cnt = MAX_ITEM_PER_DROP; 777 int cnt = MAX_ITEM_PER_ACTION;
781 778
782 for (object *current = op->inv; current && cnt--; ) 779 for (object *current = op->inv; current && cnt--; )
783 { 780 {
784 object *next = current->below; 781 object *next = current->below;
785 drop_object (pl, current, 0); 782 drop_object (pl, current, 0);

Diff Legend

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