… | |
… | |
73 | } |
73 | } |
74 | |
74 | |
75 | sub enter_map { |
75 | sub enter_map { |
76 | my ($pl) = @_; |
76 | my ($pl) = @_; |
77 | |
77 | |
|
|
78 | warn $pl->ob->name, ": enter map 1\n";#d# |
78 | my $ob = $pl->ob; |
79 | my $ob = $pl->ob; |
79 | |
80 | |
80 | my ($map, $x, $y) |
81 | my ($map, $x, $y) |
81 | = $ob->{_link_pos} |
82 | = $ob->{_link_pos} |
82 | ? @{delete $ob->{_link_pos}} |
83 | ? @{delete $ob->{_link_pos}} |
83 | : ($pl->maplevel, $ob->x, $ob->y); |
84 | : ($pl->maplevel, $ob->x, $ob->y); |
84 | |
85 | |
|
|
86 | warn $pl->ob->name, ": enter map 2\n";#d# |
85 | $ob->enter_link; |
87 | $ob->enter_link; |
|
|
88 | warn $pl->ob->name, ": enter map 3\n";#d# |
86 | |
89 | |
87 | my $m = cf::map::find $map; |
90 | my $m = cf::map::find $map; |
88 | my $time = delete $pl->{unclean_save}; |
91 | my $time = delete $pl->{unclean_save}; |
|
|
92 | warn $pl->ob->name, ": enter map 4\n";#d# |
89 | |
93 | |
90 | if ($time && $m) { |
94 | if ($time && $m) { |
91 | if ($time < $m->{instantiate_time}) { |
95 | if ($time < $m->{instantiate_time}) { |
92 | # the map was reset in the meantime |
96 | # the map was reset in the meantime |
93 | my $age = $cf::RUNTIME - $time; |
97 | my $age = $cf::RUNTIME - $time; |
… | |
… | |
126 | cf::NDI_RED |
130 | cf::NDI_RED |
127 | ); |
131 | ); |
128 | } |
132 | } |
129 | } |
133 | } |
130 | |
134 | |
|
|
135 | warn $pl->ob->name, ": enter map 5\n";#d# |
131 | $ob->goto ($map, $x, $y); |
136 | #$ob->goto ($map, $x, $y); |
|
|
137 | $ob->goto ($map, $x, $y, sub { |
|
|
138 | warn $pl->ob->name, ": enter map check\n";#d# |
|
|
139 | $_[0] |
|
|
140 | }, sub { |
|
|
141 | warn $pl->ob->name, ": enter map done\n";#d# |
|
|
142 | }); |
|
|
143 | warn $pl->ob->name, ": enter map 6\n";#d# |
|
|
144 | |
132 | } |
145 | } |
133 | |
146 | |
134 | # delete a player directory, be non-blocking AND synchronous... |
147 | # delete a player directory, be non-blocking AND synchronous... |
135 | # (thats hard, so we crap out and fork). |
148 | # (thats hard, so we crap out and fork). |
136 | sub nuke_playerdir { |
149 | sub nuke_playerdir { |