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.96 by root, Sat Apr 23 04:56:58 2011 UTC vs.
Revision 1.98 by root, Sat Dec 31 06:18:02 2011 UTC

142 142
143 *len = sl.cur - len - 1; 143 *len = sl.cur - len - 1;
144 } 144 }
145 else 145 else
146 { 146 {
147 int len = min (head->custom_name.length (), 127); 147 int len = min (127, head->custom_name.length ());
148 148
149 sl << uint8 (len * 2 + 1) 149 sl << uint8 (len * 2 + 1)
150 << data (head->custom_name, len) 150 << data (head->custom_name, len)
151 << uint8 (0) 151 << uint8 (0)
152 << data (head->custom_name, len); 152 << data (head->custom_name, len);
207 pl->ns->update_look = 0; 207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1; 208 pl->ns->need_delinv0 = 1;
209 209
210 if (ob->flag [FLAG_REMOVED] 210 if (ob->flag [FLAG_REMOVED]
211 || !ob->map 211 || !ob->map
212 || ob->map->in_memory != MAP_ACTIVE 212 || ob->map->state != MAP_ACTIVE
213 || out_of_map (ob->map, ob->x, ob->y)) 213 || out_of_map (ob->map, ob->x, ob->y))
214 return; 214 return;
215 215
216 packet sl; 216 packet sl;
217 sl.printf ("item%d ", pl->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines