… | |
… | |
79 | PL_OUT2 (title, own_title); |
79 | PL_OUT2 (title, own_title); |
80 | PL_OUT (gender); |
80 | PL_OUT (gender); |
81 | PL_OUT (gen_hp); |
81 | PL_OUT (gen_hp); |
82 | PL_OUT (gen_sp); |
82 | PL_OUT (gen_sp); |
83 | PL_OUT (gen_grace); |
83 | PL_OUT (gen_grace); |
84 | PL_OUT (listening); |
|
|
85 | PL_OUT (bowtype); |
84 | PL_OUT (bowtype); |
86 | PL_OUT (petmode); |
85 | PL_OUT (petmode); |
87 | PL_OUT (peaceful); |
86 | PL_OUT (peaceful); |
88 | PL_OUT (digestion); |
87 | PL_OUT (digestion); |
89 | PL_OUT2 (pickup, mode); |
88 | PL_OUT2 (pickup, mode); |
… | |
… | |
190 | case KW_password: assign (pl->password , f.get_str ()); break; |
189 | case KW_password: assign (pl->password , f.get_str ()); break; |
191 | case KW_title: assign (pl->own_title, f.get_str ()); break; |
190 | case KW_title: assign (pl->own_title, f.get_str ()); break; |
192 | case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; |
191 | case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; |
193 | case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; |
192 | case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; |
194 | case KW_gender: f.get (pl->gender); break; |
193 | case KW_gender: f.get (pl->gender); break; |
195 | case KW_listening: f.get (pl->listening); break; |
194 | case KW_listening: /*TODO*/; break; |
196 | case KW_peaceful: f.get (pl->peaceful); break; |
195 | case KW_peaceful: f.get (pl->peaceful); break; |
197 | case KW_digestion: f.get (pl->digestion); break; |
196 | case KW_digestion: f.get (pl->digestion); break; |
198 | case KW_pickup: f.get (pl->mode); break; |
197 | case KW_pickup: f.get (pl->mode); break; |
199 | case KW_outputs_sync: f.get (pl->outputs_sync); break; |
198 | case KW_outputs_sync: f.get (pl->outputs_sync); break; |
200 | case KW_outputs_count: f.get (pl->outputs_count); break; |
199 | case KW_outputs_count: f.get (pl->outputs_count); break; |
… | |
… | |
265 | pl->destroy (); |
264 | pl->destroy (); |
266 | |
265 | |
267 | return 0; |
266 | return 0; |
268 | } |
267 | } |
269 | |
268 | |
|
|
269 | const char * |
|
|
270 | player::killer_name () const |
|
|
271 | { |
|
|
272 | static char buf [2048]; |
|
|
273 | |
|
|
274 | if (!killer) |
|
|
275 | return "a dungeon collapse"; |
|
|
276 | else if (killer->contr) |
|
|
277 | snprintf (buf, sizeof (buf), "%s the %s", &killer->name, |
|
|
278 | *killer->contr->own_title ? killer->contr->own_title : killer->contr->title); |
|
|
279 | else if (killer->type == DEEP_SWAMP) |
|
|
280 | snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name); |
|
|
281 | else if (killer->owner) |
|
|
282 | snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name); |
|
|
283 | else |
|
|
284 | return &killer->name; |
|
|
285 | |
|
|
286 | return buf; |
|
|
287 | } |
|
|
288 | |