[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.571 by root, Wed May 4 19:04:45 2011 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		117
113	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
114		119
115	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
117		122
118	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
129	our $DB_ENV;	134	our $DB_ENV;
130		135
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		137
133	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		140
135	our $UPTIME; $UPTIME \|\|= time;	141	our $UPTIME; $UPTIME \|\|= time;
136	our $RUNTIME = 0;	142	our $RUNTIME = 0;
137	our $SERVER_TICK = 0;	143	our $SERVER_TICK = 0;
138	our $NOW;	144	our $NOW;
…		…
219	=item $cf::RUNTIME	225	=item $cf::RUNTIME
220		226
221	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
222	every server tick.	228	every server tick.
223		229
224	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227		233
228	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
231	database environment.	237	database environment.
…		…
245	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
246	from wherever your confdir points to.	252	from wherever your confdir points to.
247		253
248	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
249		255
250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
251	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
253		260
254	Note that cf::Wait_for_tick will immediately return when the server is not	261	Note that cf::wait_for_tick will immediately return when the server is not
255	ticking, making it suitable for small pauses in threads that need to run	262	ticking, making it suitable for small pauses in threads that need to run
256	when the server is paused. If that is not applicable (i.e. you I<really>	263	when the server is paused. If that is not applicable (i.e. you I<really>
257	want to wait, use C<$cf::WAIT_FOR_TICK>).	264	want to wait, use C<$cf::WAIT_FOR_TICK>).
258		265
259	=item $cf::WAIT_FOR_TICK	266	=item $cf::WAIT_FOR_TICK
…		…
335	)) {	342	)) {
336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337	}	344	}
338		345
339	$EV::DIED = sub {	346	$EV::DIED = sub {
340	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
341	};	348	};
342		349
343	#############################################################################	350	#############################################################################
344		351
345	sub fork_call(&@);	352	sub fork_call(&@);
…		…
372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
373	$d	380	$d
374	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
375	}	382	}
376		383
377	=item $scalar = load_file $path	384	=item $scalar = cf::load_file $path
378		385
379	Loads the given file from path and returns its contents. Croaks on error	386	Loads the given file from path and returns its contents. Croaks on error
380	and can block.	387	and can block.
381		388
382	=cut	389	=cut
…		…
384	sub load_file($) {	391	sub load_file($) {
385	0 <= aio_load $_[0], my $data	392	0 <= aio_load $_[0], my $data
386	or Carp::croak "$_[0]: $!";	393	or Carp::croak "$_[0]: $!";
387		394
388	$data	395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
389	}	434	}
390		435
391	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
392		437
393	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
…		…
856		901
857	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
858	}	903	}
859	}	904	}
860		905
861	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
862	my $data = $process->(\@data);	907	my $data = $process->(\@data);
863	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
864		909
865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866		911
867	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
868	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
…		…
1388	=cut	1433	=cut
1389		1434
1390	#############################################################################	1435	#############################################################################
1391	# command handling &c	1436	# command handling &c
1392		1437
1393	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1394		1439
1395	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1396	$name.	1441	$name.
1397		1442
1398	=cut	1443	=cut
…		…
1404	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1405		1450
1406	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1407	}	1452	}
1408		1453
1409	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1410		1455
1411	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1412	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1413	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1414	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1415	has logged in successfully.	1460	has logged in successfully.
1416		1461
1417	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1418	called.
1419		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1420	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1421		1470
1422	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1423	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1424	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1425	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1426	log-in.	1475	log-in.
1427		1476
1428	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1429	called.
1430		1478
1431	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1433	sub register_extcmd {	1486	sub register_extcmd($$) {
1434	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1435		1488
1436	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1437	}	1490	}
1438		1491
1439	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1440	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1441		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1442	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1443	}	1508	}
1444		1509
1445	use File::Glob ();	1510	use File::Glob ();
1446		1511
1447	cf::player->attach (	1512	cf::player->attach (
…		…
1461	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1462		1527
1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464		1529
1465	if (ref $msg) {	1530	if (ref $msg) {
1466	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467	"ARRAY" eq ref $msg
1468	? @$msg
1469	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470		1532
1471	my @reply;
1472
1473	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1474	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1475	}	1551	}
1476
1477	$pl->ext_reply ($reply, @reply)
1478	if $reply;
1479		1552
1480	} else {	1553	} else {
1481	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482	}	1555	}
1483		1556
…		…
1496	};	1569	};
1497		1570
1498	$grp	1571	$grp
1499	}	1572	}
1500		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1501	sub load_extensions {	1585	sub load_extensions {
1502	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1503		1589
1504	cf::sync_job {	1590	cf::sync_job {
1505	my %todo;	1591	my %todo;
1506		1592
1507	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1550	unless exists $done{$_};	1636	unless exists $done{$_};
1551	}	1637	}
1552		1638
1553	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1555	my $active = eval $v->{source};	1650	my $active = eval $source;
1556		1651
1557	if (length $@) {	1652	if (length $@) {
1558	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1559		1654
1560	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1847	}	1942	}
1848		1943
1849	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850		1945
1851	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1852
1853	=item $player->ext_reply ($msgid, @msg)
1854
1855	Sends an ext reply to the player.
1856
1857	=cut
1858
1859	sub ext_reply($$@) {
1860	my ($self, $id, @msg) = @_;
1861
1862	$self->ns->ext_reply ($id, @msg)
1863	}
1864		1947
1865	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1866		1949
1867	Sends an ext event to the client.	1950	Sends an ext event to the client.
1868		1951
…		…
2239		2322
2240	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2241	$self->decay_objects;	2324	$self->decay_objects;
2242	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2243	$self->update_buttons;	2326	$self->update_buttons;
2244	$self->post_load_physics;
2245	cf::cede_to_tick;	2327	cf::cede_to_tick;
2246	#$self->activate; # no longer activate maps automatically	2328	#$self->activate; # no longer activate maps automatically
2247	}	2329	}
2248		2330
2249	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
…		…
2268	# if $self->per_party;	2350	# if $self->per_party;
2269		2351
2270	$self	2352	$self
2271	}	2353	}
2272		2354
2273	# find and load all maps in the 3x3 area around a map
2274	sub load_neighbours {
2275	my ($map) = @_;
2276
2277	my @neigh; # diagonal neighbours
2278
2279	for (0 .. 3) {
2280	my $neigh = $map->tile_path ($_)
2281	or next;
2282	$neigh = find $neigh, $map
2283	or next;
2284	$neigh->load;
2285
2286	# now find the diagonal neighbours
2287	push @neigh,
2288	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2289	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2290	}
2291
2292	for (grep defined $_->[0], @neigh) {
2293	my ($path, $origin) = @$_;
2294	my $neigh = find $path, $origin
2295	or next;
2296	$neigh->load;
2297	}
2298	}
2299
2300	sub find_sync {	2355	sub find_sync {
2301	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2302		2357
2303	# it's a bug to call this from the main context	2358	# it's a bug to call this from the main context
2304	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
…		…
2322		2377
2323	sub find_async {	2378	sub find_async {
2324	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2325		2380
2326	$path = normalise $path, $origin;	2381	$path = normalise $path, $origin;
2327		2382
2328	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2329	return $map if !$load \|\| $map->linkable;	2384	return $map if !$load \|\| $map->linkable;
2330	}	2385	}
2331		2386
2332	$MAP_PREFETCH{$path} \|= $load;	2387	$MAP_PREFETCH{$path} \|= $load;
…		…
2599		2654
2600	Creates and returns a persistent reference to an object that can be stored as a string.	2655	Creates and returns a persistent reference to an object that can be stored as a string.
2601		2656
2602	=item $ob = cf::object::deref ($refstring)	2657	=item $ob = cf::object::deref ($refstring)
2603		2658
2604	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2659	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2605	even if the object actually exists. May block.	2660	even if the object actually exists. May block.
2606		2661
2607	=cut	2662	=cut
2608		2663
2609	sub deref {	2664	sub deref {
…		…
2776	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2777	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2778	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2779		2834
2780	$map->load;	2835	$map->load;
2781	$map->load_neighbours;
2782		2836
2783	return unless $self->contr->active;	2837	return unless $self->contr->active;
2784		2838
2785	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2786	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
3202	=cut	3256	=cut
3203		3257
3204	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3205	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3206		3260
3207	if ($self->extcmd == 2) {
3208	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3209	} elsif ($self->extcmd == 1) { # TODO: remove
3210	push @msg, msgtype => "event_$type";
3211	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3212	}
3213	}
3214
3215	=item $client->ext_reply ($msgid, @msg)
3216
3217	Sends an ext reply to the client.
3218
3219	=cut
3220
3221	sub cf::client::ext_reply($$@) {
3222	my ($self, $id, @msg) = @_;
3223
3224	if ($self->extcmd == 2) {
3225	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3226	} elsif ($self->extcmd == 1) {
3227	#TODO: version 1, remove
3228	unshift @msg, msgtype => "reply", msgid => $id;
3229	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3230	}
3231	}	3262	}
3232		3263
3233	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3234		3265
3235	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3290	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3291		3322
3292	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3293		3324
3294	if (ref $msg) {	3325	if (ref $msg) {
3295	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3296	"ARRAY" eq ref $msg
3297	? @$msg
3298	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3299		3327
3300	my @reply;
3301
3302	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3303	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3304	}	3346	}
3305
3306	$ns->ext_reply ($reply, @reply)
3307	if $reply;
3308
3309	} else {	3347	} else {
3310	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3311	}	3349	}
3312		3350
3313	cf::override;	3351	cf::override;
…		…
3481	=cut	3519	=cut
3482		3520
3483	#############################################################################	3521	#############################################################################
3484	# the server's init and main functions	3522	# the server's init and main functions
3485		3523
		3524	{
		3525	package cf::face;
		3526
		3527	our %HASH; # hash => idx
		3528	our @DATA; # dynamically-created facedata, only faceste 0 used
		3529	our @FOFS; # file offset, if > 0
		3530	our @SIZE; # size of face, in octets
		3531	our @META; # meta hash of face, if any
		3532	our $DATAFH; # facedata filehandle
		3533
		3534	# internal api, not finalised
		3535	sub set {
		3536	my ($name, $type, $data) = @_;
		3537
		3538	my $idx = cf::face::find $name;
		3539
		3540	if ($idx) {
		3541	delete $HASH{cf::face::get_chksum $idx};
		3542	} else {
		3543	$idx = cf::face::alloc $name;
		3544	}
		3545
		3546	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3547
		3548	cf::face::set_type $idx, $type;
		3549	cf::face::set_csum $idx, 0, $hash;
		3550
		3551	# we need to destroy the SV itself, not just modify it, as a running ix
		3552	# might hold a reference to it: "delete" achieves that.
		3553	delete $FOFS[0][$idx];
		3554	delete $DATA[0][$idx];
		3555	$DATA[0][$idx] = $data;
		3556	$SIZE[0][$idx] = length $data;
		3557	delete $META[$idx];
		3558	$HASH{$hash} = $idx;#d#
		3559
		3560	$idx
		3561	}
		3562
		3563	sub _get_data($$$) {
		3564	my ($idx, $set, $cb) = @_;
		3565
		3566	if (defined $DATA[$set][$idx]) {
		3567	$cb->($DATA[$set][$idx]);
		3568	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3569	my $size = $SIZE[$set][$idx];
		3570	my $buf;
		3571	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3572	if ($_[0] == $size) {
		3573	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3574	$cb->($buf);
		3575	} else {
		3576	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3577	}
		3578	};
		3579	} else {
		3580	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3581	}
		3582	}
		3583
		3584	# rather ineffient
		3585	sub cf::face::get_data($;$) {
		3586	my ($idx, $set) = @_;
		3587
		3588	_get_data $idx, $set, Coro::rouse_cb;
		3589	Coro::rouse_wait
		3590	}
		3591
		3592	sub cf::face::ix {
		3593	my ($ns, $set, $idx, $pri) = @_;
		3594
		3595	_get_data $idx, $set, sub {
		3596	$ns->ix_send ($idx, $pri, $_[0]);
		3597	};
		3598	}
		3599	}
		3600
