| … | |
… | |
| 70 | } |
70 | } |
| 71 | |
71 | |
| 72 | sub enter_map { |
72 | sub enter_map { |
| 73 | my ($pl) = @_; |
73 | my ($pl) = @_; |
| 74 | |
74 | |
| 75 | warn $pl->ob->name, ": enter map 1\n";#d# |
|
|
| 76 | my $ob = $pl->ob; |
75 | my $ob = $pl->ob; |
| 77 | |
76 | |
| 78 | my ($map, $x, $y) |
77 | my ($map, $x, $y) |
| 79 | = $ob->{_link_pos} |
78 | = $ob->{_link_pos} |
| 80 | ? @{delete $ob->{_link_pos}} |
79 | ? @{delete $ob->{_link_pos}} |
| 81 | : ($pl->maplevel, $ob->x, $ob->y); |
80 | : ($pl->maplevel, $ob->x, $ob->y); |
| 82 | |
81 | |
| 83 | warn $pl->ob->name, ": enter map 2\n";#d# |
|
|
| 84 | $ob->enter_link; |
82 | $ob->enter_link; |
| 85 | warn $pl->ob->name, ": enter map 3\n";#d# |
|
|
| 86 | |
83 | |
| 87 | my $m = cf::map::find $map; |
84 | my $m = cf::map::find $map; |
| 88 | my $time = delete $pl->{unclean_save}; |
85 | my $time = delete $pl->{unclean_save}; |
| 89 | warn $pl->ob->name, ": enter map 4\n";#d# |
|
|
| 90 | |
86 | |
| 91 | if ($time && $m) { |
87 | if ($time && $m) { |
| 92 | if ($time < $m->{instantiate_time}) { |
88 | if ($time < $m->{instantiate_time}) { |
| 93 | # the map was reset in the meantime |
89 | # the map was reset in the meantime |
| 94 | my $age = $cf::RUNTIME - $time; |
90 | my $age = $cf::RUNTIME - $time; |
| … | |
… | |
| 127 | cf::NDI_RED |
123 | cf::NDI_RED |
| 128 | ); |
124 | ); |
| 129 | } |
125 | } |
| 130 | } |
126 | } |
| 131 | |
127 | |
| 132 | warn $pl->ob->name, ": enter map 5\n";#d# |
|
|
| 133 | #$ob->goto ($map, $x, $y); |
128 | $ob->goto ($map, $x, $y); |
| 134 | $ob->goto ($map, $x, $y, sub { |
|
|
| 135 | warn $pl->ob->name, ": enter map check\n";#d# |
|
|
| 136 | $_[0] |
|
|
| 137 | }, sub { |
|
|
| 138 | warn $pl->ob->name, ": enter map done\n";#d# |
|
|
| 139 | }); |
|
|
| 140 | warn $pl->ob->name, ": enter map 6\n";#d# |
|
|
| 141 | |
|
|
| 142 | } |
129 | } |
| 143 | |
130 | |
| 144 | # delete a player directory, be non-blocking AND synchronous... |
131 | # delete a player directory, be non-blocking AND synchronous... |
| 145 | # (that's hard, so we crap out and fork). |
132 | # (that's hard, so we crap out and fork). |
| 146 | sub nuke_playerdir { |
133 | sub nuke_playerdir { |
| … | |
… | |
| 244 | if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { |
231 | if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { |
| 245 | nuke_str $pass; |
232 | nuke_str $pass; |
| 246 | # password matches, wonderful |
233 | # password matches, wonderful |
| 247 | my $pl = cf::player::find $user or next; |
234 | my $pl = cf::player::find $user or next; |
| 248 | $pl->connect ($ns); |
235 | $pl->connect ($ns); |
| 249 | $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp |
|
|
| 250 | enter_map $pl; |
236 | enter_map $pl; |
| 251 | last; |
237 | last; |
| 252 | } elsif (can_cleanup $pl, $mtime) { |
238 | } elsif (can_cleanup $pl, $mtime) { |
| 253 | Coro::Timer::sleep 1; |
239 | Coro::Timer::sleep 1; |
| 254 | |
240 | |
