ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.42 by root, Wed Apr 18 17:32:06 2007 UTC vs.
Revision 1.84 by root, Wed Apr 30 06:40:28 2008 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max); 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
8 9
9# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
10sub nuke_str { 11sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 13}
… …
39 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
40 41
41 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
46 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
47 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
48 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 50 . "this will fix anything.",
50 cf::NDI_RED 51 cf::NDI_RED
51 ); 52 );
52 53
53 1 54 1
54} 55}
55 56
56sub check_clean_save { 57sub safe_spot($) {
57 my ($pl) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
58 61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
75sub enter_map {
76 my ($pl) = @_;
77
78 my $ob = $pl->ob;
79
80 my ($map, $x, $y)
81 = $ob->{_link_pos}
82 ? @{delete $ob->{_link_pos}}
83 : ($pl->maplevel, $ob->x, $ob->y);
84
85 $ob->enter_link;
86
87 my $m = cf::map::find $map;
59 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
60 $pl->ns->send_drawinfo ( 89
90 if ($time && $m) {
91 if ($time < $m->{instantiate_time}) {
92 # the map was reset in the meantime
93 my $age = $cf::RUNTIME - $time;
94
95 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
96
97 if ($age >= $MAX_DISCONNECT_TIME) {
98 $ob->message (
99 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
100 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
101 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
102 . "H<You disconnected too long without having used a savebed.>",
103 cf::NDI_RED
104 );
105 # kill them.
106 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 my $killer = cf::arch::get "killer_login";
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else {
112 ($map, $x, $y) = $pl->savebed;
113
114 $ob->message (
115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
116 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
117 . "Better use a savebed next time, much worse things could have happened... "
118 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
119 cf::NDI_RED
120 );
121 }
122 } else {
123 $ob->message (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 124 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
62 . "as lots of things could happen when you leave by other means, such as cave-ins, " 125 . "as lots of things could happen when you leave by other means, such as cave-ins, "
63 . "or monsters suddenly snapping your body. Better use a savebed next time.", 126 . "or monsters suddenly snapping your body. Better use a savebed next time. "
127 . "H<Always apply a bed of reality to disconnect from the server.>",
64 cf::NDI_RED 128 cf::NDI_RED
65 ); 129 );
66 #d#TODO 130 }
67 } 131 }
132
133 $ob->goto ($map, $x, $y);
68} 134}
69 135
70# delete a player directory, be non-blocking AND synchronous... 136# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 137# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 138sub nuke_playerdir {
73 my ($user) = @_; 139 my ($user) = @_;
74 140
75 aio_stat "$PLAYERDIR/$user"; 141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
76 system "cd \Q$PLAYERDIR\E "
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
79}
80 142
81sub send_capabilities { 143 cf::fork_call {
144 rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp;
146 };
147}
148
149cf::client->attach (on_addme => sub {
82 my ($ns) = @_; 150 my ($ns) = @_;
83 151
84 return unless $ns->extcmd;
85
86 $ns->ext_event (capabilities =>
87 # id, name, flags (1 == 2d), edge length
88 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
89 );
90}
91
92sub setup {
93 my ($ns, $args) = @_;
94
95 # run through the cmds of setup
96 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
97 #
98 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
99 # The client then must sort this out
100
101 my %setup = split / +/, $args;
102 while (my ($k, $v) = each %setup) {
103 if ($k eq "sound") {
104 $ns->sound ($v);
105
106 } elsif ($k eq "exp64") {
107 $setup{$k} = 1;
108
109 } elsif ($k eq "spellmon") {
110 $ns->monitor_spells ($v);
111
112 } elsif ($k eq "darkness") {
113 $ns->darkness ($v);
114
115 } elsif ($k eq "map1cmd") {
116 $ns->mapmode (cf::Map1Cmd) if $v > 0;
117
118 } elsif ($k eq "map1acmd") {
119 $ns->mapmode (cf::Map1aCmd) if $v > 0;
120
121 } elsif ($k eq "map2cmd") {
122 # gcfclient bug, map1acmd is sent too late
123 $ns->mapmode (cf::Map1aCmd);
124 $setup{$k} = "FALSE";
125
126 } elsif ($k eq "newmapcmd") {
127 $ns->newmapcmd ($v);
128
129 } elsif ($k eq "mapinfocmd") {
130 $ns->mapinfocmd ($v);
131
132 } elsif ($k eq "extcmd") {
133 $ns->extcmd ($v > 0);
134 send_capabilities $ns;
135
136 } elsif ($k eq "extmap") {
137 $ns->extmap ($v);
138
139 } elsif ($k eq "facecache") {
140 if (!$v) {
141 $v = 1;
142 $setup{$k} = $v;
143 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
144 }
145
146 $ns->facecache ($v);
147
148 } elsif ($k eq "faceset") {
149 $ns->faceset (0);
150 $setup{$k} = 0;
151 # $ns->image2 (1)
152
153 } elsif ($k eq "tileset") {
154 $setup{$k} = $ns->faceset ($v & 1);
155
156 } elsif ($k eq "itemcmd") {
157 # Version of the item protocol command to use. Currently,
158 # only supported versions are 1 and 2. Using a numeric
159 # value will make it very easy to extend this in the future.
160 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
161
162 $setup{$k} = $ns->itemcmd;
163
164 } elsif ($k eq "mapsize") {
165 my ($x, $y) = split /x/, $v;
166
167 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
168 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
169
170 $setup{$k} = "${x}x${y}";
171
172 } elsif ($k eq "extendedMapInfos") {
173 $ns->ext_mapinfos ($v);
174
175 } elsif ($k eq "extendedTextInfos") {
176 $ns->has_readable_type ($v);
177
178 } elsif ($k eq "smoothing") { # cfplus-style smoothing
179 $ns->smoothing ($v);
180
181 } elsif ($k eq "fxix") {
182 $ns->fxix ($v);
183
184 } else {
185 # other commands:
186 # sexp: no idea, probably for oudated servers
187 # tick: more stupidity, server should sned a tick per tick
188
189 $setup{$k} = "FALSE";
190 }
191 }
192
193 $ns->send_packet (join " ", setup => %setup);
194
195 cf::datalog setup =>
196 request => $args,
197 reply => \%setup,
198 client => $ns->version,
199 ;
200}
201
202sub addme {
203 my ($ns) = @_;
204
205 if (!$ns->facecache) 152 if (!$ns->facecache)
206 { 153 {
207 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 154 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
208 155
209 156
210*** 157***
211*** WARNING: 158*** WARNING:
212*** Your client does not support face/image caching, 159*** Your client does not support face/image caching,
213*** or it has been disabled. Face caching is mandatory 160*** or it has been disabled. Face caching is mandatory
214*** so please enable it or use a newer client. 161*** so please enable it or use a newer client.
215*** 162***
216*** Look at your client preferences: 163*** Look at your client preferences:
217*** 164***
218*** CFPlus: all known versions automatically enable the facecache. 165*** deliantra: all known versions automatically enable the facecache.
219*** cfclient: use the -cache commandline option. 166*** cfclient: use the -cache commandline option.
220*** cfclient: map will not redraw automatically (bug). 167*** cfclient: map will not redraw automatically (bug).
221*** gcfclient: use -cache commandline option, or enable 168*** gcfclient: use -cache commandline option, or enable
222*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 169*** gcfclient: Client => Configure => Map & Image => Cache Images.
223*** jcrossclient: your client is broken, use CFPlus or gcfclient. 170*** jcrossclient: your client is broken, use deliantra or gcfclient.
224*** 171***
225*** 172***
226EOF 173EOF
227 if ($ns->version =~ /jcrossclient/) { 174 if ($ns->version =~ /jcrossclient/) {
228 # let them, for now 175 # let them, for now
… …
248 } 195 }
249 196
250 $ns->pl and return $ns->destroy; 197 $ns->pl and return $ns->destroy;
251 198
252 $ns->async (sub { 199 $ns->async (sub {
200 $Coro::current->{desc} = "addme init";
201
253 my ($user, $pass); 202 my ($user, $pass);
254 203
255 $ns->send_packet ("addme_success"); 204 $ns->send_packet ("addme_success");
256 205
257 for (;;) { 206 for (;;) {
… …
280 . "(only a-z, A-Z and 0-9 are allowed), " 229 . "(only a-z, A-Z and 0-9 are allowed), "
281 . "or is not between 3 and 18 characters in length.", 230 . "or is not between 3 and 18 characters in length.",
282 cf::NDI_RED 231 cf::NDI_RED
283 ); 232 );
284 } 233 }
234 Coro::Timer::sleep 0.4;
285 } 235 }
286 236
287 check_playing $ns, $user and next; 237 check_playing $ns, $user and next;
238
239 $Coro::current->{desc} = "addme($user) pass";
288 240
289 $ns->send_drawinfo ( 241 $ns->send_drawinfo (
290 "Welcome $user, please enter your password now. " 242 "Welcome $user, please enter your password now. "
291 . "New users should now choose a password. " 243 . "New users should now choose a password. "
292 . "Anything your client lets you enter is fine.", 244 . "Anything your client lets you enter is fine.",
… …
300 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
301 "Try to use at least three characters as your password please, " 253 "Try to use at least three characters as your password please, "
302 . "that cannot be too much to ask for :)", 254 . "that cannot be too much to ask for :)",
303 cf::NDI_RED 255 cf::NDI_RED
304 ); 256 );
257 Coro::Timer::sleep 0.4;
305 } 258 }
306 259
307 # lock this username for the remainder of this login session 260 # lock this username for the remainder of this login session
308 if ($cf::LOGIN_LOCK{$user}) { 261 if ($cf::LOGIN_LOCK{$user}) {
309 $ns->send_drawinfo ( 262 $ns->send_drawinfo (
… …
315 } 268 }
316 local $cf::LOGIN_LOCK{$user} = 1; 269 local $cf::LOGIN_LOCK{$user} = 1;
317 270
318 check_playing $ns, $user and next; 271 check_playing $ns, $user and next;
319 272
273 $Coro::current->{desc} = "addme($user) check";
274
320 # try to read the user file and check the password 275 # try to read the user file and check the password
321 if (my $pl = cf::player::find $user) { 276 if (my $pl = cf::player::find $user) {
322 aio_stat $pl->path and next; 277 aio_stat $pl->path and next;
323 my $mtime = (stat _)[9]; 278 my $mtime = (stat _)[9];
324 my $hash = $pl->password; 279 my $hash = $pl->password;
… …
326 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 281 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
327 nuke_str $pass; 282 nuke_str $pass;
328 # password matches, wonderful 283 # password matches, wonderful
329 my $pl = cf::player::find $user or next; 284 my $pl = cf::player::find $user or next;
330 $pl->connect ($ns); 285 $pl->connect ($ns);
331 check_clean_save $pl; 286 enter_map $pl;
332 last; 287 last;
333 } elsif (can_cleanup $pl, $mtime) { 288 } elsif (can_cleanup $pl, $mtime) {
334 Coro::Timer::sleep 1; 289 Coro::Timer::sleep 1;
335 290
336 $ns->send_drawinfo ( 291 $ns->send_drawinfo (
… …
377 next; 332 next;
378 } 333 }
379 } 334 }
380 335
381 # the rest of this function is character creation 336 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen";
382 338
383 # just to make sure nothing is left over 339 # just to make sure nothing is left over
384 nuke_playerdir $user; 340 nuke_playerdir $user;
385 341
386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 342 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
390 nuke_str $pass2; 346 nuke_str $pass2;
391 $ns->send_drawinfo ( 347 $ns->send_drawinfo (
392 "The passwords do not match, please try again.", 348 "The passwords do not match, please try again.",
393 cf::NDI_RED 349 cf::NDI_RED
394 ); 350 );
351 Coro::Timer::sleep 0.5;
395 next; 352 next;
396 } 353 }
397 354
398 nuke_str $pass2; 355 nuke_str $pass2;
399 356
400 my $pl = cf::player::new $user; 357 my $pl = cf::player::new $user;
401 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 358 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
402 nuke_str $pass; 359 nuke_str $pass;
403 $pl->connect ($ns); 360 $pl->connect ($ns);
404
405 my $ob = $pl->ob; 361 my $ob = $pl->ob;
362
363 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
406 364
407 while () { 365 while () {
408 $ob->update_stats; 366 $ob->update_stats;
409 $pl->save_stats; 367 $pl->save_stats;
410 368
… …
420 $ob->swap_stats ($res - 1, $swap - 1); 378 $ob->swap_stats ($res - 1, $swap - 1);
421 } 379 }
422 } else { 380 } else {
423 $ob->roll_stats; 381 $ob->roll_stats;
424 } 382 }
383
384 Coro::Timer::sleep 0.2;
425 } 385 }
426 386
427 $ob->set_animation (2); 387 $ob->set_animation (2);
428 $ob->add_statbonus; 388 $ob->add_statbonus;
429 389
430 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 390 while () {
431 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 391 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
392 my $msg = $ob->msg;
393 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
394 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
395
396 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
432 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 397 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
433 398
434 $ns->state (cf::ST_CHANGE_CLASS); 399 last if $res =~ /[dD]/;
400
401 $pl->chargen_race_next;
402 Coro::Timer::sleep 0.2;
403 }
404
405 $pl->chargen_race_done;
406
407 while () {
408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
409 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
410
411 if ($res =~ /^[fF]/) {
412 $pl->gender (1);
413 last;
414 } elsif ($res =~ /^[mM]/) {
415 $pl->gender (0);
416 last;
417 }
418 Coro::Timer::sleep 0.2;
419 }
420
421 $ob->reply (undef, "Welcome to Deliantra!");
422
435 delete $pl->{deny_save};#d# too early 423 delete $pl->{deny_save};
436 424
437 last; 425 last;
438 } 426 }
439 }); 427 });
440} 428});
441 429
442cf::register_command quit => sub { 430cf::register_command quit => sub {
443 my ($ob, $arg) = @_; 431 my ($ob, $arg) = @_;
444 432
445 $ob->reply (undef, 433 $ob->reply (undef,
… …
479 467
480 # update respawn position 468 # update respawn position
481 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 469 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
482 cf::async { $pl->save }; 470 cf::async { $pl->save };
483 471
472 my $killer = cf::arch::get "killer_logout";
484 $pl->killer ("left"); 473 $pl->killer ($killer);
474 $killer->destroy;
485 $ob->check_score; 475 $ob->check_score;
486 476
487 $ob->reply (undef, "In the future, you will wake up here when you die."); 477 $ob->reply (undef, "In the future, you will wake up here when you die.");
488 478
489 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 479 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
511 501
512 if ($cleanly) { 502 if ($cleanly) {
513 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 503 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
514 } else { 504 } else {
515 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 505 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
516 $pl->{unclean_save} = $cf::RUNTIME; 506 $pl->{unclean_save} = $cf::RUNTIME
507 unless safe_spot $pl;
517 } 508 }
518 }, 509 },
519); 510);
520 511
521cf::client->attach (
522 on_addme => \&addme,
523 on_setup => \&setup,
524);
525
526############################################################################# 512#############################################################################
527 513
528our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 514our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
529our $SAVE_TIMEOUT = 20; # save players every n seconds 515our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
530 516
531our $SCHEDULER = cf::async_ext { 517our $SCHEDULER = cf::async_ext {
532 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 518 $Coro::current->{desc} = "player scheduler";
519
533 while () { 520 while () {
534 $schedule_interval->next; 521 Coro::EV::timer_once $SCHEDULE_INTERVAL;
535 522
536 # this weird form of iteration over values is used because 523 # this weird form of iteration over values is used because
537 # the hash changes underneath us frequently, and for 524 # the hash changes underneath us frequently, and for
538 # keeps a direct reference to the value without (in 5.8 perls) 525 # keeps a direct reference to the value without (in 5.8 perls)
539 # keeping a reference, so this is prone to crashes or worse. 526 # keeping a reference, so this is prone to crashes or worse.
… …
543 or next; 530 or next;
544 $pl->valid or next; 531 $pl->valid or next;
545 532
546 eval { 533 eval {
547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 534 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
548 cf::wait_for_tick_begin;
549 $pl->save; 535 $pl->save;
550 536
551 unless ($pl->active) { 537 unless ($pl->active || $pl->ns) {
552 # check refcounts, this is tricky and needs to be adjusted to fit server internals 538 # check refcounts, this is tricky and needs to be adjusted to fit server internals
553 my $ob = $pl->ob; 539 my $ob = $pl->ob;
554 Scalar::Util::weaken $pl; 540
555 Scalar::Util::weaken $ob;
556 my $a_ = $pl->refcnt;#d#
557 my $b_ = $ob->refcnt;#d#
558 my $pl_ref = $pl->refcnt_cnt; 541 my $pl_ref = $pl->refcnt_cnt;
559 my $ob_ref = $ob->refcnt_cnt; 542 my $ob_ref = $ob->refcnt_cnt;
560 543
561 ## pl_ref == one from object + one from cf::PLAYER 544 ## pl_ref == $pl + ob->contr + %cf::PLAYER
562 ## ob_ref == one from simply being an object 545 ## ob_ref == $ob + pl->observe + simply being an object
563 if ($pl_ref == 2 && $ob_ref == 1) { 546 if ($pl_ref == 3 && $ob_ref == 3) {
564 warn "player-scheduler destroy ", $ob->name;#d# 547 warn "player-scheduler destroy ", $ob->name;#d#
565 548
566 # remove from sight and get fresh "copies" 549 # remove from sight and get fresh "copies"
567 $pl = delete $cf::PLAYER{$ob->name}; 550 $pl = delete $cf::PLAYER{$ob->name};
568 $ob = $pl->ob; 551 $ob = $pl->ob;
569 552
570 $ob->destroy;
571 $pl->destroy; 553 $pl->destroy; # destroys $ob
572 } else { 554 } else {
555 my $a_ = $pl->refcnt;#d#
556 my $b_ = $ob->refcnt;#d#
557
573 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 558 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
574 } 559 }
575 } 560 }
576 } 561 }
577 }; 562 };
578 warn $@ if $@; 563 warn $@ if $@;
579 Coro::cede; 564 cf::cede_to_tick;
580 }; 565 };
581 } 566 }
582}; 567};
583 568
584$SCHEDULER->prio (1); 569$SCHEDULER->prio (1);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines