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.76 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.78 by root, Mon Apr 27 01:38:49 2009 UTC

418 418
419 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
420 { 420 {
421 int len; 421 int len;
422 const char *item_p; 422 const char *item_p;
423 char item_n[MAX_BUF]; 423 char item_n[127 * 2];
424 424
425 if (!op->custom_name) 425 if (!op->custom_name)
426 { 426 {
427 strncpy (item_n, query_base_name (op, 0), 127); 427 len = assign (item_n, query_base_name (op, 0), 127);
428 item_n[127] = 0;
429 len = strlen (item_n);
430 item_p = query_base_name (op, 1); 428 item_p = query_base_name (op, 1);
431 } 429 }
432 else 430 else
433 { 431 {
434 strncpy (item_n, op->custom_name, 127); 432 len = assign (item_n, &op->custom_name, 127);
435 item_n[127] = 0;
436 len = strlen (item_n);
437 item_p = op->custom_name; 433 item_p = &op->custom_name;
438 } 434 }
439 435
440 strncpy (item_n + len + 1, item_p, 127); 436 len += assign (item_n + len, item_p, 127);
441 item_n[254] = 0;
442 len += strlen (item_n + 1 + len) + 1;
443 437
444 sl << data8 (item_n, len); 438 sl << data8 (item_n, len);
445 } 439 }
446 440
447 if (flags & UPD_ANIM) 441 if (flags & UPD_ANIM)
678 * Tero.Haatanen@lut.fi ] 672 * Tero.Haatanen@lut.fi ]
679 */ 673 */
680static void 674static void
681look_at (player *pl, int dx, int dy) 675look_at (player *pl, int dx, int dy)
682{ 676{
683 dynbuf_text buf; 677 dynbuf_text &buf = msg_dynbuf; buf.clear ();
684 object *ob = pl->ob; 678 object *ob = pl->ob;
685 679
686 if (!pl->observe->map) 680 if (!pl->observe->map)
687 return; 681 return;
688 682

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines