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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC

423 or return; 423 or return;
424 424
425 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
426 and return; 426 and return;
427 427
428 warn "runtime file written.\n";#d# 428 warn "runtime file written.\n";
429 429
430 1 430 1
431} 431}
432 432
433=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
873 or return; 873 or return;
874 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
875 } 875 }
876 876
877 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
879 return ($data, $av); 879 return ($data, $av);
880} 880}
881 881
882############################################################################# 882#############################################################################
883# command handling &c 883# command handling &c
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1724 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 1725
1726 return if $self->players; 1726 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d# 1727 return if $self->isa ("ext::map_per_player");#d#
1728 1728
1729 warn "resetting map ", $self->path;#d# 1729 warn "resetting map ", $self->path;
1730 1730
1731 $self->in_memory (cf::MAP_SWAPPED); 1731 $self->in_memory (cf::MAP_SWAPPED);
1732 1732
1733 # need to save uniques path 1733 # need to save uniques path
1734 unless ($self->{deny_save}) { 1734 unless ($self->{deny_save}) {
2560sub reload_resources { 2560sub reload_resources {
2561 warn "reloading resource files...\n"; 2561 warn "reloading resource files...\n";
2562 2562
2563 reload_regions; 2563 reload_regions;
2564 reload_facedata; 2564 reload_facedata;
2565 #reload_archetypes;#d#
2565 reload_archetypes; 2566 reload_archetypes;
2566 reload_treasures; 2567 reload_treasures;
2567 2568
2568 warn "finished reloading resource files\n"; 2569 warn "finished reloading resource files\n";
2569} 2570}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines