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.9 by root, Fri Mar 17 03:22:00 2006 UTC vs.
Revision 1.11 by root, Sun Mar 26 15:52:03 2006 UTC

… …
81 my ($data) = @_; 81 my ($data) = @_;
82 82
83 my $cb = $hook[$data->{event_code}] 83 my $cb = $hook[$data->{event_code}]
84 or return; 84 or return;
85 85
86 $_->($data) for values %$cb; 86 List::Util::max map $_->($data), values %$cb
87
88 ()
89} 87}
90 88
91sub inject_command { 89sub inject_command {
92 my ($name, $obj, $params) = @_; 90 my ($name, $obj, $params) = @_;
93 91
… …
279*on_player_load = sub { 277*on_player_load = sub {
280 my ($event) = @_; 278 my ($event) = @_;
281 my $path = $event->{message}; 279 my $path = $event->{message};
282 my $ob = $event->{who}; 280 my $ob = $event->{who};
283 281
284 open my $fh, "<:raw", "$path.cfperl" 282 if (open my $fh, "<:raw", "$path.cfperl") {
285 or return; # no perl data
286 283
284 #d##TODO#remove
285
287 my $data = Storable::thaw do { local $/; <$fh> }; 286 my $data = Storable::thaw do { local $/; <$fh> };
288 287
289 $data->{version} <= 1 288 $data->{version} <= 1
290 or return; # too new 289 or return; # too new
291 290
292 %$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 }
293}; 302};
294 303
295*on_player_save = sub { 304*on_player_save = sub {
296 my ($event) = @_; 305 my ($event) = @_;
297 my $path = $event->{message}; 306 my $path = $event->{message};
298 my $ob = $event->{who}; 307 my $ob = $event->{who};
299 308
300 if (keys %$ob) { 309 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
301 open my $fh, ">:raw", "$path.cfperl" 310 for grep %$_, $ob, $ob->inv;
302 or die "$path.cfperl: $!";
303 311
304 stat $path; 312 unlink "$path.cfperl";#d##TODO#remove
305
306 print $fh Storable::nfreeze {
307 size => (stat _)[7],
308 time => (stat _)[9],
309 version => 1,
310 ob => $ob,
311 };
312
313 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
314 } else {
315 unlink "$path.cfperl";
316 }
317}; 313};
318 314
319register "<global>", __PACKAGE__; 315register "<global>", __PACKAGE__;
320 316
321load_extensions; 317load_extensions;

Diff Legend

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