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.173 by root, Sun Jan 14 18:00:34 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
… …
1105 1113
1106use Fcntl; 1114use Fcntl;
1107use Coro::AIO; 1115use Coro::AIO;
1108 1116
1109use overload 1117use overload
1110 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1111 1120
1112our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1114 1123
1115sub generate_random_map { 1124sub generate_random_map {
… …
1142} 1151}
1143 1152
1144# also paths starting with '/' 1153# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146 1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1147sub normalise { 1168sub normalise {
1148 my ($path, $base) = @_; 1169 my ($path, $base) = @_;
1149 1170
1150 # map plan: 1171 # map plan:
1151 # 1172 #
… …
1247 1268
1248sub unlink_save { 1269sub unlink_save {
1249 my ($self) = @_; 1270 my ($self) = @_;
1250 1271
1251 utf8::encode (my $save = $self->save_path); 1272 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1275}
1255 1276
1256sub load_header_from($) { 1277sub load_header_from($) {
1257 my ($self, $path) = @_; 1278 my ($self, $path) = @_;
1258 1279
… …
1319 1340
1320 $map->load_header 1341 $map->load_header
1321 or return; 1342 or return;
1322 1343
1323 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1346 $map->reset;
1325 undef $guard; 1347 undef $guard;
1326 $map = find $path 1348 $map = find $path
1327 or return; 1349 or return;
1328 } 1350 }
… …
1498 1520
1499sub reset_at { 1521sub reset_at {
1500 my ($self) = @_; 1522 my ($self) = @_;
1501 1523
1502 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1505 1527
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1530

Diff Legend

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