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.13 by root, Fri Mar 31 22:09:36 2006 UTC

… …
76 76
77 $cb->($data) 77 $cb->($data)
78} 78}
79 79
80sub inject_global_event { 80sub inject_global_event {
81 my ($data) = @_; 81 my $event = shift;
82 82
83 my $cb = $hook[$data->{event_code}] 83 my $cb = $hook[$event]
84 or return; 84 or return;
85 85
86 List::Util::max map $_->($data), values %$cb 86 List::Util::max map &$_, values %$cb
87} 87}
88 88
89sub inject_command { 89sub inject_command {
90 my ($name, $obj, $params) = @_; 90 my ($name, $obj, $params) = @_;
91 91
… …
216 216
217############################################################################# 217#############################################################################
218# load/save/clean perl data associated with a map 218# load/save/clean perl data associated with a map
219 219
220*on_mapclean = sub { 220*on_mapclean = sub {
221 my $map = shift->{map}; 221 my ($map) = @_;
222 222
223 my $path = $map->tmpname; 223 my $path = $map->tmpname;
224 defined $path or return; 224 defined $path or return;
225 225
226 unlink "$path.cfperl"; 226 unlink "$path.cfperl";
227}; 227};
228 228
229*on_mapin = 229*on_mapin =
230*on_mapload = sub { 230*on_mapload = sub {
231 my $map = shift->{map}; 231 my ($map) = @_;
232 232
233 my $path = $map->tmpname; 233 my $path = $map->tmpname;
234 $path = $map->path unless defined $path; 234 $path = $map->path unless defined $path;
235 235
236 open my $fh, "<:raw", "$path.cfperl" 236 open my $fh, "<:raw", "$path.cfperl"
… …
243 243
244 $map->_set_obs ($data->{obs}); 244 $map->_set_obs ($data->{obs});
245}; 245};
246 246
247*on_mapout = sub { 247*on_mapout = sub {
248 my $map = shift->{map}; 248 my ($map) = @_;
249 249
250 my $path = $map->tmpname; 250 my $path = $map->tmpname;
251 $path = $map->path unless defined $path; 251 $path = $map->path unless defined $path;
252 252
253 my $obs = $map->_get_obs; 253 my $obs = $map->_get_obs;
… …
273 273
274############################################################################# 274#############################################################################
275# load/save perl data associated with player->ob objects 275# load/save perl data associated with player->ob objects
276 276
277*on_player_load = sub { 277*on_player_load = sub {
278 my ($event) = @_; 278 my ($ob, $path) = @_;
279 my $path = $event->{message};
280 my $ob = $event->{who};
281 279
282 open my $fh, "<:raw", "$path.cfperl" 280 if (open my $fh, "<:raw", "$path.cfperl") {
283 or return; # no perl data
284 281
282 #d##TODO#remove
283
285 my $data = Storable::thaw do { local $/; <$fh> }; 284 my $data = Storable::thaw do { local $/; <$fh> };
286 285
287 $data->{version} <= 1 286 $data->{version} <= 1
288 or return; # too new 287 or return; # too new
289 288
290 %$ob = %{$data->{ob}}; 289 %$ob = %{$data->{ob}};
290 return;
291 }
292
293 for my $o ($ob, $ob->inv) {
294 if (my $value = $o->get_ob_key_value ("_perl_data")) {
295 $o->set_ob_key_value ("_perl_data");
296
297 %$o = %{ Storable::thaw pack "H*", $value };
298 }
299 }
291}; 300};
292 301
293*on_player_save = sub { 302*on_player_save = sub {
294 my ($event) = @_; 303 my ($ob, $path) = @_;
295 my $path = $event->{message};
296 my $ob = $event->{who};
297 304
298 if (keys %$ob) { 305 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
299 open my $fh, ">:raw", "$path.cfperl" 306 for grep %$_, $ob, $ob->inv;
300 or die "$path.cfperl: $!";
301 307
302 stat $path; 308 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}; 309};
316 310
317register "<global>", __PACKAGE__; 311register "<global>", __PACKAGE__;
318 312
319load_extensions; 313load_extensions;

Diff Legend

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