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.10 by root, Fri Mar 24 18:20:41 2006 UTC vs.
Revision 1.11 by root, Sun Mar 26 15:52:03 2006 UTC

… …
277*on_player_load = sub { 277*on_player_load = sub {
278 my ($event) = @_; 278 my ($event) = @_;
279 my $path = $event->{message}; 279 my $path = $event->{message};
280 my $ob = $event->{who}; 280 my $ob = $event->{who};
281 281
282 open my $fh, "<:raw", "$path.cfperl" 282 if (open my $fh, "<:raw", "$path.cfperl") {
283 or return; # no perl data
284 283
284 #d##TODO#remove
285
285 my $data = Storable::thaw do { local $/; <$fh> }; 286 my $data = Storable::thaw do { local $/; <$fh> };
286 287
287 $data->{version} <= 1 288 $data->{version} <= 1
288 or return; # too new 289 or return; # too new
289 290
290 %$ob = %{$data->{ob}}; 291 %$ob = %{$data->{ob}};
292 return;
293 }
294
295 for my $o ($ob, $ob->inv) {
296 if (my $value = $o->get_ob_key_value ("_perl_data")) {
297 $o->set_ob_key_value ("_perl_data");
298
299 %$o = %{ Storable::thaw pack "H*", $value };
300 }
301 }
291}; 302};
292 303
293*on_player_save = sub { 304*on_player_save = sub {
294 my ($event) = @_; 305 my ($event) = @_;
295 my $path = $event->{message}; 306 my $path = $event->{message};
296 my $ob = $event->{who}; 307 my $ob = $event->{who};
297 308
298 if (keys %$ob) { 309 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
299 open my $fh, ">:raw", "$path.cfperl" 310 for grep %$_, $ob, $ob->inv;
300 or die "$path.cfperl: $!";
301 311
302 stat $path; 312 unlink "$path.cfperl";#d##TODO#remove
303
304 print $fh Storable::nfreeze {
305 size => (stat _)[7],
306 time => (stat _)[9],
307 version => 1,
308 ob => $ob,
309 };
310
311 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
312 } else {
313 unlink "$path.cfperl";
314 }
315}; 313};
316 314
317register "<global>", __PACKAGE__; 315register "<global>", __PACKAGE__;
318 316
319load_extensions; 317load_extensions;

Diff Legend

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