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.32 by root, Mon Apr 2 18:04:45 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);
8 7
9my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
10 9
11# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
12sub nuke_str { 11sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 13}
15 14
16sub query { 15sub query {
17 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
18 17
19 my $current = $Coro::current; 18 my $current = $Coro::current;
20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
21 Coro::schedule while ref $current; 20 Coro::schedule while ref $current;
22 21
23 $current 22 $current
24} 23}
25 24
… …
41 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
42 41
43 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
47 . "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 "
48 . "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 "
49 . "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 "
50 . "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, "
51 . "this will fix anything.", 50 . "this will fix anything.",
52 cf::NDI_RED 51 cf::NDI_RED
53 ); 52 );
54 53
55 1 54 1
56} 55}
57 56
58sub check_clean_save { 57sub safe_spot($) {
59 my ($pl) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
60 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;
61 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
62 $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 (
63 "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, "
64 . "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, "
65 . "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.>",
66 cf::NDI_RED 128 cf::NDI_RED
67 ); 129 );
68 #d#TODO 130 }
69 } 131 }
132
133 $ob->goto ($map, $x, $y);
70} 134}
71 135
72# delete a player directory, be non-blocking AND synchronous... 136# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 137# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 138sub nuke_playerdir {
75 my ($user) = @_; 139 my ($user) = @_;
76 140
77 aio_stat "$PLAYERDIR/$user"; 141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
78 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81}
82 142
83sub addme { 143 cf::fork_call {
144 rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp;
146 };
147}
148
149cf::client->attach (on_addme => sub {
84 my ($ns) = @_; 150 my ($ns) = @_;
85 151
86 if (!$ns->facecache) 152 if (!$ns->facecache)
87 { 153 {
88 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 154 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
89 155
90 156
91*** 157***
92*** WARNING: 158*** WARNING:
93*** Your client does not support face/image caching, 159*** Your client does not support face/image caching,
94*** or it has been disabled. Face caching is mandatory 160*** or it has been disabled. Face caching is mandatory
95*** so please enable it or use a newer client. 161*** so please enable it or use a newer client.
96*** 162***
97*** Look at your client preferences: 163*** Look at your client preferences:
98*** 164***
99*** CFPlus: all known versions automatically enable the facecache. 165*** deliantra: all known versions automatically enable the facecache.
100*** cfclient: use the -cache commandline option. 166*** cfclient: use the -cache commandline option.
101*** cfclient: map will not redraw automatically (bug). 167*** cfclient: map will not redraw automatically (bug).
102*** gcfclient: use -cache commandline option, or enable 168*** gcfclient: use -cache commandline option, or enable
103*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 169*** gcfclient: Client => Configure => Map & Image => Cache Images.
104*** jcrossclient: your client is broken, use CFPlus or gcfclient. 170*** jcrossclient: your client is broken, use deliantra or gcfclient.
105*** 171***
106*** 172***
107EOF 173EOF
108 if ($ns->version =~ /jcrossclient/) { 174 if ($ns->version =~ /jcrossclient/) {
109 # let them, for now 175 # let them, for now
… …
111 $ns->flush; 177 $ns->flush;
112 return $ns->destroy; 178 return $ns->destroy;
113 } 179 }
114 180
115 # $ns->facecache = true; 181 # $ns->facecache = true;
116 } 182 }
183
184 if ($ns->mapmode < cf::Map1aCmd) {
185 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
186
187
188***
189*** WARNING:
190*** Your client is too old. Please upgrade to a newer version.
191EOF
192
193 $ns->flush;
194 return $ns->destroy;
195 }
117 196
118 $ns->pl and return $ns->destroy; 197 $ns->pl and return $ns->destroy;
119 198
120 $ns->async (sub { 199 $ns->async (sub {
200 $Coro::current->{desc} = "addme init";
201
121 my ($user, $pass); 202 my ($user, $pass);
122 203
123 $ns->send_packet ("addme_success"); 204 $ns->send_packet ("addme_success");
124 205
125 for (;;) { 206 for (;;) {
… …
148 . "(only a-z, A-Z and 0-9 are allowed), " 229 . "(only a-z, A-Z and 0-9 are allowed), "
149 . "or is not between 3 and 18 characters in length.", 230 . "or is not between 3 and 18 characters in length.",
150 cf::NDI_RED 231 cf::NDI_RED
151 ); 232 );
152 } 233 }
234 Coro::Timer::sleep 0.4;
153 } 235 }
154 236
155 check_playing $ns, $user and next; 237 check_playing $ns, $user and next;
238
239 $Coro::current->{desc} = "addme($user) pass";
156 240
157 $ns->send_drawinfo ( 241 $ns->send_drawinfo (
158 "Welcome $user, please enter your password now. " 242 "Welcome $user, please enter your password now. "
159 . "New users should now choose a password. " 243 . "New users should now choose a password. "
160 . "Anything your client lets you enter is fine.", 244 . "Anything your client lets you enter is fine.",
… …
168 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
169 "Try to use at least three characters as your password please, " 253 "Try to use at least three characters as your password please, "
170 . "that cannot be too much to ask for :)", 254 . "that cannot be too much to ask for :)",
171 cf::NDI_RED 255 cf::NDI_RED
172 ); 256 );
257 Coro::Timer::sleep 0.4;
173 } 258 }
174 259
175 # lock this username for the remainder of this login session 260 # lock this username for the remainder of this login session
176 if ($cf::LOGIN_LOCK{$user}) { 261 if ($cf::LOGIN_LOCK{$user}) {
177 $ns->send_drawinfo ( 262 $ns->send_drawinfo (
… …
183 } 268 }
184 local $cf::LOGIN_LOCK{$user} = 1; 269 local $cf::LOGIN_LOCK{$user} = 1;
185 270
186 check_playing $ns, $user and next; 271 check_playing $ns, $user and next;
187 272
273 $Coro::current->{desc} = "addme($user) check";
274
188 # try to read the user file and check the password 275 # try to read the user file and check the password
189 if (my $pl = cf::player::find $user) { 276 if (my $pl = cf::player::find $user) {
190 aio_stat $pl->path and next; 277 aio_stat $pl->path and next;
191 my $mtime = (stat _)[9]; 278 my $mtime = (stat _)[9];
192 my $hash = $pl->password; 279 my $hash = $pl->password;
… …
194 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) {
195 nuke_str $pass; 282 nuke_str $pass;
196 # password matches, wonderful 283 # password matches, wonderful
197 my $pl = cf::player::find $user or next; 284 my $pl = cf::player::find $user or next;
198 $pl->connect ($ns); 285 $pl->connect ($ns);
199 check_clean_save $pl; 286 enter_map $pl;
200 last; 287 last;
201 } elsif (can_cleanup $pl, $mtime) { 288 } elsif (can_cleanup $pl, $mtime) {
202 Coro::Timer::sleep 1; 289 Coro::Timer::sleep 1;
203 290
204 $ns->send_drawinfo ( 291 $ns->send_drawinfo (
… …
229 . "(check for Numlock and other semi-obvious error sources).", 316 . "(check for Numlock and other semi-obvious error sources).",
230 cf::NDI_RED 317 cf::NDI_RED
231 ); 318 );
232 next; 319 next;
233 } 320 }
321 } else {
322 # unable to load the playerfile:
323 # check wether the player dir exists, which means the file is corrupted or
324 # something very similar.
325 if (!aio_stat cf::player::playerdir $user) {
326 $ns->send_drawinfo (
327 "Unable to retrieve this player. It might be a locked or broken account. "
328 . "If this is your account, ask a dungeon master for assistance. "
329 . "Otherwise choose a different login name.",
330 cf::NDI_RED
331 );
332 next;
333 }
234 } 334 }
235 335
236 # the rest of this function is character creation 336 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen";
237 338
238 # just to make sure nothing is left over 339 # just to make sure nothing is left over
239 nuke_playerdir $user; 340 nuke_playerdir $user;
240 341
241 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.";
… …
245 nuke_str $pass2; 346 nuke_str $pass2;
246 $ns->send_drawinfo ( 347 $ns->send_drawinfo (
247 "The passwords do not match, please try again.", 348 "The passwords do not match, please try again.",
248 cf::NDI_RED 349 cf::NDI_RED
249 ); 350 );
351 Coro::Timer::sleep 0.5;
250 next; 352 next;
251 } 353 }
252 354
253 nuke_str $pass2; 355 nuke_str $pass2;
254 356
255 my $pl = cf::player::new $user; 357 my $pl = cf::player::new $user;
256 $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]);
257 nuke_str $pass; 359 nuke_str $pass;
258 $pl->connect ($ns); 360 $pl->connect ($ns);
259
260 my $ob = $pl->ob; 361 my $ob = $pl->ob;
362
363 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
261 364
262 while () { 365 while () {
263 $ob->update_stats; 366 $ob->update_stats;
264 $pl->save_stats; 367 $pl->save_stats;
265 368
… …
275 $ob->swap_stats ($res - 1, $swap - 1); 378 $ob->swap_stats ($res - 1, $swap - 1);
276 } 379 }
277 } else { 380 } else {
278 $ob->roll_stats; 381 $ob->roll_stats;
279 } 382 }
383
384 Coro::Timer::sleep 0.2;
280 } 385 }
281 386
282 $ob->set_animation (2); 387 $ob->set_animation (2);
283 $ob->add_statbonus; 388 $ob->add_statbonus;
284 389
285 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 390 while () {
286 $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,
287 "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";
288 398
289 $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
290 delete $pl->{deny_save};#d# too early 423 delete $pl->{deny_save};
291 424
292 last; 425 last;
293 } 426 }
294 }); 427 });
295} 428});
296 429
297cf::register_command quit => sub { 430cf::register_command quit => sub {
298 my ($ob, $arg) = @_; 431 my ($ob, $arg) = @_;
299 432
300 $ob->reply (undef, 433 $ob->reply (undef,
… …
334 467
335 # update respawn position 468 # update respawn position
336 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 469 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
337 cf::async { $pl->save }; 470 cf::async { $pl->save };
338 471
472 my $killer = cf::arch::get "killer_logout";
339 $pl->killer ("left"); 473 $pl->killer ($killer);
474 $killer->destroy;
340 $ob->check_score; 475 $ob->check_score;
341 476
342 $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.");
343 478
344 $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 {
… …
366 501
367 if ($cleanly) { 502 if ($cleanly) {
368 $_->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;
369 } else { 504 } else {
370 $_->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;
371 $pl->{unclean_save} = $cf::RUNTIME; 506 $pl->{unclean_save} = $cf::RUNTIME
507 unless safe_spot $pl;
372 } 508 }
373 }, 509 },
374); 510);
375 511
376sub setup {
377 my ($ns, $args) = @_;
378
379 # run through the cmds of setup
380 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
381 #
382 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
383 # The client then must sort this out
384
385 my %setup = split / +/, $args;
386 while (my ($k, $v) = each %setup) {
387
388 if ($k eq "sound") {
389 $ns->sound ($v);
390
391 } elsif ($k eq "exp64") {
392 $setup{$k} = 1;
393
394 } elsif ($k eq "spellmon") {
395 $ns->monitor_spells ($v);
396
397 } elsif ($k eq "darkness") {
398 $ns->darkness ($v);
399
400 } elsif ($k eq "map1cmd") {
401 $ns->mapmode (cf::Map1Cmd) if $v > 0;
402
403 } elsif ($k eq "map1acmd") {
404 $ns->mapmode (cf::Map1aCmd) if $v > 0;
405
406 } elsif ($k eq "newmapcmd") {
407 $ns->newmapcmd ($v);
408
409 } elsif ($k eq "mapinfocmd") {
410 $ns->mapinfocmd ($v);
411
412 } elsif ($k eq "extcmd") {
413 $ns->extcmd ($v > 0);
414
415 } elsif ($k eq "extmap") {
416 $ns->extmap ($v);
417
418 } elsif ($k eq "facecache") {
419 $ns->facecache ($v);
420
421 } elsif ($k eq "faceset") {
422 $ns->faceset (0);
423 $setup{$k} = 0;
424 # $ns->image2 (1)
425
426 } elsif ($k eq "itemcmd") {
427 # Version of the item protocol command to use. Currently,
428 # only supported versions are 1 and 2. Using a numeric
429 # value will make it very easy to extend this in the future.
430 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
431
432 $setup{$k} = $ns->itemcmd;
433
434 } elsif ($k eq "mapsize") {
435 my ($x, $y) = split /x/, $v;
436
437 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x);
438 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y);
439
440 $setup{$k} = "${x}x${y}";
441
442 } elsif ($k eq "extendedMapInfos") {
443 $ns->ext_mapinfos ($v);
444
445 } elsif ($k eq "extendedTextInfos") {
446 $ns->has_readable_type ($v);
447
448 } else {
449 # other commands:
450 # sexp: no idea, probably for oudated servers
451 # tick: more stupidity, server should sned a tick per tick
452
453 $setup{$k} = "FALSE";
454 }
455 }
456
457 $ns->send_packet (join " ", setup => %setup);
458
459 cf::datalog setup =>
460 request => $args,
461 reply => \%setup,
462 client => $ns->version,
463 ;
464}
465
466cf::client->attach (
467 on_addme => \&addme,
468 on_setup => \&setup,
469);
470
471############################################################################# 512#############################################################################
472 513
473our $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
474our $SAVE_TIMEOUT = 20; # save players every n seconds 515our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
475 516
476our $SCHEDULER = cf::async_ext { 517our $SCHEDULER = cf::async_ext {
477 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 518 $Coro::current->{desc} = "player scheduler";
519
478 while () { 520 while () {
479 $schedule_interval->next; 521 Coro::EV::timer_once $SCHEDULE_INTERVAL;
480 522
481 # this weird form of iteration over values is used because 523 # this weird form of iteration over values is used because
482 # the hash changes underneath us frequently, and for 524 # the hash changes underneath us frequently, and for
483 # 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)
484 # keeping a reference, so this is prone to crashes or worse. 526 # keeping a reference, so this is prone to crashes or worse.
… …
488 or next; 530 or next;
489 $pl->valid or next; 531 $pl->valid or next;
490 532
491 eval { 533 eval {
492 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 534 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
493 $cf::WAIT_FOR_TICK_ONE->wait;
494 $pl->save; 535 $pl->save;
495 536
496 unless ($pl->active) { 537 unless ($pl->active || $pl->ns) {
497 # 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
498 my $ob = $pl->ob; 539 my $ob = $pl->ob;
499 Scalar::Util::weaken $pl; 540
500 Scalar::Util::weaken $ob;
501 my $a_ = $pl->refcnt;#d#
502 my $b_ = $ob->refcnt;#d#
503 my $pl_ref = $pl->refcnt_cnt; 541 my $pl_ref = $pl->refcnt_cnt;
504 my $ob_ref = $ob->refcnt_cnt; 542 my $ob_ref = $ob->refcnt_cnt;
505 543
506 ## pl_ref == one from object + one from cf::PLAYER 544 ## pl_ref == $pl + ob->contr + %cf::PLAYER
507 ## ob_ref == one from simply being an object 545 ## ob_ref == $ob + pl->observe + simply being an object
508 if ($pl_ref == 2 && $ob_ref == 1) { 546 if ($pl_ref == 3 && $ob_ref == 3) {
509 warn "player-scheduler destroy ", $ob->name;#d# 547 warn "player-scheduler destroy ", $ob->name;#d#
510 548
511 # remove from sight and get fresh "copies" 549 # remove from sight and get fresh "copies"
512 $pl = delete $cf::PLAYER{$ob->name}; 550 $pl = delete $cf::PLAYER{$ob->name};
513 $ob = $pl->ob; 551 $ob = $pl->ob;
514 552
515 $ob->destroy;
516 $pl->destroy; 553 $pl->destroy; # destroys $ob
517 } else { 554 } else {
555 my $a_ = $pl->refcnt;#d#
556 my $b_ = $ob->refcnt;#d#
557
518 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#
519 } 559 }
520 } 560 }
521 } 561 }
522 }; 562 };
523 warn $@ if $@; 563 warn $@ if $@;
524 Coro::cede; 564 cf::cede_to_tick;
525 }; 565 };
526 } 566 }
527}; 567};
528 568
529$SCHEDULER->prio (1); 569$SCHEDULER->prio (1);

Diff Legend

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