ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.226 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.235 by root, Tue Apr 10 09:35:23 2007 UTC

… …
21 21
22use BDB (); 22use BDB ();
23use Data::Dumper; 23use Data::Dumper;
24use Digest::MD5; 24use Digest::MD5;
25use Fcntl; 25use Fcntl;
26use YAML::Syck ();
26use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
27use YAML::Syck ();
28use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF; 29use Compress::LZF;
30 30
31# configure various modules to our taste
32#
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
33$Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
34
35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36 37
37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
38$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
39 40
40$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
41 44
42our %COMMAND = (); 45our %COMMAND = ();
43our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
44 47
45our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
… …
205 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
206 $d 209 $d
207 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
208} 211}
209 212
210use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
211 214
212=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
213 216
214Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
215 218
216=cut
217
218sub from_json($) {
219 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220 JSON::Syck::Load $_[0]
221}
222
223=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
224 220
225Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
226
227=cut
228
229sub to_json($) {
230 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
231 JSON::Syck::Dump $_[0]
232}
233 222
234=item cf::lock_wait $string 223=item cf::lock_wait $string
235 224
236Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
237 226
… …
382 371
383 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
384 and return; 373 and return;
385 374
386 1 375 1
376}
377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387} 387}
388 388
389=back 389=back
390 390
391=cut 391=cut
… …
963} 963}
964 964
965sub path($) { 965sub 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
971sub find_active($) { 971sub 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
1131Sends an ext reply to the player. 1138Sends an ext reply to the player.
1132 1139
1133=cut 1140=cut
1134 1141
1135sub ext_reply($$$%) { 1142sub 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
1152Sends an ext event to the client.
1153
1154=cut
1155
1156sub ext_event($$%) {
1157 my ($self, $type, %msg) = @_;
1158
1159 $self->ns->ext_event ($type, %msg);
1141} 1160}
1142 1161
1143package cf; 1162package 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
2026Sends an exti event to the client.
2027
2028=cut
2029
2030sub 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
2006Queues a query to the client, calling the given callback with 2039Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2104 2137
2105# here we export the classes and methods available to script code 2138# here we export the classes and methods available to script code
2106 2139
2107=pod 2140=pod
2108 2141
2109The following fucntions and emthods are available within a safe environment: 2142The following functions and methods are available within a safe environment:
2110 2143
2111 cf::object contr pay_amount pay_player map 2144 cf::object contr pay_amount pay_player map
2112 cf::object::player player 2145 cf::object::player player
2113 cf::player peaceful 2146 cf::player peaceful
2114 cf::map trigger 2147 cf::map trigger
… …
2269} 2302}
2270 2303
2271############################################################################# 2304#############################################################################
2272# the server's init and main functions 2305# the server's init and main functions
2273 2306
2274sub load_faces { 2307sub load_facedata {
2275 my $path = sprintf "%s/faces", cf::datadir; 2308 my $path = sprintf "%s/facedata", cf::datadir;
2276 2309
2277 warn "loading faces from $path\n"; 2310 warn "loading facedata from $path\n";
2278 2311
2279 my $faces; 2312 my $faces;
2280 0 < aio_load $path, $faces 2313 0 < aio_load $path, $faces
2281 or die "$path: $!"; 2314 or die "$path: $!";
2282 2315
… …
2290 2323
2291 while (my ($face, $info) = each %$faces) { 2324 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2325 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2295 Coro::cede; 2329 Coro::cede;
2296 } 2330 }
2297 2331
2298 while (my ($face, $info) = each %$faces) { 2332 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth}; 2333 next unless $info->{smooth};
2300 my $idx = cf::face::find $face 2334 my $idx = cf::face::find $face
2301 or next; 2335 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) { 2336 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth; 2337 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2304 } else { 2338 } else {
2305 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2339 warn "smooth face '$info->{smooth}' not found for face '$face'";
2306 } 2340 }
2307 Coro::cede; 2341 Coro::cede;
2308 } 2342 }
… …
2311} 2345}
2312 2346
2313sub reload_resources { 2347sub reload_resources {
2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2315 or die "unable to load regions file\n";#d# 2349 or die "unable to load regions file\n";#d#
2316 load_faces 2350 load_facedata
2317 or die "unable to load faces\n";#d# 2351 or die "unable to load facedata\n";#d#
2318} 2352}
2319 2353
2320sub init { 2354sub init {
2321 reload_resources; 2355 reload_resources;
2322} 2356}

Diff Legend

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