| … | |
… | |
| 77 | PL_OUT2 (title, own_title); |
77 | PL_OUT2 (title, own_title); |
| 78 | PL_OUT (gen_hp); |
78 | PL_OUT (gen_hp); |
| 79 | PL_OUT (gen_sp); |
79 | PL_OUT (gen_sp); |
| 80 | PL_OUT (gen_grace); |
80 | PL_OUT (gen_grace); |
| 81 | PL_OUT (listening); |
81 | PL_OUT (listening); |
| 82 | PL_OUT (shoottype); |
|
|
| 83 | PL_OUT (bowtype); |
82 | PL_OUT (bowtype); |
| 84 | PL_OUT (petmode); |
83 | PL_OUT (petmode); |
| 85 | PL_OUT (peaceful); |
84 | PL_OUT (peaceful); |
| 86 | PL_OUT (digestion); |
85 | PL_OUT (digestion); |
| 87 | PL_OUT2 (pickup, mode); |
86 | PL_OUT2 (pickup, mode); |
| … | |
… | |
| 184 | return pl; |
183 | return pl; |
| 185 | |
184 | |
| 186 | case KW_oid: f.get (pl, f.get_sint32 ()); break; |
185 | case KW_oid: f.get (pl, f.get_sint32 ()); break; |
| 187 | case KW_password: assign (pl->password , f.get_str ()); break; |
186 | case KW_password: assign (pl->password , f.get_str ()); break; |
| 188 | case KW_title: assign (pl->own_title, f.get_str ()); break; |
187 | case KW_title: assign (pl->own_title, f.get_str ()); break; |
| 189 | case KW_shoottype: pl->shoottype = (rangetype) f.get_sint32 (); break; |
|
|
| 190 | case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; |
188 | case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; |
| 191 | case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; |
189 | case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; |
| 192 | case KW_listening: f.get (pl->listening); break; |
190 | case KW_listening: f.get (pl->listening); break; |
| 193 | case KW_peaceful: f.get (pl->peaceful); break; |
191 | case KW_peaceful: f.get (pl->peaceful); break; |
| 194 | case KW_digestion: f.get (pl->digestion); break; |
192 | case KW_digestion: f.get (pl->digestion); break; |
| … | |
… | |
| 253 | } |
251 | } |
| 254 | |
252 | |
| 255 | failure: |
253 | failure: |
| 256 | LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name); |
254 | LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name); |
| 257 | |
255 | |
|
|
256 | if (pl->ob) |
| 258 | pl->ob->destroy (); |
257 | pl->ob->destroy (); |
|
|
258 | |
| 259 | pl->destroy (); |
259 | pl->destroy (); |
| 260 | |
260 | |
| 261 | return 0; |
261 | return 0; |
| 262 | } |
262 | } |
| 263 | |
263 | |