3486	sub load_facedata($) {	3601	sub load_facedata($) {
3487	my ($path) = @_;	3602	my ($path) = @_;
3488		3603
3489	# HACK to clear player env face cache, we need some signal framework
3490	# for this (global event?)
3491	%ext::player_env::MUSIC_FACE_CACHE = ();
3492
3493	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3604	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3494		3605
3495	trace "loading facedata from $path\n";	3606	trace "loading facedata from $path\n";
3496		3607
3497	my $facedata = decode_storable load_file $path;	3608	my $facedata = decode_storable load_file "$path/faceinfo";
3498		3609
3499	$facedata->{version} == 2	3610	$facedata->{version} == 2
3500	or cf::cleanup "$path: version mismatch, cannot proceed.";	3611	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3501		3612
3502	# patch in the exptable	3613	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3503	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3614	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3504	$facedata->{resource}{"res/exp_table"} = {	3615
3505	type => FT_RSRC,	3616	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3506	data => $exp_table,	3617
3507	hash => (Digest::MD5::md5 $exp_table),	3618	# BEGIN ATOMIC
3508	};	3619	# from here on, everything must be atomic - no thread switch allowed
3509	cf::cede_to_tick;	3620	my $t1 = EV::time;
3510		3621
3511	{	3622	{
3512	my $faces = $facedata->{faceinfo};	3623	my $faces = $facedata->{faceinfo};
3513		3624
3514	while (my ($face, $info) = each %$faces) {	3625	for my $face (sort keys %$faces) {
		3626	my $info = $faces->{$face};
3515	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3627	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3516		3628
3517	cf::face::set_visibility $idx, $info->{visibility};	3629	cf::face::set_visibility $idx, $info->{visibility};
3518	cf::face::set_magicmap $idx, $info->{magicmap};	3630	cf::face::set_magicmap $idx, $info->{magicmap};
3519	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3631	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3520	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3632	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3521	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3633	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3522		3634	$cf::face::HASH{$info->{hash64}} = $idx;
3523	cf::cede_to_tick;	3635	delete $cf::face::META[$idx];
3524	}	3636	}
3525		3637
3526	while (my ($face, $info) = each %$faces) {	3638	while (my ($face, $info) = each %$faces) {
3527	next unless $info->{smooth};	3639	next unless $info->{smooth};
3528		3640
…		…
3533	cf::face::set_smooth $idx, $smooth;	3645	cf::face::set_smooth $idx, $smooth;
3534	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3646	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3535	} else {	3647	} else {
3536	error "smooth face '$info->{smooth}' not found for face '$face'";	3648	error "smooth face '$info->{smooth}' not found for face '$face'";
3537	}	3649	}
3538
3539	cf::cede_to_tick;
3540	}	3650	}
3541	}	3651	}
3542		3652
3543	{	3653	{
3544	my $anims = $facedata->{animinfo};	3654	my $anims = $facedata->{animinfo};
3545		3655
3546	while (my ($anim, $info) = each %$anims) {	3656	while (my ($anim, $info) = each %$anims) {
3547	cf::anim::set $anim, $info->{frames}, $info->{facings};	3657	cf::anim::set $anim, $info->{frames}, $info->{facings};
3548	cf::cede_to_tick;
3549	}	3658	}
3550		3659
3551	cf::anim::invalidate_all; # d'oh	3660	cf::anim::invalidate_all; # d'oh
3552	}	3661	}
3553		3662
3554	{	3663	{
3555	my $res = $facedata->{resource};	3664	my $res = $facedata->{resource};
3556		3665
3557	while (my ($name, $info) = each %$res) {	3666	while (my ($name, $info) = each %$res) {
3558	if (defined $info->{type}) {	3667	if (defined (my $type = $info->{type})) {
		3668	# TODO: different hash - must free and use new index, or cache ixface data queue
3559	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3669	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3560		3670
3561	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3562	cf::face::set_type $idx, $info->{type};	3671	cf::face::set_type $idx, $type;
		3672	cf::face::set_csum $idx, 0, $info->{hash};
		3673	$cf::face::SIZE[0][$idx] = $info->{size};
		3674	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3675	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3676	$cf::face::HASH{$info->{hash}} = $idx;
3563	} else {	3677	} else {
3564	$RESOURCE{$name} = $info; # unused	3678	# $RESOURCE{$name} = $info; # unused
3565	}	3679	}
3566
3567	cf::cede_to_tick;
3568	}	3680	}
3569	}	3681	}
		3682
		3683	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3684
		3685	# HACK to clear player env face cache, we need some signal framework
		3686	# for this (global event?)
		3687	%ext::player_env::MUSIC_FACE_CACHE = ();
		3688
		3689	# END ATOMIC
		3690
		3691	cf::debug "facedata atomic update time ", EV::time - $t1;
