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.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.172 by root, Sun Jan 14 13:32:48 2007 UTC

… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 504our @CB_MAP = ();
505 505
506my %attachment; 506my %attachment;
507 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
508sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
510 516
511 use sort 'stable'; 517 use sort 'stable';
512 518
… …
683# object support 689# object support
684 690
685sub reattach { 691sub reattach {
686 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 696
689 my $registry = $obj->registry; 697 my $registry = $obj->registry;
690 698
691 @$registry = (); 699 @$registry = ();
692 700
… …
1142} 1150}
1143 1151
1144# also paths starting with '/' 1152# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146 1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1147sub normalise { 1167sub normalise {
1148 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1149 1169
1150 # map plan: 1170 # map plan:
1151 # 1171 #
… …
1247 1267
1248sub unlink_save { 1268sub unlink_save {
1249 my ($self) = @_; 1269 my ($self) = @_;
1250 1270
1251 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1274}
1255 1275
1256sub load_header_from($) { 1276sub load_header_from($) {
1257 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1258 1278
… …
1319 1339
1320 $map->load_header 1340 $map->load_header
1321 or return; 1341 or return;
1322 1342
1323 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1345 $map->reset;
1325 undef $guard; 1346 undef $guard;
1326 $map = find $path 1347 $map = find $path
1327 or return; 1348 or return;
1328 } 1349 }
… …
1498 1519
1499sub reset_at { 1520sub reset_at {
1500 my ($self) = @_; 1521 my ($self) = @_;
1501 1522
1502 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1505 1526
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1529

Diff Legend

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