… | |
… | |
37 | #ifndef __CEXTRACT__ |
37 | #ifndef __CEXTRACT__ |
38 | # include <sproto.h> |
38 | # include <sproto.h> |
39 | # include <sockproto.h> |
39 | # include <sockproto.h> |
40 | #endif |
40 | #endif |
41 | |
41 | |
42 | #ifndef WIN32 /* ---win32 exclude unix headers */ |
|
|
43 | # include <sys/types.h> |
42 | #include <sys/types.h> |
44 | # include <sys/time.h> |
43 | #include <sys/time.h> |
45 | # include <sys/socket.h> |
44 | #include <sys/socket.h> |
46 | # include <netinet/in.h> |
45 | #include <netinet/in.h> |
47 | # include <netdb.h> |
46 | #include <netdb.h> |
48 | #endif /* end win32 */ |
|
|
49 | |
47 | |
50 | #ifdef HAVE_UNISTD_H |
48 | #ifdef HAVE_UNISTD_H |
51 | # include <unistd.h> |
49 | # include <unistd.h> |
52 | #endif |
50 | #endif |
53 | |
51 | |
… | |
… | |
379 | |
377 | |
380 | save_player (pl->ob, 0); |
378 | save_player (pl->ob, 0); |
381 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
379 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
382 | { |
380 | { |
383 | terminate_all_pets (pl->ob); |
381 | terminate_all_pets (pl->ob); |
384 | remove_ob (pl->ob); |
382 | pl->ob->remove (); |
385 | } |
383 | } |
386 | leave (pl, 1); |
384 | leave (pl, 1); |
387 | final_free_player (pl); |
385 | final_free_player (pl); |
388 | pl = npl; |
386 | pl = npl; |
389 | } |
387 | } |
… | |
… | |
531 | { |
529 | { |
532 | save_player (pl->ob, 0); |
530 | save_player (pl->ob, 0); |
533 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
531 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
534 | { |
532 | { |
535 | terminate_all_pets (pl->ob); |
533 | terminate_all_pets (pl->ob); |
536 | remove_ob (pl->ob); |
534 | pl->ob->remove (); |
537 | } |
535 | } |
538 | leave (pl, 1); |
536 | leave (pl, 1); |
539 | final_free_player (pl); |
537 | final_free_player (pl); |
540 | } |
538 | } |
541 | else |
539 | else |
… | |
… | |
550 | { |
548 | { |
551 | save_player (pl->ob, 0); |
549 | save_player (pl->ob, 0); |
552 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
550 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
553 | { |
551 | { |
554 | terminate_all_pets (pl->ob); |
552 | terminate_all_pets (pl->ob); |
555 | remove_ob (pl->ob); |
553 | pl->ob->remove (); |
556 | } |
554 | } |
557 | leave (pl, 1); |
555 | leave (pl, 1); |
558 | final_free_player (pl); |
556 | final_free_player (pl); |
559 | } |
557 | } |
560 | else |
558 | else |