… | |
… | |
963 | } |
963 | } |
964 | |
964 | |
965 | sub path($) { |
965 | sub path($) { |
966 | my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; |
966 | my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; |
967 | |
967 | |
968 | (playerdir $login) . "/$login.pl" |
968 | (playerdir $login) . "/playerdata" |
969 | } |
969 | } |
970 | |
970 | |
971 | sub find_active($) { |
971 | sub find_active($) { |
972 | $cf::PLAYER{$_[0]} |
972 | $cf::PLAYER{$_[0]} |
973 | and $cf::PLAYER{$_[0]}->active |
973 | and $cf::PLAYER{$_[0]}->active |
… | |
… | |
986 | my $login = $_[0]; |
986 | my $login = $_[0]; |
987 | |
987 | |
988 | my $guard = cf::lock_acquire "user_find:$login"; |
988 | my $guard = cf::lock_acquire "user_find:$login"; |
989 | |
989 | |
990 | $cf::PLAYER{$_[0]} || do { |
990 | $cf::PLAYER{$_[0]} || do { |
|
|
991 | # rename old playerfiles to new ones |
|
|
992 | #TODO: remove when no longer required |
|
|
993 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
|
|
994 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
|
|
995 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
|
|
996 | aio_unlink +(playerdir $login) . "/$login.pl"; |
|
|
997 | |
991 | my $pl = load_pl path $login |
998 | my $pl = load_pl path $login |
992 | or return; |
999 | or return; |
993 | $cf::PLAYER{$login} = $pl |
1000 | $cf::PLAYER{$login} = $pl |
994 | } |
1001 | } |
995 | } |
1002 | } |
… | |
… | |
1124 | } |
1131 | } |
1125 | |
1132 | |
1126 | \@paths |
1133 | \@paths |
1127 | } |
1134 | } |
1128 | |
1135 | |
1129 | =item $player->ext_reply ($msgid, $msgtype, %msg) |
1136 | =item $player->ext_reply ($msgid, %msg) |
1130 | |
1137 | |
1131 | Sends an ext reply to the player. |
1138 | Sends an ext reply to the player. |
1132 | |
1139 | |
1133 | =cut |
1140 | =cut |
1134 | |
1141 | |
1135 | sub ext_reply($$$%) { |
1142 | sub ext_reply($$%) { |
1136 | my ($self, $id, %msg) = @_; |
1143 | my ($self, $id, %msg) = @_; |
1137 | |
1144 | |
1138 | $msg{msgid} = $id; |
1145 | $msg{msgid} = $id; |
1139 | |
1146 | |
1140 | $self->send ("ext " . cf::to_json \%msg); |
1147 | $self->send ("ext " . cf::to_json \%msg); |
|
|
1148 | } |
|
|
1149 | |
|
|
1150 | =item $player->ext_event ($type, %msg) |
|
|
1151 | |
|
|
1152 | Sends an ext event to the client. |
|
|
1153 | |
|
|
1154 | =cut |
|
|
1155 | |
|
|
1156 | sub ext_event($$%) { |
|
|
1157 | my ($self, $type, %msg) = @_; |
|
|
1158 | |
|
|
1159 | $self->ns->ext_event ($type, %msg); |
1141 | } |
1160 | } |
1142 | |
1161 | |
1143 | package cf; |
1162 | package cf; |
1144 | |
1163 | |
1145 | =back |
1164 | =back |
… | |
… | |
1953 | |
1972 | |
1954 | return unless $self->type == cf::PLAYER; |
1973 | return unless $self->type == cf::PLAYER; |
1955 | |
1974 | |
1956 | if ($exit->slaying eq "/!") { |
1975 | if ($exit->slaying eq "/!") { |
1957 | #TODO: this should de-fi-ni-te-ly not be a sync-job |
1976 | #TODO: this should de-fi-ni-te-ly not be a sync-job |
|
|
1977 | # the problem is that $exit might not survive long enough |
|
|
1978 | # so it needs to be done right now, right here |
1958 | cf::sync_job { prepare_random_map $exit }; |
1979 | cf::sync_job { prepare_random_map $exit }; |
1959 | } |
1980 | } |
1960 | |
1981 | |
1961 | my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
1982 | my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
1962 | my $hp = $exit->stats->hp; |
1983 | my $hp = $exit->stats->hp; |
… | |
… | |
1970 | $self->goto ($slaying, $hp, $sp); |
1991 | $self->goto ($slaying, $hp, $sp); |
1971 | |
1992 | |
1972 | 1; |
1993 | 1; |
1973 | }) { |
1994 | }) { |
1974 | $self->message ("Something went wrong deep within the crossfire server. " |
1995 | $self->message ("Something went wrong deep within the crossfire server. " |
1975 | . "I'll try to bring you back to the map you were before. " |
1996 | . "I'll try to bring you back to the map you were before. " |
1976 | . "Please report this to the dungeon master!", |
1997 | . "Please report this to the dungeon master!", |
1977 | cf::NDI_UNIQUE | cf::NDI_RED); |
1998 | cf::NDI_UNIQUE | cf::NDI_RED); |
1978 | |
1999 | |
1979 | warn "ERROR in enter_exit: $@"; |
2000 | warn "ERROR in enter_exit: $@"; |
1980 | $self->leave_link; |
2001 | $self->leave_link; |
1981 | } |
2002 | } |
1982 | })->prio (1); |
2003 | })->prio (1); |
… | |
… | |
1998 | |
2019 | |
1999 | utf8::encode $text; |
2020 | utf8::encode $text; |
2000 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2021 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2001 | } |
2022 | } |
2002 | |
2023 | |
|
|
2024 | =item $client->ext_event ($type, %msg) |
|
|
2025 | |
|
|
2026 | Sends an exti event to the client. |
|
|
2027 | |
|
|
2028 | =cut |
|
|
2029 | |
|
|
2030 | sub cf::client::ext_event($$%) { |
|
|
2031 | my ($self, $type, %msg) = @_; |
|
|
2032 | |
|
|
2033 | $msg{msgtype} = "event_$type"; |
|
|
2034 | $self->send_packet ("ext " . cf::to_json \%msg); |
|
|
2035 | } |
2003 | |
2036 | |
2004 | =item $success = $client->query ($flags, "text", \&cb) |
2037 | =item $success = $client->query ($flags, "text", \&cb) |
2005 | |
2038 | |
2006 | Queues a query to the client, calling the given callback with |
2039 | Queues a query to the client, calling the given callback with |
2007 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2040 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
… | |
… | |
2299 | while (my ($face, $info) = each %$faces) { |
2332 | while (my ($face, $info) = each %$faces) { |
2300 | next unless $info->{smooth}; |
2333 | next unless $info->{smooth}; |
2301 | my $idx = cf::face::find $face |
2334 | my $idx = cf::face::find $face |
2302 | or next; |
2335 | or next; |
2303 | if (my $smooth = cf::face::find $info->{smooth}) { |
2336 | if (my $smooth = cf::face::find $info->{smooth}) { |
2304 | cf::face::set_smooth $idx, $smooth; |
2337 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
2305 | } else { |
2338 | } else { |
2306 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2339 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2307 | } |
2340 | } |
2308 | Coro::cede; |
2341 | Coro::cede; |
2309 | } |
2342 | } |