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.66 by root, Tue May 6 19:42:53 2008 UTC vs.
Revision 1.68 by root, Thu May 8 20:03:50 2008 UTC

749 749
750 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 750 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
751 { 751 {
752 std::string s = op->describe (pl->ob); 752 std::string s = op->describe (pl->ob);
753 753
754 if (msg_is_special (s.c_str (), false))
755 cfperl_expand_cfpod (pl, s);
756
754 packet sl ("ex"); 757 packet sl ("ex");
755 sl << ber32 (tag) << s.c_str (); 758 sl << ber32 (tag) << s.c_str ();
756 759
757 pl->ns->send_packet (sl); 760 pl->ns->send_packet (sl);
758 } 761 }
940 pl->contr->count = nrof; 943 pl->contr->count = nrof;
941 pick_up (pl, op); 944 pick_up (pl, op);
942 return; 945 return;
943 } 946 }
944 947
945 env = esrv_get_ob_from_count (pl, to); 948 object *env = esrv_get_ob_from_count (pl, to);
946 if (!env) 949 if (!env)
947 { 950 {
948 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 951 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
949 return; 952 return;
950 } 953 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines