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.225 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.233 by root, Wed Apr 4 02:20:27 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
… …
1124 } 1124 }
1125 1125
1126 \@paths 1126 \@paths
1127} 1127}
1128 1128
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1130 1130
1131Sends an ext reply to the player. 1131Sends an ext reply to the player.
1132 1132
1133=cut 1133=cut
1134 1134
1135sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1137 1137
1138 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1139 1139
1140 $self->send ("ext " . cf::to_json \%msg); 1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 $self->ns->ext_event ($type, %msg);
1141} 1153}
1142 1154
1143package cf; 1155package cf;
1144 1156
1145=back 1157=back
… …
1953 1965
1954 return unless $self->type == cf::PLAYER; 1966 return unless $self->type == cf::PLAYER;
1955 1967
1956 if ($exit->slaying eq "/!") { 1968 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 1969 #TODO: this should de-fi-ni-te-ly not be a sync-job
1970 # the problem is that $exit might not survive long enough
1971 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 1972 cf::sync_job { prepare_random_map $exit };
1959 } 1973 }
1960 1974
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 1975 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 1976 my $hp = $exit->stats->hp;
… …
1970 $self->goto ($slaying, $hp, $sp); 1984 $self->goto ($slaying, $hp, $sp);
1971 1985
1972 1; 1986 1;
1973 }) { 1987 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 1988 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 1989 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 1990 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 1991 cf::NDI_UNIQUE | cf::NDI_RED);
1978 1992
1979 warn "ERROR in enter_exit: $@"; 1993 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 1994 $self->leave_link;
1981 } 1995 }
1982 })->prio (1); 1996 })->prio (1);
… …
1998 2012
1999 utf8::encode $text; 2013 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2015}
2002 2016
2017=item $client->ext_event ($type, %msg)
2018
2019Sends an exti event to the client.
2020
2021=cut
2022
2023sub cf::client::ext_event($$%) {
2024 my ($self, $type, %msg) = @_;
2025
2026 $msg{msgtype} = "event_$type";
2027 $self->send_packet ("ext " . cf::to_json \%msg);
2028}
2003 2029
2004=item $success = $client->query ($flags, "text", \&cb) 2030=item $success = $client->query ($flags, "text", \&cb)
2005 2031
2006Queues a query to the client, calling the given callback with 2032Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2033the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2104 2130
2105# here we export the classes and methods available to script code 2131# here we export the classes and methods available to script code
2106 2132
2107=pod 2133=pod
2108 2134
2109The following fucntions and emthods are available within a safe environment: 2135The following functions and methods are available within a safe environment:
2110 2136
2111 cf::object contr pay_amount pay_player map 2137 cf::object contr pay_amount pay_player map
2112 cf::object::player player 2138 cf::object::player player
2113 cf::player peaceful 2139 cf::player peaceful
2114 cf::map trigger 2140 cf::map trigger
… …
2269} 2295}
2270 2296
2271############################################################################# 2297#############################################################################
2272# the server's init and main functions 2298# the server's init and main functions
2273 2299
2274sub load_faces { 2300sub load_facedata {
2275 my $path = sprintf "%s/faces", cf::datadir; 2301 my $path = sprintf "%s/facedata", cf::datadir;
2276 2302
2277 warn "loading faces from $path\n"; 2303 warn "loading facedata from $path\n";
2278 2304
2279 my $faces; 2305 my $faces;
2280 0 < aio_load $path, $faces 2306 0 < aio_load $path, $faces
2281 or die "$path: $!"; 2307 or die "$path: $!";
2282 2308
2283 Coro::cede; 2309 Coro::cede;
2284 $faces = Storable::thaw $faces; 2310 $faces = Storable::thaw $faces;
2285 Coro::cede; 2311 Coro::cede;
2312
2313 my $meta = delete $faces->{""};
2314 $meta->{version} == 1
2315 or cf::cleanup "$path: version mismatch, cannot proceed.";
2286 2316
2287 while (my ($face, $info) = each %$faces) { 2317 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2318 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2319 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2320 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2321 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2291 Coro::cede; 2322 Coro::cede;
2292 } 2323 }
2293 2324
2294 while (my ($face, $info) = each %$faces) { 2325 while (my ($face, $info) = each %$faces) {
2295 next unless $info->{smooth}; 2326 next unless $info->{smooth};
2296 my $idx = cf::face::find $face 2327 my $idx = cf::face::find $face
2297 or next; 2328 or next;
2298 if (my $smooth = cf::face::find $info->{smooth}) { 2329 if (my $smooth = cf::face::find $info->{smooth}) {
2299 cf::face::set_smooth $idx, $smooth; 2330 cf::face::set_smooth $idx, $smooth;
2300 warn "smooth $idx,$smooth ($face,$info->{smooth})\n";#d#
2301 } else { 2331 } else {
2302 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2332 warn "smooth face '$info->{smooth}' not found for face '$face'";
2303 } 2333 }
2304 Coro::cede; 2334 Coro::cede;
2305 } 2335 }
… …
2308} 2338}
2309 2339
2310sub reload_resources { 2340sub reload_resources {
2311 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2341 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2312 or die "unable to load regions file\n";#d# 2342 or die "unable to load regions file\n";#d#
2313 load_faces 2343 load_facedata
2314 or die "unable to load faces\n";#d# 2344 or die "unable to load facedata\n";#d#
2315} 2345}
2316 2346
2317sub init { 2347sub init {
2318 reload_resources; 2348 reload_resources;
2319} 2349}

Diff Legend

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