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.35 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.86 by root, Mon May 5 22:38:47 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"; $pl->killer ($killer); $killer->destroy;
109 } else {
110 ($map, $x, $y) = $pl->savebed;
111
112 $ob->message (
113 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
114 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
115 . "Better use a savebed next time, much worse things could have happened... "
116 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
117 cf::NDI_RED
118 );
119 }
120 } else {
121 $ob->message (
63 "You didn't use a savebed to leave this realm. This is very dangerous, " 122 "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, " 123 . "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.", 124 . "or monsters suddenly snapping your body. Better use a savebed next time. "
125 . "H<Always apply a bed of reality to disconnect from the server.>",
66 cf::NDI_RED 126 cf::NDI_RED
67 ); 127 );
68 #d#TODO 128 }
69 } 129 }
130
131 $ob->goto ($map, $x, $y);
70} 132}
71 133
72# delete a player directory, be non-blocking AND synchronous... 134# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 135# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 136sub nuke_playerdir {
75 my ($user) = @_; 137 my ($user) = @_;
76 138
77 aio_stat "$PLAYERDIR/$user"; 139 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 140
83sub send_capabilities { 141 cf::fork_call {
142 rename "$PLAYERDIR/$user", $temp;
143 system "rm", "-rf", $temp;
144 };
145}
146
147cf::client->attach (on_addme => sub {
84 my ($ns) = @_; 148 my ($ns) = @_;
85 149
86 return unless $ns->extcmd;
87
88 $ns->ext_event (capabilities =>
89 # id, name, flags (1 == 2d), edge length
90 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
91 );
92}
93
94sub setup {
95 my ($ns, $args) = @_;
96
97 # run through the cmds of setup
98 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
99 #
100 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
101 # The client then must sort this out
102
103 my %setup = split / +/, $args;
104 while (my ($k, $v) = each %setup) {
105 if ($k eq "sound") {
106 $ns->sound ($v);
107
108 } elsif ($k eq "exp64") {
109 $setup{$k} = 1;
110
111 } elsif ($k eq "spellmon") {
112 $ns->monitor_spells ($v);
113
114 } elsif ($k eq "darkness") {
115 $ns->darkness ($v);
116
117 } elsif ($k eq "map1cmd") {
118 $ns->mapmode (cf::Map1Cmd) if $v > 0;
119
120 } elsif ($k eq "map1acmd") {
121 $ns->mapmode (cf::Map1aCmd) if $v > 0;
122
123 } elsif ($k eq "map2cmd") {
124 # gcfclient bug, map1acmd is sent too late
125 $ns->mapmode (cf::Map1aCmd);
126 $setup{$k} = "FALSE";
127
128 } elsif ($k eq "newmapcmd") {
129 $ns->newmapcmd ($v);
130
131 } elsif ($k eq "mapinfocmd") {
132 $ns->mapinfocmd ($v);
133
134 } elsif ($k eq "extcmd") {
135 $ns->extcmd ($v > 0);
136 send_capabilities $ns;
137
138 } elsif ($k eq "extmap") {
139 $ns->extmap ($v);
140
141 } elsif ($k eq "facecache") {
142 $ns->facecache ($v);
143
144 } elsif ($k eq "faceset") {
145 $ns->faceset (0);
146 $setup{$k} = 0;
147 # $ns->image2 (1)
148
149 } elsif ($k eq "tileset") {
150 $setup{$k} = $ns->faceset ($v & 1);
151
152 } elsif ($k eq "itemcmd") {
153 # Version of the item protocol command to use. Currently,
154 # only supported versions are 1 and 2. Using a numeric
155 # value will make it very easy to extend this in the future.
156 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
157
158 $setup{$k} = $ns->itemcmd;
159
160 } elsif ($k eq "mapsize") {
161 my ($x, $y) = split /x/, $v;
162
163 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x);
164 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y);
165
166 $setup{$k} = "${x}x${y}";
167
168 } elsif ($k eq "extendedMapInfos") {
169 $ns->ext_mapinfos ($v);
170
171 } elsif ($k eq "extendedTextInfos") {
172 $ns->has_readable_type ($v);
173
174 } elsif ($k eq "fxix") {
175 $ns->fxix ($v);
176
177 } else {
178 # other commands:
179 # sexp: no idea, probably for oudated servers
180 # tick: more stupidity, server should sned a tick per tick
181
182 $setup{$k} = "FALSE";
183 }
184 }
185
186 $ns->send_packet (join " ", setup => %setup);
187
188 cf::datalog setup =>
189 request => $args,
190 reply => \%setup,
191 client => $ns->version,
192 ;
193}
194
195sub addme {
196 my ($ns) = @_;
197
198 if (!$ns->facecache) 150 if (!$ns->facecache)
199 { 151 {
200 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 152 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
201 153
202 154
203*** 155***
204*** WARNING: 156*** WARNING:
205*** Your client does not support face/image caching, 157*** Your client does not support face/image caching,
206*** or it has been disabled. Face caching is mandatory 158*** or it has been disabled. Face caching is mandatory
207*** so please enable it or use a newer client. 159*** so please enable it or use a newer client.
208*** 160***
209*** Look at your client preferences: 161*** Look at your client preferences:
210*** 162***
211*** CFPlus: all known versions automatically enable the facecache. 163*** deliantra: all known versions automatically enable the facecache.
212*** cfclient: use the -cache commandline option. 164*** cfclient: use the -cache commandline option.
213*** cfclient: map will not redraw automatically (bug). 165*** cfclient: map will not redraw automatically (bug).
214*** gcfclient: use -cache commandline option, or enable 166*** gcfclient: use -cache commandline option, or enable
215*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 167*** gcfclient: Client => Configure => Map & Image => Cache Images.
216*** jcrossclient: your client is broken, use CFPlus or gcfclient. 168*** jcrossclient: your client is broken, use deliantra or gcfclient.
217*** 169***
218*** 170***
219EOF 171EOF
220 if ($ns->version =~ /jcrossclient/) { 172 if ($ns->version =~ /jcrossclient/) {
221 # let them, for now 173 # let them, for now
… …
241 } 193 }
242 194
243 $ns->pl and return $ns->destroy; 195 $ns->pl and return $ns->destroy;
244 196
245 $ns->async (sub { 197 $ns->async (sub {
198 $Coro::current->{desc} = "addme init";
199
246 my ($user, $pass); 200 my ($user, $pass);
247 201
248 $ns->send_packet ("addme_success"); 202 $ns->send_packet ("addme_success");
249 203
250 for (;;) { 204 for (;;) {
… …
273 . "(only a-z, A-Z and 0-9 are allowed), " 227 . "(only a-z, A-Z and 0-9 are allowed), "
274 . "or is not between 3 and 18 characters in length.", 228 . "or is not between 3 and 18 characters in length.",
275 cf::NDI_RED 229 cf::NDI_RED
276 ); 230 );
277 } 231 }
232 Coro::Timer::sleep 0.4;
278 } 233 }
279 234
280 check_playing $ns, $user and next; 235 check_playing $ns, $user and next;
236
237 $Coro::current->{desc} = "addme($user) pass";
281 238
282 $ns->send_drawinfo ( 239 $ns->send_drawinfo (
283 "Welcome $user, please enter your password now. " 240 "Welcome $user, please enter your password now. "
284 . "New users should now choose a password. " 241 . "New users should now choose a password. "
285 . "Anything your client lets you enter is fine.", 242 . "Anything your client lets you enter is fine.",
… …
293 $ns->send_drawinfo ( 250 $ns->send_drawinfo (
294 "Try to use at least three characters as your password please, " 251 "Try to use at least three characters as your password please, "
295 . "that cannot be too much to ask for :)", 252 . "that cannot be too much to ask for :)",
296 cf::NDI_RED 253 cf::NDI_RED
297 ); 254 );
255 Coro::Timer::sleep 0.4;
298 } 256 }
299 257
300 # lock this username for the remainder of this login session 258 # lock this username for the remainder of this login session
301 if ($cf::LOGIN_LOCK{$user}) { 259 if ($cf::LOGIN_LOCK{$user}) {
302 $ns->send_drawinfo ( 260 $ns->send_drawinfo (
… …
308 } 266 }
309 local $cf::LOGIN_LOCK{$user} = 1; 267 local $cf::LOGIN_LOCK{$user} = 1;
310 268
311 check_playing $ns, $user and next; 269 check_playing $ns, $user and next;
312 270
271 $Coro::current->{desc} = "addme($user) check";
272
313 # try to read the user file and check the password 273 # try to read the user file and check the password
314 if (my $pl = cf::player::find $user) { 274 if (my $pl = cf::player::find $user) {
315 aio_stat $pl->path and next; 275 aio_stat $pl->path and next;
316 my $mtime = (stat _)[9]; 276 my $mtime = (stat _)[9];
317 my $hash = $pl->password; 277 my $hash = $pl->password;
… …
319 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 279 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
320 nuke_str $pass; 280 nuke_str $pass;
321 # password matches, wonderful 281 # password matches, wonderful
322 my $pl = cf::player::find $user or next; 282 my $pl = cf::player::find $user or next;
323 $pl->connect ($ns); 283 $pl->connect ($ns);
324 check_clean_save $pl; 284 enter_map $pl;
325 last; 285 last;
326 } elsif (can_cleanup $pl, $mtime) { 286 } elsif (can_cleanup $pl, $mtime) {
327 Coro::Timer::sleep 1; 287 Coro::Timer::sleep 1;
328 288
329 $ns->send_drawinfo ( 289 $ns->send_drawinfo (
… …
354 . "(check for Numlock and other semi-obvious error sources).", 314 . "(check for Numlock and other semi-obvious error sources).",
355 cf::NDI_RED 315 cf::NDI_RED
356 ); 316 );
357 next; 317 next;
358 } 318 }
319 } else {
320 # unable to load the playerfile:
321 # check wether the player dir exists, which means the file is corrupted or
322 # something very similar.
323 if (!aio_stat cf::player::playerdir $user) {
324 $ns->send_drawinfo (
325 "Unable to retrieve this player. It might be a locked or broken account. "
326 . "If this is your account, ask a dungeon master for assistance. "
327 . "Otherwise choose a different login name.",
328 cf::NDI_RED
329 );
330 next;
331 }
359 } 332 }
360 333
361 # the rest of this function is character creation 334 # the rest of this function is character creation
335 $Coro::current->{desc} = "addme($user) chargen";
362 336
363 # just to make sure nothing is left over 337 # just to make sure nothing is left over
364 nuke_playerdir $user; 338 nuke_playerdir $user;
365 339
366 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 340 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
370 nuke_str $pass2; 344 nuke_str $pass2;
371 $ns->send_drawinfo ( 345 $ns->send_drawinfo (
372 "The passwords do not match, please try again.", 346 "The passwords do not match, please try again.",
373 cf::NDI_RED 347 cf::NDI_RED
374 ); 348 );
349 Coro::Timer::sleep 0.5;
375 next; 350 next;
376 } 351 }
377 352
378 nuke_str $pass2; 353 nuke_str $pass2;
379 354
380 my $pl = cf::player::new $user; 355 my $pl = cf::player::new $user;
381 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 356 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
382 nuke_str $pass; 357 nuke_str $pass;
383 $pl->connect ($ns); 358 $pl->connect ($ns);
384
385 my $ob = $pl->ob; 359 my $ob = $pl->ob;
360
361 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
386 362
387 while () { 363 while () {
388 $ob->update_stats; 364 $ob->update_stats;
389 $pl->save_stats; 365 $pl->save_stats;
390 366
… …
400 $ob->swap_stats ($res - 1, $swap - 1); 376 $ob->swap_stats ($res - 1, $swap - 1);
401 } 377 }
402 } else { 378 } else {
403 $ob->roll_stats; 379 $ob->roll_stats;
404 } 380 }
381
382 Coro::Timer::sleep 0.2;
405 } 383 }
406 384
407 $ob->set_animation (2); 385 $ob->set_animation (2);
408 $ob->add_statbonus; 386 $ob->add_statbonus;
409 387
410 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 388 while () {
411 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 389 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
390 my $msg = $ob->msg;
391 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
392 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
393
394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
412 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 395 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
413 396
414 $ns->state (cf::ST_CHANGE_CLASS); 397 last if $res =~ /[dD]/;
398
399 $pl->chargen_race_next;
400 Coro::Timer::sleep 0.2;
401 }
402
403 # create the playerdir, if necessary, as chargen_race_done did it before
404 # presumably because of unique maps
405 aio_mkdir playerdir $pl, 0770;
406 $pl->chargen_race_done;
407
408 while () {
409 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
410 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
411
412 if ($res =~ /^[fF]/) {
413 $pl->gender (1);
414 last;
415 } elsif ($res =~ /^[mM]/) {
416 $pl->gender (0);
417 last;
418 }
419 Coro::Timer::sleep 0.2;
420 }
421
422 $ob->reply (undef, "Welcome to Deliantra!");
423
415 delete $pl->{deny_save};#d# too early 424 delete $pl->{deny_save};
416 425
417 last; 426 last;
418 } 427 }
419 }); 428 });
420} 429});
421 430
422cf::register_command quit => sub { 431cf::register_command quit => sub {
423 my ($ob, $arg) = @_; 432 my ($ob, $arg) = @_;
424 433
425 $ob->reply (undef, 434 $ob->reply (undef,
… …
459 468
460 # update respawn position 469 # update respawn position
461 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 470 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
462 cf::async { $pl->save }; 471 cf::async { $pl->save };
463 472
464 $pl->killer ("left"); 473 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
465 $ob->check_score; 474 $ob->check_score;
466 475
467 $ob->reply (undef, "In the future, you will wake up here when you die."); 476 $ob->reply (undef, "In the future, you will wake up here when you die.");
468 477
469 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 478 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
491 500
492 if ($cleanly) { 501 if ($cleanly) {
493 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 502 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
494 } else { 503 } else {
495 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 504 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
496 $pl->{unclean_save} = $cf::RUNTIME; 505 $pl->{unclean_save} = $cf::RUNTIME
506 unless safe_spot $pl;
497 } 507 }
498 }, 508 },
499); 509);
500 510
501cf::client->attach (
502 on_addme => \&addme,
503 on_setup => \&setup,
504);
505
506############################################################################# 511#############################################################################
507 512
508our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 513our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
509our $SAVE_TIMEOUT = 20; # save players every n seconds 514our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
510 515
511our $SCHEDULER = cf::async_ext { 516our $SCHEDULER = cf::async_ext {
512 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 517 $Coro::current->{desc} = "player scheduler";
518
513 while () { 519 while () {
514 $schedule_interval->next; 520 Coro::EV::timer_once $SCHEDULE_INTERVAL;
515 521
516 # this weird form of iteration over values is used because 522 # this weird form of iteration over values is used because
517 # the hash changes underneath us frequently, and for 523 # the hash changes underneath us frequently, and for
518 # keeps a direct reference to the value without (in 5.8 perls) 524 # keeps a direct reference to the value without (in 5.8 perls)
519 # keeping a reference, so this is prone to crashes or worse. 525 # keeping a reference, so this is prone to crashes or worse.
… …
523 or next; 529 or next;
524 $pl->valid or next; 530 $pl->valid or next;
525 531
526 eval { 532 eval {
527 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 533 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
528 $cf::WAIT_FOR_TICK_ONE->wait;
529 $pl->save; 534 $pl->save;
530 535
531 unless ($pl->active) { 536 unless ($pl->active || $pl->ns) {
532 # check refcounts, this is tricky and needs to be adjusted to fit server internals 537 # check refcounts, this is tricky and needs to be adjusted to fit server internals
533 my $ob = $pl->ob; 538 my $ob = $pl->ob;
534 Scalar::Util::weaken $pl; 539
535 Scalar::Util::weaken $ob;
536 my $a_ = $pl->refcnt;#d#
537 my $b_ = $ob->refcnt;#d#
538 my $pl_ref = $pl->refcnt_cnt; 540 my $pl_ref = $pl->refcnt_cnt;
539 my $ob_ref = $ob->refcnt_cnt; 541 my $ob_ref = $ob->refcnt_cnt;
540 542
541 ## pl_ref == one from object + one from cf::PLAYER 543 ## pl_ref == $pl + ob->contr + %cf::PLAYER
542 ## ob_ref == one from simply being an object 544 ## ob_ref == $ob + pl->observe + simply being an object
543 if ($pl_ref == 2 && $ob_ref == 1) { 545 if ($pl_ref == 3 && $ob_ref == 3) {
544 warn "player-scheduler destroy ", $ob->name;#d# 546 warn "player-scheduler destroy ", $ob->name;#d#
545 547
546 # remove from sight and get fresh "copies" 548 # remove from sight and get fresh "copies"
547 $pl = delete $cf::PLAYER{$ob->name}; 549 $pl = delete $cf::PLAYER{$ob->name};
548 $ob = $pl->ob; 550 $ob = $pl->ob;
549 551
550 $ob->destroy;
551 $pl->destroy; 552 $pl->destroy; # destroys $ob
552 } else { 553 } else {
554 my $a_ = $pl->refcnt;#d#
555 my $b_ = $ob->refcnt;#d#
556
553 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 557 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
554 } 558 }
555 } 559 }
556 } 560 }
557 }; 561 };
558 warn $@ if $@; 562 warn $@ if $@;
559 Coro::cede; 563 cf::cede_to_tick;
560 }; 564 };
561 } 565 }
562}; 566};
563 567
564$SCHEDULER->prio (1); 568$SCHEDULER->prio (1);

Diff Legend

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