ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/player.C
(Generate patch)

Comparing deliantra/server/common/player.C (file contents):
Revision 1.37 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.38 by root, Wed Apr 30 10:31:04 2008 UTC

277 else if (killer->contr) 277 else if (killer->contr)
278 snprintf (buf, sizeof (buf), "%s the %s", &killer->name, &killer->title); 278 snprintf (buf, sizeof (buf), "%s the %s", &killer->name, &killer->title);
279 else if (killer->type == DEEP_SWAMP) 279 else if (killer->type == DEEP_SWAMP)
280 snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name); 280 snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
281 else if (killer->owner) 281 else if (killer->owner)
282 snprintf (buf, sizeof (buf), "%s's %s", &killer->owner->name, &killer->name); 282 snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
283 else 283 else
284 return &killer->name; 284 return &killer->name;
285 285
286 return buf; 286 return buf;
287} 287}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines