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.224 by root, Mon Mar 12 21:42:12 2007 UTC vs.
Revision 1.229 by root, Sun Apr 1 00:36:34 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
… …
1995 1984
1996sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1997 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1998 1987
1999 utf8::encode $text; 1988 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 1990}
2002 1991
2003 1992
2004=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
2005 1994
… …
2104 2093
2105# here we export the classes and methods available to script code 2094# here we export the classes and methods available to script code
2106 2095
2107=pod 2096=pod
2108 2097
2109The following fucntions and emthods are available within a safe environment: 2098The following functions and methods are available within a safe environment:
2110 2099
2111 cf::object contr pay_amount pay_player map 2100 cf::object contr pay_amount pay_player map
2112 cf::object::player player 2101 cf::object::player player
2113 cf::player peaceful 2102 cf::player peaceful
2114 cf::map trigger 2103 cf::map trigger
… …
2269} 2258}
2270 2259
2271############################################################################# 2260#############################################################################
2272# the server's init and main functions 2261# the server's init and main functions
2273 2262
2274sub load_faces { 2263sub load_facedata {
2275 my $path = sprintf "%s/faces", cf::datadir; 2264 my $path = sprintf "%s/facedata", cf::datadir;
2276 2265
2277 warn "loading faces from $path\n"; 2266 warn "loading facedata from $path\n";
2278 2267
2279 my $faces; 2268 my $faces;
2280 0 < aio_load $path, $faces 2269 0 < aio_load $path, $faces
2281 or die "$path: $!"; 2270 or die "$path: $!";
2282 2271
2283 Coro::cede; 2272 Coro::cede;
2284 $faces = Storable::thaw $faces; 2273 $faces = Storable::thaw $faces;
2285 Coro::cede; 2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2286 2279
2287 while (my ($face, $info) = each %$faces) { 2280 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2285 Coro::cede;
2286 }
2287
2288 while (my ($face, $info) = each %$faces) {
2289 next unless $info->{smooth};
2290 my $idx = cf::face::find $face
2291 or next;
2292 if (my $smooth = cf::face::find $info->{smooth}) {
2293 cf::face::set_smooth $idx, $smooth;
2294 } else {
2295 warn "smooth face '$info->{smooth}' not found for face '$face'";
2296 }
2291 Coro::cede; 2297 Coro::cede;
2292 } 2298 }
2293 2299
2294 1 2300 1
2295} 2301}
2296 2302
2297sub reload_resources { 2303sub reload_resources {
2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2304 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2299 or die "unable to load regions file\n";#d# 2305 or die "unable to load regions file\n";#d#
2300 load_faces 2306 load_facedata
2301 or die "unable to load faces\n";#d# 2307 or die "unable to load facedata\n";#d#
2302} 2308}
2303 2309
2304sub init { 2310sub init {
2305 reload_resources; 2311 reload_resources;
2306} 2312}

Diff Legend

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