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.14 by root, Fri Mar 31 22:47:35 2006 UTC

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

Diff Legend

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