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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.530 by root, Wed Apr 28 21:05:33 2010 UTC

… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
260 270
261 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
262 272
263 if ($Coro::current == $Coro::main) {#d# 273 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 275 return;#d#
266 }#d# 276 }#d#
267 277
268 # kill coroutine otherwise 278 # kill coroutine otherwise
… …
396} 406}
397 407
398=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
399 409
400Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 411get spread over time.
402 412
403=cut 413=cut
404 414
405sub periodic($$) { 415sub periodic($$) {
406 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
584 reset_signals; 594 reset_signals;
585 &$cb 595 &$cb
586 }, @args; 596 }, @args;
587 597
588 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
589} 610}
590 611
591=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
592 613
593=cut 614=cut
… …
1174 1195
1175 sync_job { 1196 sync_job {
1176 if (length $$rdata) { 1197 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1180 1202
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1241 $av = $st->{objs}; 1263 $av = $st->{objs};
1242 } 1264 }
1243 1265
1244 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1247 1270
1248 ($data, $av) 1271 ($data, $av)
1249} 1272}
1250 1273
1251=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1422 if (length $@) { 1445 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1446 warn "$v->{path}: $@\n";
1424 1447
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1449 if exists $v->{meta}{mandatory};
1450
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1427 } else { 1453 } else {
1428 $done{$k} = delete $todo{$k}; 1454 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1455 push @EXTS, $v->{pkg};
1430 $progress = 1; 1456 $progress = 1;
1431 1457
… …
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1636
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1638 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1617 1642
1618 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1699 \@logins
1675} 1700}
1676 1701
1677=item $player->maps 1702=item $player->maps
1678 1703
1704=item cf::player::maps $login
1705
1679Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1680player. May block. 1707player. May block.
1681 1708
1682=cut 1709=cut
1683 1710
… …
1744 1771
1745=cut 1772=cut
1746 1773
1747sub find_by_path($) { 1774sub find_by_path($) {
1748 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1749 1778
1750 my ($match, $specificity); 1779 my ($match, $specificity);
1751 1780
1752 for my $region (list) { 1781 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
… …
1817 1846
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1848}
1820 1849
1821# also paths starting with '/' 1850# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1852
1824sub thawer_merge { 1853sub thawer_merge {
1825 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1826 1855
1827 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
2137 or next; 2166 or next;
2138 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2139 or next; 2168 or next;
2140 $neigh->load; 2169 $neigh->load;
2141 2170
2171 # now find the diagonal neighbours
2142 push @neigh, 2172 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2175 }
2146 2176
… …
2198 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2199 2229
2200 () 2230 ()
2201} 2231}
2202 2232
2233# common code, used by both ->save and ->swapout
2203sub save { 2234sub _save {
2204 my ($self) = @_; 2235 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2236
2208 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2209 2238
2210 return unless $self->dirty; 2239 return unless $self->dirty;
2211 2240
… …
2231 } else { 2260 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2262 }
2234} 2263}
2235 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2236sub swap_out { 2273sub swap_out {
2237 my ($self) = @_; 2274 my ($self) = @_;
2238 2275
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2277
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2247 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2249 2332
2250 $self->deactivate; 2333 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2335 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2336
2298 $self->unlink_save; 2337 $self->unlink_save;
2299 $self->destroy; 2338 $self->destroy;
2300} 2339}
2301 2340
… …
2309 2348
2310 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2311 2350
2312 $self->unlink_save; 2351 $self->unlink_save;
2313 2352
2314 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2358
… …
2549 2588
2550Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2551 2590
2552The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2555map. 2594map.
2556 2595
2557Will never block. 2596Will never block.
2558 2597
2559=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2581 my ($self) = @_; 2620 my ($self) = @_;
2582 2621
2583 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2584 2623
2624 ++$self->{_link_recursion};
2625
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2627
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2589 2630
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2632}
2592 2633
2593sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2595 2636
… …
2620 $map->load_neighbours; 2661 $map->load_neighbours;
2621 2662
2622 return unless $self->contr->active; 2663 return unless $self->contr->active;
2623 2664
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2626 2667 # entering was successful
2668 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2670 $self->activate_recursive;
2629} 2671 }
2630 2672
2673}
2674
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2676
2633Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
… …
2643 2687
2644our $GOTOGEN; 2688our $GOTOGEN;
2645 2689
2646sub cf::object::player::goto { 2690sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2648 2698
2649 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2701
2652 $self->enter_link; 2702 $self->enter_link;
… …
2676 my $map = eval { 2726 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2678 2728
2679 if ($map) { 2729 if ($map) {
2680 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2732 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2734 }
2685 2735
2686 $map 2736 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2697 } 2747 }
2698 2748
2699 $done->() if $done; 2749 $done->($self) if $done;
2700 })->prio (1); 2750 })->prio (1);
2701} 2751}
2702 2752
2703=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2704 2754
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3429
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3382 } else { 3432 } else {
3383 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3384 } 3434 }
3385 3435
3386 cf::cede_to_tick; 3436 cf::cede_to_tick;
3387 } 3437 }
3388 } 3438 }
3389 3439
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3441
3392 1 3442 1
3393} 3443}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3444
3415register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3417 3447
3418 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3487sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3460} 3490}
3461 3491
3492sub reload_sound {
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3494 or die "$DATADIR/sound $!";
3495
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3497
3498 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499 my $sound = $soundconf->{compat}[$_]
3500 or next;
3501
3502 my $face = cf::face::find "sound/$sound->[1]";
3503 cf::sound::set $sound->[0] => $face;
3504 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3505 }
3506
3507 while (my ($k, $v) = each %{$soundconf->{event}}) {
3508 my $face = cf::face::find "sound/$v";
3509 cf::sound::set $k => $face;
3510 }
3511}
3512
3462sub reload_resources { 3513sub reload_resources {
3463 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3464 3515
3465 reload_facedata; 3516 reload_facedata;
3517 reload_sound;
3466 reload_archetypes; 3518 reload_archetypes;
3467 reload_regions; 3519 reload_regions;
3468 reload_treasures; 3520 reload_treasures;
3469 3521
3470 warn "finished reloading resource files\n"; 3522 warn "finished reloading resource files\n";
… …
3477 or return; 3529 or return;
3478 3530
3479 local $/; 3531 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3532 *CFG = YAML::XS::Load scalar <$fh>;
3481 3533
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3535
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3536 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3537 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3538
3487 if (exists $CFG{mlockall}) { 3539 if (exists $CFG{mlockall}) {
… …
3528 3580
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3582 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3585
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3586 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3587
3541 # we must not ever block the main coroutine 3588 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3589 local $Coro::idle = sub {
… …
3548 }; 3595 };
3549 3596
3550 evthread_start IO::AIO::poll_fileno; 3597 evthread_start IO::AIO::poll_fileno;
3551 3598
3552 cf::sync_job { 3599 cf::sync_job {
3600 cf::init_experience;
3601 cf::init_anim;
3602 cf::init_attackmess;
3603 cf::init_dynamic;
3604
3553 cf::load_settings; 3605 cf::load_settings;
3554 cf::load_materials; 3606 cf::load_materials;
3555 3607
3556 reload_resources; 3608 reload_resources;
3557 reload_config; 3609 reload_config;
… …
3573 use POSIX (); 3625 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3626 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3627
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3628 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3629 };
3630
3631 cf::object::thawer::errors_are_fatal 0;
3632 warn "parse errors in files are no longer fatal from this point on.\n";
3578 3633
3579 main_loop; 3634 main_loop;
3580} 3635}
3581 3636
3582############################################################################# 3637#############################################################################
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3814 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3815 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3816 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3817# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3818 }
3764 warn "cleared package $pkg\n";#d#
3765} 3819}
3766 3820
3767sub do_reload_perl() { 3821sub do_reload_perl() {
3768 # can/must only be called in main 3822 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3823 if (in_main) {
3770 warn "can only reload from main coroutine"; 3824 warn "can only reload from main coroutine";
3771 return; 3825 return;
3772 } 3826 }
3773 3827
3774 return if $RELOAD++; 3828 return if $RELOAD++;

Diff Legend

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