| … | |
… | |
| 377 | |
377 | |
| 378 | save_player (pl->ob, 0); |
378 | save_player (pl->ob, 0); |
| 379 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
379 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
| 380 | { |
380 | { |
| 381 | terminate_all_pets (pl->ob); |
381 | terminate_all_pets (pl->ob); |
| 382 | remove_ob (pl->ob); |
382 | pl->ob->remove (); |
| 383 | } |
383 | } |
| 384 | leave (pl, 1); |
384 | leave (pl, 1); |
| 385 | final_free_player (pl); |
385 | final_free_player (pl); |
| 386 | pl = npl; |
386 | pl = npl; |
| 387 | } |
387 | } |
| … | |
… | |
| 529 | { |
529 | { |
| 530 | save_player (pl->ob, 0); |
530 | save_player (pl->ob, 0); |
| 531 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
531 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
| 532 | { |
532 | { |
| 533 | terminate_all_pets (pl->ob); |
533 | terminate_all_pets (pl->ob); |
| 534 | remove_ob (pl->ob); |
534 | pl->ob->remove (); |
| 535 | } |
535 | } |
| 536 | leave (pl, 1); |
536 | leave (pl, 1); |
| 537 | final_free_player (pl); |
537 | final_free_player (pl); |
| 538 | } |
538 | } |
| 539 | else |
539 | else |
| … | |
… | |
| 548 | { |
548 | { |
| 549 | save_player (pl->ob, 0); |
549 | save_player (pl->ob, 0); |
| 550 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
550 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
| 551 | { |
551 | { |
| 552 | terminate_all_pets (pl->ob); |
552 | terminate_all_pets (pl->ob); |
| 553 | remove_ob (pl->ob); |
553 | pl->ob->remove (); |
| 554 | } |
554 | } |
| 555 | leave (pl, 1); |
555 | leave (pl, 1); |
| 556 | final_free_player (pl); |
556 | final_free_player (pl); |
| 557 | } |
557 | } |
| 558 | else |
558 | else |
