| 1 | #! perl # MANDATORY |
1 | #! perl # mandatory |
| 2 | |
2 | |
| 3 | # login handling |
3 | # login handling |
| 4 | |
4 | |
| 5 | use Fcntl; |
5 | use Fcntl; |
| 6 | use Coro::AIO; |
6 | use Coro::AIO; |
| 7 | use List::Util qw(min max); |
|
|
| 8 | |
7 | |
| 9 | my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; |
8 | our $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 |
| 12 | sub nuke_str { |
11 | sub 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 | |
| 16 | sub query { |
15 | sub 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 | |
| 58 | sub check_clean_save { |
57 | sub enter_map { |
| 59 | my ($pl) = @_; |
58 | my ($pl) = @_; |
| 60 | |
59 | |
|
|
60 | my $ob = $pl->ob; |
|
|
61 | |
|
|
62 | my ($map, $x, $y) |
|
|
63 | = $ob->{_link_pos} |
|
|
64 | ? @{delete $ob->{_link_pos}} |
|
|
65 | : ($pl->maplevel, $ob->x, $ob->y); |
|
|
66 | |
|
|
67 | $ob->enter_link; |
|
|
68 | |
| 61 | if (my $time = delete $pl->{unclean_save}) { |
69 | if (my $time = delete $pl->{unclean_save}) { |
| 62 | $pl->ns->send_drawinfo ( |
70 | if (my $m = cf::map::find $map) { |
|
|
71 | if ($time < $m->{instantiate_time}) { |
|
|
72 | # the map was reset in the meantime |
|
|
73 | my $age = $cf::RUNTIME - $time; |
|
|
74 | |
|
|
75 | warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# |
|
|
76 | |
|
|
77 | # for now, just go back to savebed |
|
|
78 | ($map, $x, $y) = $pl->savebed; |
|
|
79 | |
|
|
80 | if ($age >= $MAX_DISCONNECT_TIME) { |
|
|
81 | $ob->message ( |
|
|
82 | "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " |
|
|
83 | . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " |
|
|
84 | . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... " |
|
|
85 | . "H<You disconnected too long without having used a savebed.>", |
|
|
86 | cf::NDI_RED |
|
|
87 | ); |
|
|
88 | # kill them. |
|
|
89 | # reminds me of the famous badness 10000 syndrome... |
|
|
90 | $ob->stats->hp (-10000); #] if they survive this they deserved to live |
|
|
91 | } else { |
|
|
92 | $ob->message ( |
|
|
93 | "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " |
|
|
94 | . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " |
|
|
95 | . "Better use a savebed next time, much worse things could have happened... " |
|
|
96 | . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>", |
|
|
97 | cf::NDI_RED |
|
|
98 | ); |
|
|
99 | } |
|
|
100 | } else { |
|
|
101 | $ob->message ( |
| 63 | "You didn't use a savebed to leave this realm. This is very dangerous, " |
102 | "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, " |
103 | . "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.", |
104 | . "or monsters suddenly snapping your body. Better use a savebed next time. " |
|
|
105 | . "H<Always apply a bed of reality to disconnect from the server.>", |
| 66 | cf::NDI_RED |
106 | cf::NDI_RED |
|
|
107 | ); |
|
|
108 | } |
| 67 | ); |
109 | } |
| 68 | #d#TODO |
|
|
| 69 | } |
110 | } |
|
|
111 | |
|
|
112 | $ob->goto ($map, $x, $y); |
| 70 | } |
113 | } |
| 71 | |
114 | |
| 72 | # delete a player directory, be non-blocking AND synchronous... |
115 | # delete a player directory, be non-blocking AND synchronous... |
| 73 | # (thats hard, so we crap out and fork). |
116 | # (thats hard, so we crap out and fork). |
| 74 | sub nuke_playerdir { |
117 | sub nuke_playerdir { |
| … | |
… | |
| 78 | system "cd \Q$PLAYERDIR\E " |
121 | system "cd \Q$PLAYERDIR\E " |
| 79 | . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " |
122 | . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " |
| 80 | . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; |
123 | . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; |
| 81 | } |
124 | } |
| 82 | |
125 | |
| 83 | sub send_capabilities { |
126 | cf::client->attach (on_addme => sub { |
| 84 | my ($ns) = @_; |
127 | my ($ns) = @_; |
| 85 | |
128 | |
| 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 | |
|
|
| 94 | sub 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 - 1) | 1); |
|
|
| 164 | $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1); |
|
|
| 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 | |
|
|
| 195 | sub addme { |
|
|
| 196 | my ($ns) = @_; |
|
|
| 197 | |
|
|
| 198 | if (!$ns->facecache) |
129 | if (!$ns->facecache) |
| 199 | { |
130 | { |
| 200 | $ns->send_drawinfo (<<EOF, cf::NDI_RED); |
131 | $ns->send_drawinfo (<<EOF, cf::NDI_RED); |
| 201 | |
132 | |
| 202 | |
133 | |
| 203 | *** |
134 | *** |
| 204 | *** WARNING: |
135 | *** WARNING: |
| 205 | *** Your client does not support face/image caching, |
136 | *** Your client does not support face/image caching, |
| … | |
… | |
| 273 | . "(only a-z, A-Z and 0-9 are allowed), " |
204 | . "(only a-z, A-Z and 0-9 are allowed), " |
| 274 | . "or is not between 3 and 18 characters in length.", |
205 | . "or is not between 3 and 18 characters in length.", |
| 275 | cf::NDI_RED |
206 | cf::NDI_RED |
| 276 | ); |
207 | ); |
| 277 | } |
208 | } |
|
|
209 | Coro::Timer::sleep 0.4; |
| 278 | } |
210 | } |
| 279 | |
211 | |
| 280 | check_playing $ns, $user and next; |
212 | check_playing $ns, $user and next; |
| 281 | |
213 | |
| 282 | $ns->send_drawinfo ( |
214 | $ns->send_drawinfo ( |
| … | |
… | |
| 293 | $ns->send_drawinfo ( |
225 | $ns->send_drawinfo ( |
| 294 | "Try to use at least three characters as your password please, " |
226 | "Try to use at least three characters as your password please, " |
| 295 | . "that cannot be too much to ask for :)", |
227 | . "that cannot be too much to ask for :)", |
| 296 | cf::NDI_RED |
228 | cf::NDI_RED |
| 297 | ); |
229 | ); |
|
|
230 | Coro::Timer::sleep 0.4; |
| 298 | } |
231 | } |
| 299 | |
232 | |
| 300 | # lock this username for the remainder of this login session |
233 | # lock this username for the remainder of this login session |
| 301 | if ($cf::LOGIN_LOCK{$user}) { |
234 | if ($cf::LOGIN_LOCK{$user}) { |
| 302 | $ns->send_drawinfo ( |
235 | $ns->send_drawinfo ( |
| … | |
… | |
| 319 | if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { |
252 | if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { |
| 320 | nuke_str $pass; |
253 | nuke_str $pass; |
| 321 | # password matches, wonderful |
254 | # password matches, wonderful |
| 322 | my $pl = cf::player::find $user or next; |
255 | my $pl = cf::player::find $user or next; |
| 323 | $pl->connect ($ns); |
256 | $pl->connect ($ns); |
| 324 | check_clean_save $pl; |
257 | enter_map $pl; |
| 325 | last; |
258 | last; |
| 326 | } elsif (can_cleanup $pl, $mtime) { |
259 | } elsif (can_cleanup $pl, $mtime) { |
| 327 | Coro::Timer::sleep 1; |
260 | Coro::Timer::sleep 1; |
| 328 | |
261 | |
| 329 | $ns->send_drawinfo ( |
262 | $ns->send_drawinfo ( |
| … | |
… | |
| 383 | nuke_str $pass2; |
316 | nuke_str $pass2; |
| 384 | $ns->send_drawinfo ( |
317 | $ns->send_drawinfo ( |
| 385 | "The passwords do not match, please try again.", |
318 | "The passwords do not match, please try again.", |
| 386 | cf::NDI_RED |
319 | cf::NDI_RED |
| 387 | ); |
320 | ); |
|
|
321 | Coro::Timer::sleep 0.5; |
| 388 | next; |
322 | next; |
| 389 | } |
323 | } |
| 390 | |
324 | |
| 391 | nuke_str $pass2; |
325 | nuke_str $pass2; |
| 392 | |
326 | |
| 393 | my $pl = cf::player::new $user; |
327 | my $pl = cf::player::new $user; |
| 394 | $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); |
328 | $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); |
| 395 | nuke_str $pass; |
329 | nuke_str $pass; |
| 396 | $pl->connect ($ns); |
330 | $pl->connect ($ns); |
| 397 | |
|
|
| 398 | my $ob = $pl->ob; |
331 | my $ob = $pl->ob; |
|
|
332 | |
|
|
333 | $ob->goto ($pl->maplevel, $ob->x, $ob->y); |
| 399 | |
334 | |
| 400 | while () { |
335 | while () { |
| 401 | $ob->update_stats; |
336 | $ob->update_stats; |
| 402 | $pl->save_stats; |
337 | $pl->save_stats; |
| 403 | |
338 | |
| … | |
… | |
| 413 | $ob->swap_stats ($res - 1, $swap - 1); |
348 | $ob->swap_stats ($res - 1, $swap - 1); |
| 414 | } |
349 | } |
| 415 | } else { |
350 | } else { |
| 416 | $ob->roll_stats; |
351 | $ob->roll_stats; |
| 417 | } |
352 | } |
|
|
353 | |
|
|
354 | Coro::Timer::sleep 0.2; |
| 418 | } |
355 | } |
| 419 | |
356 | |
| 420 | $ob->set_animation (2); |
357 | $ob->set_animation (2); |
| 421 | $ob->add_statbonus; |
358 | $ob->add_statbonus; |
| 422 | |
359 | |
| 423 | $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); |
360 | while () { |
| 424 | $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, |
361 | $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); |
|
|
362 | my $msg = $ob->msg; |
|
|
363 | $msg =~ s/(?<=\S)\n(?=\S)/ /g; |
|
|
364 | $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); |
|
|
365 | |
|
|
366 | my $res = query $ns, cf::CS_QUERY_SINGLECHAR, |
| 425 | "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); |
367 | "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; |
| 426 | |
368 | |
| 427 | $ns->state (cf::ST_CHANGE_CLASS); |
369 | last if $res =~ /[dD]/; |
|
|
370 | |
|
|
371 | $pl->chargen_race_next; |
|
|
372 | Coro::Timer::sleep 0.2; |
|
|
373 | } |
|
|
374 | |
|
|
375 | $pl->chargen_race_done; |
|
|
376 | |
|
|
377 | while () { |
|
|
378 | my $res = query $ns, cf::CS_QUERY_SINGLECHAR, |
|
|
379 | "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; |
|
|
380 | |
|
|
381 | if ($res =~ /^[fF]/) { |
|
|
382 | $pl->gender (1); |
|
|
383 | last; |
|
|
384 | } elsif ($res =~ /^[mM]/) { |
|
|
385 | $pl->gender (0); |
|
|
386 | last; |
|
|
387 | } |
|
|
388 | Coro::Timer::sleep 0.2; |
|
|
389 | } |
|
|
390 | |
|
|
391 | $ob->reply (undef, "Welcome to Crossfire!"); |
|
|
392 | |
| 428 | delete $pl->{deny_save};#d# too early |
393 | delete $pl->{deny_save}; |
| 429 | |
394 | |
| 430 | last; |
395 | last; |
| 431 | } |
396 | } |
| 432 | }); |
397 | }); |
| 433 | } |
398 | }); |
| 434 | |
399 | |
| 435 | cf::register_command quit => sub { |
400 | cf::register_command quit => sub { |
| 436 | my ($ob, $arg) = @_; |
401 | my ($ob, $arg) = @_; |
| 437 | |
402 | |
| 438 | $ob->reply (undef, |
403 | $ob->reply (undef, |
| … | |
… | |
| 509 | $pl->{unclean_save} = $cf::RUNTIME; |
474 | $pl->{unclean_save} = $cf::RUNTIME; |
| 510 | } |
475 | } |
| 511 | }, |
476 | }, |
| 512 | ); |
477 | ); |
| 513 | |
478 | |
| 514 | cf::client->attach ( |
|
|
| 515 | on_addme => \&addme, |
|
|
| 516 | on_setup => \&setup, |
|
|
| 517 | ); |
|
|
| 518 | |
|
|
| 519 | ############################################################################# |
479 | ############################################################################# |
| 520 | |
480 | |
| 521 | our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs |
481 | our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs |
| 522 | our $SAVE_TIMEOUT = 20; # save players every n seconds |
482 | our $SAVE_TIMEOUT = 20; # save players every n seconds |
| 523 | |
483 | |
| … | |
… | |
| 536 | or next; |
496 | or next; |
| 537 | $pl->valid or next; |
497 | $pl->valid or next; |
| 538 | |
498 | |
| 539 | eval { |
499 | eval { |
| 540 | if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { |
500 | if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { |
| 541 | $cf::WAIT_FOR_TICK_ONE->wait; |
501 | cf::wait_for_tick_begin; |
| 542 | $pl->save; |
502 | $pl->save; |
| 543 | |
503 | |
| 544 | unless ($pl->active) { |
504 | unless ($pl->active || $pl->ns) { |
| 545 | # check refcounts, this is tricky and needs to be adjusted to fit server internals |
505 | # check refcounts, this is tricky and needs to be adjusted to fit server internals |
| 546 | my $ob = $pl->ob; |
506 | my $ob = $pl->ob; |
| 547 | Scalar::Util::weaken $pl; |
507 | |
| 548 | Scalar::Util::weaken $ob; |
|
|
| 549 | my $a_ = $pl->refcnt;#d# |
|
|
| 550 | my $b_ = $ob->refcnt;#d# |
|
|
| 551 | my $pl_ref = $pl->refcnt_cnt; |
508 | my $pl_ref = $pl->refcnt_cnt; |
| 552 | my $ob_ref = $ob->refcnt_cnt; |
509 | my $ob_ref = $ob->refcnt_cnt; |
| 553 | |
510 | |
| 554 | ## pl_ref == one from object + one from cf::PLAYER |
511 | ## pl_ref == $pl + ob->contr + %cf::PLAYER |
| 555 | ## ob_ref == one from simply being an object |
512 | ## ob_ref == $ob + pl->observe + simply being an object |
| 556 | if ($pl_ref == 2 && $ob_ref == 1) { |
513 | if ($pl_ref == 3 && $ob_ref == 3) { |
| 557 | warn "player-scheduler destroy ", $ob->name;#d# |
514 | warn "player-scheduler destroy ", $ob->name;#d# |
| 558 | |
515 | |
| 559 | # remove from sight and get fresh "copies" |
516 | # remove from sight and get fresh "copies" |
| 560 | $pl = delete $cf::PLAYER{$ob->name}; |
517 | $pl = delete $cf::PLAYER{$ob->name}; |
| 561 | $ob = $pl->ob; |
518 | $ob = $pl->ob; |
| 562 | |
519 | |
| 563 | $ob->destroy; |
|
|
| 564 | $pl->destroy; |
520 | $pl->destroy; # destroys $ob |
| 565 | } else { |
521 | } else { |
|
|
522 | my $a_ = $pl->refcnt;#d# |
|
|
523 | my $b_ = $ob->refcnt;#d# |
|
|
524 | |
| 566 | warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# |
525 | warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# |
| 567 | } |
526 | } |
| 568 | } |
527 | } |
| 569 | } |
528 | } |
| 570 | }; |
529 | }; |
| 571 | warn $@ if $@; |
530 | warn $@ if $@; |
