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.345 by root, Tue Aug 28 19:30:11 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

… …
87our %CFG; 87our %CFG;
88 88
89our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 90our $RUNTIME;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
282Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
283 286
284=cut 287=cut
285 288
286our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
287 291
288sub lock_wait($) { 292sub lock_wait($) {
289 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
290 299
291 # wait for lock, if any 300 # wait for lock, if any
292 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 303 Coro::schedule;
… …
300 309
301 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
302 lock_wait $key; 311 lock_wait $key;
303 312
304 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
305 315
306 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
309 } 320 }
310} 321}
311 322
… …
478sub fork_call(&@) { 489sub fork_call(&@) {
479 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
480 491
481 # we seemingly have to make a local copy of the whole thing, 492 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 493 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 494 # TODO: investigate and fix (likely this will be rather laborious)
484 495
485 my @res = Coro::Util::fork_eval { 496 my @res = Coro::Util::fork_eval {
486 reset_signals; 497 reset_signals;
487 &$cb 498 &$cb
488 }, @args; 499 }, @args;
… …
575 if (1) { 586 if (1) {
576 $md5 = 587 $md5 =
577 join "\x00", 588 join "\x00",
578 $processversion, 589 $processversion,
579 map { 590 map {
580 Coro::cede; 591 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 593 } 0.. $#$src;
583 594
584 595
585 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1001 }, 1012 },
1002); 1013);
1003 1014
1004sub object_freezer_save { 1015sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1006 1019
1007 sync_job { 1020 sync_job {
1008 if (length $$rdata) { 1021 if (length $$rdata) {
1009 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1034 } 1047 }
1035 } else { 1048 } else {
1036 aio_unlink $filename; 1049 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1038 } 1051 }
1039 } 1052 };
1053
1054 undef $guard;
1040} 1055}
1041 1056
1042sub object_freezer_as_string { 1057sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1044 1059
… …
1049 1064
1050sub object_thawer_load { 1065sub object_thawer_load {
1051 my ($filename) = @_; 1066 my ($filename) = @_;
1052 1067
1053 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1054 1071
1055 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1056 or return; 1073 or return;
1057 1074
1058 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1077 or return;
1078
1079 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1081 }
1063 1082
1064 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1066 return ($data, $av); 1086 ($data, $av)
1067} 1087}
1068 1088
1069=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1070 1090
1071=over 4 1091=over 4
… …
1257 1277
1258=head3 cf::player 1278=head3 cf::player
1259 1279
1260=over 4 1280=over 4
1261 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1262=item cf::player::find $login 1296=item cf::player::find $login
1263 1297
1264Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1265 1299
1266=cut 1300=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1339
1306 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1309 } 1349 }
1310 } 1350 }
1311} 1351}
1312 1352
… …
1322 1362
1323 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1325 1365
1326 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1327 Coro::cede; 1367 cf::cede_to_tick;
1328} 1368}
1329 1369
1330sub new($) { 1370sub new($) {
1331 my ($login) = @_; 1371 my ($login) = @_;
1332 1372
… …
1410 or return []; 1450 or return [];
1411 1451
1412 my @logins; 1452 my @logins;
1413 1453
1414 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1418 1463
1419 utf8::decode $login; 1464 utf8::decode $login;
1420 push @logins, $login; 1465 push @logins, $login;
1421 } 1466 }
1422 1467
… …
1460sub expand_cfpod { 1505sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1462 1507
1463 # escape & and < 1508 # escape & and <
1464 s/&/&amp;/g; 1509 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1466 1511
1467 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1468 1513
1469 1 while 1514 1 while
1470 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1520 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1477 }ge 1523 }ge
1478 # replace H<hint text> 1524 # replace H<hint text>
… …
1746 1792
1747sub load_header_from($) { 1793sub load_header_from($) {
1748 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1749 1795
1750 utf8::encode $path; 1796 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1756 1805
1757 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1758 1807
1759 1 1808 1
1760} 1809}
… …
1814sub find { 1863sub find {
1815 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1816 1865
1817 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1818 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1820 1870
1821 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1823 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1824 or return; 1876 or return;
1825 1877
1826 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1827 1879
… …
1829 or return; 1881 or return;
1830 1882
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1834 $map->reset; 1888 $map->reset;
1835 undef $guard;
1836 return find $path; 1889 return find $path;
1837 } 1890 }
1838 1891
1839 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1840 } 1893 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1850 1903
1851 my $path = $self->{path}; 1904 my $path = $self->{path};
1852 1905
1853 { 1906 {
1854 my $guard1 = cf::lock_acquire "map_data:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1855 my $guard2 = cf::lock_acquire "map_load:$path";
1856 1908
1909 return unless $self->valid;
1857 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1858 1911
1859 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1860 1913
1861 $self->alloc; 1914 $self->alloc;
1862 1915
1863 $self->pre_load; 1916 $self->pre_load;
1864 Coro::cede; 1917 cf::cede_to_tick;
1865 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1866 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1867 or return; 1922 or return;
1868 1923
1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1870 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1871 1926
1872 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1873 utf8::encode $uniq; 1928 utf8::encode $uniq;
1874 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1875 $self->clear_unique_items; 1931 $self->clear_unique_items;
1876 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1877 } 1935 }
1878 } 1936 }
1879 1937
1880 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1881 # now do the right thing for maps 1941 # now do the right thing for maps
1882 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1883 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1884 unless $self->difficulty; 1944 unless $self->difficulty;
1885 Coro::cede; 1945 cf::cede_to_tick;
1886 1946
1887 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1888 $self->decay_objects; 1948 $self->decay_objects;
1889 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1890 $self->update_buttons; 1950 $self->update_buttons;
1891 Coro::cede; 1951 cf::cede_to_tick;
1892 $self->set_darkness_map; 1952 $self->set_darkness_map;
1893 Coro::cede; 1953 cf::cede_to_tick;
1894 $self->activate; 1954 $self->activate;
1895 } 1955 }
1896 1956
1897 $self->{last_save} = $cf::RUNTIME; 1957 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME); 1958 $self->last_access ($cf::RUNTIME);
… …
2027 2087
2028 return if $self->players; 2088 return if $self->players;
2029 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2030 return if $self->{deny_save}; 2090 return if $self->{deny_save};
2031 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
2032 $self->clear; 2096 $self->clear;
2033 $self->in_memory (cf::MAP_SWAPPED);
2034} 2097}
2035 2098
2036sub reset_at { 2099sub reset_at {
2037 my ($self) = @_; 2100 my ($self) = @_;
2038 2101
… …
2070 if $uniq; 2133 if $uniq;
2071 } 2134 }
2072 2135
2073 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2074 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2075 $self->clear; 2140 $self->clear;
2076
2077 $_->clear_links_to ($self) for values %cf::MAP;
2078 2141
2079 $self->unlink_save; 2142 $self->unlink_save;
2080 $self->destroy; 2143 $self->destroy;
2081} 2144}
2082 2145
2083my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2084 2147
2085sub nuke { 2148sub nuke {
2086 my ($self) = @_; 2149 my ($self) = @_;
2087 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2088 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2089 2155
2090 $self->unlink_save; 2156 $self->unlink_save;
2091 2157
2092 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2093 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2094 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2095 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2096 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2097 2163
2098 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2099 2166
2100 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2101} 2168}
2102 2169
2103=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2179 2246
2180sub inv_recursive { 2247sub inv_recursive {
2181 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2182} 2249}
2183 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2184package cf; 2282package cf;
2185 2283
2186=back 2284=back
2187 2285
2188=head3 cf::object::player 2286=head3 cf::object::player
… …
2497the message, with C<log> being the default. If C<$color> is negative, suppress 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2499 2597
2500=cut 2598=cut
2501 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2502sub cf::client::send_msg { 2615sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2504 2617
2505 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2506 2619
2507 $color &= cf::NDI_CLIENT_MASK; # just in case... 2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2508 2624
2509 if (ref $channel) { 2625 if (ref $channel) {
2510 # send meta info to client, if not yet sent 2626 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) { 2627 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel; 2628 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel); 2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2514 } 2631 }
2515 2632
2516 $channel = $channel->{id}; 2633 $channel = $channel->{id};
2517 } 2634 }
2518 2635
… …
2833# the server's init and main functions 2950# the server's init and main functions
2834 2951
2835sub load_facedata($) { 2952sub load_facedata($) {
2836 my ($path) = @_; 2953 my ($path) = @_;
2837 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed; 2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2960
2840 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2841 2962
2842 my $facedata; 2963 my $facedata;
… …
2953 $ns->fx_want ($k, $v); 3074 $ns->fx_want ($k, $v);
2954 } 3075 }
2955}; 3076};
2956 3077
2957sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2958 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2960 3085
2961 for (cf::region::list) { 3086 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
3334 or die; 3459 or die;
3335 3460
3336 $map->width (50); 3461 $map->width (50);
3337 $map->height (50); 3462 $map->height (50);
3338 $map->alloc; 3463 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3340 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3341 3466
3342 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3343 if ($t < $min) { 3468 if ($t < $min) {
3344 $min = $t; 3469 $min = $t;

Diff Legend

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