3570		3692
3571	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3693	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3694
		3695	aio_close $fh if $fh; # close old facedata
3572		3696
3573	1	3697	1
3574	}	3698	}
3575		3699
3576	register_exticmd fx_want => sub {	3700	register_exticmd fx_want => sub {
…		…
3587	my $status = load_resource_file_ $_[0];	3711	my $status = load_resource_file_ $_[0];
3588	get_slot 0.1, 100;	3712	get_slot 0.1, 100;
3589	cf::arch::commit_load;	3713	cf::arch::commit_load;
3590		3714
3591	$status	3715	$status
		3716	}
		3717
		3718	sub reload_exp_table {
		3719	_reload_exp_table;
		3720
		3721	cf::face::set
		3722	"res/exp_table" => FT_RSRC,
		3723	JSON::XS->new->utf8->canonical->encode (
		3724	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3725	);
		3726	}
		3727
		3728	sub reload_materials {
		3729	_reload_materials;
3592	}	3730	}
3593		3731
3594	sub reload_regions {	3732	sub reload_regions {
3595	# HACK to clear player env face cache, we need some signal framework	3733	# HACK to clear player env face cache, we need some signal framework
3596	# for this (global event?)	3734	# for this (global event?)
…		…
3604	if exists $_->{match};	3742	if exists $_->{match};
3605	}	3743	}
3606	}	3744	}
3607		3745
3608	sub reload_facedata {	3746	sub reload_facedata {
3609	load_facedata "$DATADIR/facedata"	3747	load_facedata $DATADIR
3610	or die "unable to load facedata\n";	3748	or die "unable to load facedata\n";
3611	}	3749	}
3612		3750
3613	sub reload_archetypes {	3751	sub reload_archetypes {
3614	load_resource_file "$DATADIR/archetypes"	3752	load_resource_file "$DATADIR/archetypes"
3615	or die "unable to load archetypes\n";	3753	or die "unable to load archetypes\n";
		3754
		3755	cf::face::set
		3756	"res/skill_info" => FT_RSRC,
		3757	JSON::XS->new->utf8->canonical->encode (
		3758	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3759	);
		3760
		3761	cf::face::set
		3762	"res/spell_paths" => FT_RSRC,
		3763	JSON::XS->new->utf8->canonical->encode (
		3764	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3765	);
3616	}	3766	}
3617		3767
3618	sub reload_treasures {	3768	sub reload_treasures {
3619	load_resource_file "$DATADIR/treasures"	3769	load_resource_file "$DATADIR/treasures"
3620	or die "unable to load treasurelists\n";	3770	or die "unable to load treasurelists\n";
…		…
3641	}	3791	}
3642		3792
3643	sub reload_resources {	3793	sub reload_resources {
3644	trace "reloading resource files...\n";	3794	trace "reloading resource files...\n";
3645		3795
3646	reload_exp_table;
3647	reload_materials;	3796	reload_materials;
3648	reload_facedata;	3797	reload_facedata;
		3798	reload_exp_table;
3649	reload_sound;	3799	reload_sound;
3650	reload_archetypes;	3800	reload_archetypes;
3651	reload_regions;	3801	reload_regions;
3652	reload_treasures;	3802	reload_treasures;
3653		3803
…		…
3705		3855
3706	sub main {	3856	sub main {
3707	cf::init_globals; # initialise logging	3857	cf::init_globals; # initialise logging
3708		3858
3709	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3859	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3710	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3860	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3711	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3861	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3712	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3862	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3713		3863
3714	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3864	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3715		3865
3716	# we must not ever block the main coroutine	3866	# we must not ever block the main coroutine
3717	local $Coro::idle = sub {	3867	$Coro::idle = sub {
3718	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3868	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3719	(async {	3869	(async {
3720	$Coro::current->{desc} = "IDLE BUG HANDLER";	3870	$Coro::current->{desc} = "IDLE BUG HANDLER";
3721	EV::loop EV::LOOP_ONESHOT;	3871	EV::loop EV::LOOP_ONESHOT;
3722	})->prio (Coro::PRIO_MAX);	3872	})->prio (Coro::PRIO_MAX);
…		…
3725	evthread_start IO::AIO::poll_fileno;	3875	evthread_start IO::AIO::poll_fileno;
3726		3876
3727	cf::sync_job {	3877	cf::sync_job {
3728	cf::incloader::init ();	3878	cf::incloader::init ();
3729		3879
		3880	db_init;
		3881
3730	cf::init_anim;	3882	cf::init_anim;
3731	cf::init_attackmess;	3883	cf::init_attackmess;
3732	cf::init_dynamic;	3884	cf::init_dynamic;
3733		3885
3734	cf::load_settings;	3886	cf::load_settings;
3735		3887
3736	reload_resources;	3888	reload_resources;
3737	reload_config;	3889	reload_config;
3738	db_init;
3739		3890
3740	cf::init_uuid;	3891	cf::init_uuid;
3741	cf::init_signals;	3892	cf::init_signals;
3742	cf::init_skills;	3893	cf::init_skills;
3743		3894
…		…
3757	};	3908	};
3758		3909
3759	cf::object::thawer::errors_are_fatal 0;	3910	cf::object::thawer::errors_are_fatal 0;
3760	info "parse errors in files are no longer fatal from this point on.\n";	3911	info "parse errors in files are no longer fatal from this point on.\n";
3761		3912
3762	my $free_main; $free_main = EV::idle sub {	3913	AE::postpone {
3763	undef $free_main;
3764	undef &main; # free gobs of memory :)	3914	undef &main; # free gobs of memory :)
3765	};	3915	};
3766		3916
3767	goto &main_loop;	3917	goto &main_loop;
3768	}	3918	}
…		…
3925		4075
3926	cf::write_runtime_sync; # external watchdog should not bark	4076	cf::write_runtime_sync; # external watchdog should not bark
3927		4077
3928	trace "emergency_perl_save: flushing outstanding aio requests";	4078	trace "emergency_perl_save: flushing outstanding aio requests";
3929	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4079	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3930	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4080	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931	}	4081	}
3932		4082
3933	cf::write_runtime_sync; # external watchdog should not bark	4083	cf::write_runtime_sync; # external watchdog should not bark
3934	};	4084	};
3935		4085
…		…
4169	}	4319	}
4170	}	4320	}
4171		4321
4172	{	4322	{
4173	# configure BDB	4323	# configure BDB
		4324	info "initialising database";
4174		4325
4175	BDB::min_parallel 16;	4326	BDB::min_parallel 16;
4176	BDB::max_poll_reqs $TICK * 0.1;	4327	BDB::max_poll_reqs $TICK * 0.1;
4177	$AnyEvent::BDB::WATCHER->priority (1);	4328	#$AnyEvent::BDB::WATCHER->priority (1);
4178		4329
4179	unless ($DB_ENV) {	4330	unless ($DB_ENV) {
4180	$DB_ENV = BDB::db_env_create;	4331	$DB_ENV = BDB::db_env_create;
4181	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4332	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4182	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4333	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4207	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4358	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4208	};	4359	};
4209	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4360	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4210	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4361	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4211	};	4362	};
		4363
		4364	info "database initialised";
4212	}	4365	}
4213		4366
4214	{	4367	{
4215	# configure IO::AIO	4368	# configure IO::AIO
4216		4369
		4370	info "initialising aio";
4217	IO::AIO::min_parallel 8;	4371	IO::AIO::min_parallel 8;
4218	IO::AIO::max_poll_time $TICK * 0.1;	4372	IO::AIO::max_poll_time $TICK * 0.1;
4219	undef $AnyEvent::AIO::WATCHER;	4373	undef $AnyEvent::AIO::WATCHER;
		4374	info "aio initialised";
4220	}	4375	}
4221		4376
4222	our $_log_backtrace;	4377	our $_log_backtrace;
4223	our $_log_backtrace_last;	4378	our $_log_backtrace_last;
4224		4379

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.571 by root, Wed May 4 19:04:45 2011 UTC vs. Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.571 by root, Wed May 4 19:04:45 2011 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC