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.38 by root, Wed Apr 30 10:31:04 2008 UTC vs.
Revision 1.39 by root, Fri Jun 20 21:17:19 2008 UTC

273 static char buf [2048]; 273 static char buf [2048];
274 274
275 if (!killer) 275 if (!killer)
276 return "a dungeon collapse"; 276 return "a dungeon collapse";
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,
279 *killer->contr->own_title ? killer->contr->own_title : killer->contr->title);
279 else if (killer->type == DEEP_SWAMP) 280 else if (killer->type == DEEP_SWAMP)
280 snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name); 281 snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
281 else if (killer->owner) 282 else if (killer->owner)
282 snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name); 283 snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
283 else 284 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines