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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.359 by root, Sat Sep 8 18:15:55 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
83	our %CFG;	87	our %CFG;
84		88
85	our $UPTIME; $UPTIME \|\|= time;	89	our $UPTIME; $UPTIME \|\|= time;
86	our $RUNTIME;	90	our $RUNTIME;
87		91
88	our %PLAYER; # all users	92	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	93	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	94	our $LINK_MAP; # the special {link} map, which is always available
91		95
92	# 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 ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		98
…		…
163	=item cf::wait_for_tick, cf::wait_for_tick_begin	167	=item cf::wait_for_tick, cf::wait_for_tick_begin
164		168
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166	returns directly I<after> the tick processing (and consequently, can only wake one process	170	returns directly I<after> the tick processing (and consequently, can only wake one process
167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	171	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		172
		173	=item @cf::INVOKE_RESULTS
		174
		175	This array contains the results of the last C<invoke ()> call. When
		176	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		177	that call.
168		178
169	=back	179	=back
170		180
171	=cut	181	=cut
172		182
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	247	$d
238	} \|\| "[unable to dump $_[0]: '$@']";	248	} \|\| "[unable to dump $_[0]: '$@']";
239	}	249	}
240		250
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
244		252
245	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
246		254
247	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
248		256
249	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
		258
		259	=cut
		260
		261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		262
		263	sub to_json ($) { $json_coder->encode ($_[0]) }
		264	sub from_json ($) { $json_coder->decode ($_[0]) }
250		265
251	=item cf::lock_wait $string	266	=item cf::lock_wait $string
252		267
253	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
254		269
…		…
257	Wait until the given lock is available and then acquires it and returns	272	Wait until the given lock is available and then acquires it and returns
258	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
260	returned.	275	returned.
261		276
		277	Locks are not recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
262	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
264		282
265	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
266		284
267	Return true if the lock is currently active, i.e. somebody has locked it.	285	Return true if the lock is currently active, i.e. somebody has locked it.
268		286
269	=cut	287	=cut
270		288
271	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
272		291
273	sub lock_wait($) {	292	sub lock_wait($) {
274	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#
275		299
276	# wait for lock, if any	300	# wait for lock, if any
277	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	303	Coro::schedule;
…		…
285		309
286	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
287	lock_wait $key;	311	lock_wait $key;
288		312
289	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
290		315
291	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
294	}	320	}
295	}	321	}
296		322
…		…
306	my $guard = Coro::guard {	332	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	333	$TICK_WATCHER->start;
308	};	334	};
309	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
310	$guard	336	$guard
		337	}
		338
		339	=item cf::get_slot $time[, $priority[, $name]]
		340
		341	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		342	This call blocks and returns only when you have at least C<$time> seconds
		343	of cpu time till the next tick. The slot is only valid till the next cede.
		344
		345	The optional C<$name> can be used to identify the job to run. It might be
		346	used for statistical purposes and should identify the same time-class.
		347
		348	Useful for short background jobs.
		349
		350	=cut
		351
		352	our @SLOT_QUEUE;
		353	our $SLOT_QUEUE;
		354
		355	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		356	$SLOT_QUEUE = Coro::async {
		357	my $signal = new Coro::Signal;
		358
		359	while () {
		360	next_job:
		361	my $avail = cf::till_tick;
		362	if ($avail > 0.01) {
		363	for (0 .. $#SLOT_QUEUE) {
		364	if ($SLOT_QUEUE[$_][0] < $avail) {
		365	my $job = splice @SLOT_QUEUE, $_, 1, ();
		366	$job->[2]->send;
		367	Coro::cede;
		368	goto next_job;
		369	}
		370	}
		371	}
		372
		373	if (@SLOT_QUEUE) {
		374	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		375	push @cf::WAIT_FOR_TICK, $signal;
		376	$signal->wait;
		377	} else {
		378	Coro::schedule;
		379	}
		380	}
		381	};
		382
		383	sub get_slot($;$$) {
		384	my ($time, $pri, $name) = @_;
		385
		386	$time = $TICK * .6 if $time > $TICK * .6;
		387	my $sig = new Coro::Signal;
		388
		389	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		390	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		391	$SLOT_QUEUE->ready;
		392	$sig->wait;
311	}	393	}
312		394
313	=item cf::async { BLOCK }	395	=item cf::async { BLOCK }
314		396
315	Currently the same as Coro::async_pool, meaning you cannot use	397	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	487	=cut
406		488
407	sub fork_call(&@) {	489	sub fork_call(&@) {
408	my ($cb, @args) = @_;	490	my ($cb, @args) = @_;
409		491
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	492	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	493	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	494	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		495
415	if (my $pid = fork) {	496	my @res = Coro::Util::fork_eval {
416	close $fh2;
417
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419	$res = Coro::Storable::thaw $res;
420
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423	die $$res unless "ARRAY" eq ref $res;
424
425	return wantarray ? @$res : $res->[-1];
426	} else {
427	reset_signals;	497	reset_signals;
428	local $SIG{__WARN__};	498	&$cb
429	local $SIG{__DIE__};	499	}, @args;
430	eval {
431	close $fh1;
432		500
433	my @res = eval { $cb->(@args) };	501	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	502	}
441		503
442	=item $value = cf::db_get $family => $key	504	=item $value = cf::db_get $family => $key
443		505
444	Returns a single value from the environment database.	506	Returns a single value from the environment database.
…		…
524	if (1) {	586	if (1) {
525	$md5 =	587	$md5 =
526	join "\x00",	588	join "\x00",
527	$processversion,	589	$processversion,
528	map {	590	map {
529	Coro::cede;	591	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	592	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	593	} 0.. $#$src;
532		594
533		595
534	my $dbmd5 = db_get cache => "$id/md5";	596	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	902	";
841	die if $@;	903	die if $@;
842	}	904	}
843		905
844	our $override;	906	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	907	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		908
847	sub override {	909	sub override {
848	$override = 1;	910	$override = 1;
849	@invoke_results = ();	911	@INVOKE_RESULTS = (@_);
850	}	912	}
851		913
852	sub do_invoke {	914	sub do_invoke {
853	my $event = shift;	915	my $event = shift;
854	my $callbacks = shift;	916	my $callbacks = shift;
855		917
856	@invoke_results = ();	918	@INVOKE_RESULTS = ();
857		919
858	local $override;	920	local $override;
859		921
860	for (@$callbacks) {	922	for (@$callbacks) {
861	eval { &{$_->[1]} };	923	eval { &{$_->[1]} };
…		…
878		940
879	Generate an object-specific event with the given arguments.	941	Generate an object-specific event with the given arguments.
880		942
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	943	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882	removed in future versions), and there is no public API to access override	944	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	945	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		946
885	=back	947	=back
886		948
887	=cut	949	=cut
888		950
889	#############################################################################	951	#############################################################################
890	# object support	952	# object support
		953	#
		954
		955	sub _can_merge {
		956	my ($ob1, $ob2) = @_;
		957
		958	local $Storable::canonical = 1;
		959	my $fob1 = Storable::freeze $ob1;
		960	my $fob2 = Storable::freeze $ob2;
		961
		962	$fob1 eq $fob2
		963	}
891		964
892	sub reattach {	965	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	966	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	967	my ($obj) = @_;
895		968
…		…
939	},	1012	},
940	);	1013	);
941		1014
942	sub object_freezer_save {	1015	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1016	my ($filename, $rdata, $objs) = @_;
		1017
		1018	my $guard = cf::lock_acquire "io";
944		1019
945	sync_job {	1020	sync_job {
946	if (length $$rdata) {	1021	if (length $$rdata) {
947	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1023	$filename, length $$rdata, scalar @$objs;
…		…
972	}	1047	}
973	} else {	1048	} else {
974	aio_unlink $filename;	1049	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1050	aio_unlink "$filename.pst";
976	}	1051	}
977	}	1052	};
		1053
		1054	undef $guard;
978	}	1055	}
979		1056
980	sub object_freezer_as_string {	1057	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1058	my ($rdata, $objs) = @_;
982		1059
…		…
987		1064
988	sub object_thawer_load {	1065	sub object_thawer_load {
989	my ($filename) = @_;	1066	my ($filename) = @_;
990		1067
991	my ($data, $av);	1068	my ($data, $av);
		1069
		1070	my $guard = cf::lock_acquire "io";
992		1071
993	(aio_load $filename, $data) >= 0	1072	(aio_load $filename, $data) >= 0
994	or return;	1073	or return;
995		1074
996	unless (aio_stat "$filename.pst") {	1075	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1076	(aio_load "$filename.pst", $av) >= 0
998	or return;	1077	or return;
		1078
		1079	undef $guard;
999	$av = eval { (Storable::thaw $av)->{objs} };	1080	$av = eval { (Storable::thaw $av)->{objs} };
1000	}	1081	}
1001		1082
1002	warn sprintf "loading %s (%d)\n",	1083	warn sprintf "loading %s (%d)\n",
1003	$filename, length $data, scalar @{$av \|\| []};	1084	$filename, length $data, scalar @{$av \|\| []};
		1085
1004	return ($data, $av);	1086	($data, $av)
1005	}	1087	}
1006		1088
1007	=head2 COMMAND CALLBACKS	1089	=head2 COMMAND CALLBACKS
1008		1090
1009	=over 4	1091	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1111	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1112	}
1031		1113
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1114	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1115
1034	Register a callback fro execution when the client sends an extcmd packet.	1116	Register a callback for execution when the client sends an (synchronous)
		1117	extcmd packet. Ext commands will be processed in the order they are
		1118	received by the server, like other user commands. The first argument is
		1119	the logged-in player. Ext commands can only be processed after a player
		1120	has logged in successfully.
1035		1121
1036	If the callback returns something, it is sent back as if reply was being	1122	If the callback returns something, it is sent back as if reply was being
1037	called.	1123	called.
1038		1124
		1125	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1126
		1127	Register a callback for execution when the client sends an (asynchronous)
		1128	exticmd packet. Exti commands are processed by the server as soon as they
		1129	are received, i.e. out of order w.r.t. other commands. The first argument
		1130	is a client socket. Exti commands can be received anytime, even before
		1131	log-in.
		1132
		1133	If the callback returns something, it is sent back as if reply was being
		1134	called.
		1135
1039	=cut	1136	=cut
1040		1137
1041	sub register_extcmd {	1138	sub register_extcmd {
1042	my ($name, $cb) = @_;	1139	my ($name, $cb) = @_;
1043		1140
1044	$EXTCMD{$name} = $cb;	1141	$EXTCMD{$name} = $cb;
		1142	}
		1143
		1144	sub register_exticmd {
		1145	my ($name, $cb) = @_;
		1146
		1147	$EXTICMD{$name} = $cb;
1045	}	1148	}
1046		1149
1047	cf::player->attach (	1150	cf::player->attach (
1048	on_command => sub {	1151	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1152	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1161	cf::override;
1059	},	1162	},
1060	on_extcmd => sub {	1163	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1164	my ($pl, $buf) = @_;
1062		1165
1063	my $msg = eval { from_json $buf };	1166	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1167
1065	if (ref $msg) {	1168	if (ref $msg) {
		1169	my ($type, $reply, @payload) =
		1170	"ARRAY" eq ref $msg
		1171	? @$msg
		1172	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1173
		1174	my @reply;
		1175
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1176	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1177	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1178	}
		1179
		1180	$pl->ext_reply ($reply, @reply)
		1181	if $reply;
		1182
1071	} else {	1183	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1184	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1185	}
1074		1186
1075	cf::override;	1187	cf::override;
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1321	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1322	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1323	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1324	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1325
1214	my $pl = load_pl path $login	1326	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1327	or return;
		1328
		1329	$f->next;
		1330	my $pl = cf::player::load_pl $f
		1331	or return;
		1332	local $cf::PLAYER_LOADING{$login} = $pl;
		1333	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1334	$cf::PLAYER{$login} = $pl
1217	}	1335	}
1218	}	1336	}
1219	}	1337	}
1220		1338
…		…
1230		1348
1231	aio_mkdir playerdir $pl, 0770;	1349	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1350	$pl->{last_save} = $cf::RUNTIME;
1233		1351
1234	$pl->save_pl ($path);	1352	$pl->save_pl ($path);
1235	Coro::cede;	1353	cf::cede_to_tick;
1236	}	1354	}
1237		1355
1238	sub new($) {	1356	sub new($) {
1239	my ($login) = @_;	1357	my ($login) = @_;
1240		1358
…		…
1244	$self->{deny_save} = 1;	1362	$self->{deny_save} = 1;
1245		1363
1246	$cf::PLAYER{$login} = $self;	1364	$cf::PLAYER{$login} = $self;
1247		1365
1248	$self	1366	$self
		1367	}
		1368
		1369	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1370
		1371	=cut
		1372
		1373	sub send_msg {
		1374	my $ns = shift->ns
		1375	or return;
		1376	$ns->send_msg (@_);
1249	}	1377	}
1250		1378
1251	=item $pl->quit_character	1379	=item $pl->quit_character
1252		1380
1253	Nukes the player without looking back. If logged in, the connection will	1381	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1436	or return [];
1309		1437
1310	my @logins;	1438	my @logins;
1311		1439
1312	for my $login (@$dirs) {	1440	for my $login (@$dirs) {
		1441	my $path = path $login;
		1442
		1443	# a .pst is a dead give-away for a valid player
		1444	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1445	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1446	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1447	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1448	}
1316		1449
1317	utf8::decode $login;	1450	utf8::decode $login;
1318	push @logins, $login;	1451	push @logins, $login;
1319	}	1452	}
1320		1453
…		…
1358	sub expand_cfpod {	1491	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1492	((my $self), (local $_)) = @_;
1360		1493
1361	# escape & and <	1494	# escape & and <
1362	s/&/&/g;	1495	s/&/&/g;
1363	s/(?<![BIUGH])</</g;	1496	s/(?<![BIUGHT])</</g;
1364		1497
1365	# this is buggy, it needs to properly take care of nested <'s	1498	# this is buggy, it needs to properly take care of nested <'s
1366		1499
1367	1 while	1500	1 while
1368	# replace B<>, I<>, U<> etc.	1501	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1502	s/B<([^\>]*)>/<b>$1<\/b>/
1370	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1503	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1371	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1504	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1505	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male\|female> tags	1506	# replace G<male\|female> tags
1373	\|\| s{G<([^>\|])\\|([^>])>}{	1507	\|\| s{G<([^>\|])\\|([^>])>}{
1374	$self->gender ? $2 : $1	1508	$self->gender ? $2 : $1
1375	}ge	1509	}ge
1376	# replace H<hint text>	1510	# replace H<hint text>
1377	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1511	\|\| s{H<([^\>]*)>}
		1512	{
		1513	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1514	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1515	"")
		1516	[$self->{hintmode}]
		1517	}ge;
1378		1518
1379	# create single paragraphs (very hackish)	1519	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1520	s/(?<=\S)\n(?=\w)/ /g;
1381		1521
		1522	# compress some whitespace
		1523	s/\s+\n/\n/g; # ws line-ends
		1524	s/\n\n+/\n/g; # double lines
		1525	s/^\n+//; # beginning lines
		1526	s/\n+$//; # ending lines
		1527
1382	$_	1528	$_
1383	}	1529	}
1384		1530
		1531	sub hintmode {
		1532	$_[0]{hintmode} = $_[1] if @_ > 1;
		1533	$_[0]{hintmode}
		1534	}
		1535
1385	=item $player->ext_reply ($msgid, %msg)	1536	=item $player->ext_reply ($msgid, @msg)
1386		1537
1387	Sends an ext reply to the player.	1538	Sends an ext reply to the player.
1388		1539
1389	=cut	1540	=cut
1390		1541
1391	sub ext_reply($$%) {	1542	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1543	my ($self, $id, @msg) = @_;
1393		1544
1394	$msg{msgid} = $id;	1545	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1546	}
1398		1547
1399	=item $player->ext_event ($type, %msg)	1548	=item $player->ext_msg ($type, @msg)
1400		1549
1401	Sends an ext event to the client.	1550	Sends an ext event to the client.
1402		1551
1403	=cut	1552	=cut
1404		1553
1405	sub ext_event($$%) {	1554	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1555	my ($self, $type, @msg) = @_;
1407		1556
1408	$self->ns->ext_event ($type, %msg);	1557	$self->ns->ext_msg ($type, @msg);
1409	}	1558	}
1410		1559
1411	=head3 cf::region	1560	=head3 cf::region
1412		1561
1413	=over 4	1562	=over 4
…		…
1426	my ($path) = @_;	1575	my ($path) = @_;
1427		1576
1428	my ($match, $specificity);	1577	my ($match, $specificity);
1429		1578
1430	for my $region (list) {	1579	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1580	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1581	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1582	if $region->specificity > $specificity;
1434	}	1583	}
1435	}	1584	}
1436		1585
…		…
1556	$self->init; # pass $1 etc.	1705	$self->init; # pass $1 etc.
1557	return $self;	1706	return $self;
1558	}	1707	}
1559	}	1708	}
1560		1709
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1710	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1711	()
1563	}	1712	}
1564		1713
1565	sub init {	1714	sub init {
1566	my ($self) = @_;	1715	my ($self) = @_;
…		…
1629		1778
1630	sub load_header_from($) {	1779	sub load_header_from($) {
1631	my ($self, $path) = @_;	1780	my ($self, $path) = @_;
1632		1781
1633	utf8::encode $path;	1782	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1783	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1784	or return;
		1785
		1786	$self->_load_header ($f)
		1787	or return;
		1788
		1789	local $MAP_LOADING{$self->{path}} = $self;
		1790	$f->resolve_delayed_derefs;
1639		1791
1640	$self->{load_path} = $path;	1792	$self->{load_path} = $path;
1641		1793
1642	1	1794	1
1643	}	1795	}
…		…
1697	sub find {	1849	sub find {
1698	my ($path, $origin) = @_;	1850	my ($path, $origin) = @_;
1699		1851
1700	$path = normalise $path, $origin && $origin->path;	1852	$path = normalise $path, $origin && $origin->path;
1701		1853
		1854	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1855	cf::lock_wait "map_find:$path";
1703		1856
1704	$cf::MAP{$path} \|\| do {	1857	$cf::MAP{$path} \|\| do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1858	my $guard1 = cf::lock_acquire "map_find:$path";
		1859	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1860
1706	my $map = new_from_path cf::map $path	1861	my $map = new_from_path cf::map $path
1707	or return;	1862	or return;
1708		1863
1709	$map->{last_save} = $cf::RUNTIME;	1864	$map->{last_save} = $cf::RUNTIME;
1710		1865
…		…
1712	or return;	1867	or return;
1713		1868
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1869	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1870	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1871	#$cf::WAIT_FOR_TICK->wait;
		1872	undef $guard1;
		1873	undef $guard2;
1717	$map->reset;	1874	$map->reset;
1718	undef $guard;
1719	return find $path;	1875	return find $path;
1720	}	1876	}
1721		1877
1722	$cf::MAP{$path} = $map	1878	$cf::MAP{$path} = $map
1723	}	1879	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1888	local $self->{deny_reset} = 1; # loading can take a long time
1733		1889
1734	my $path = $self->{path};	1890	my $path = $self->{path};
1735		1891
1736	{	1892	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1893	my $guard = cf::lock_acquire "map_data:$path";
1738		1894
		1895	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1896	return if $self->in_memory != cf::MAP_SWAPPED;
1740		1897
1741	$self->in_memory (cf::MAP_LOADING);	1898	$self->in_memory (cf::MAP_LOADING);
1742		1899
1743	$self->alloc;	1900	$self->alloc;
1744		1901
1745	$self->pre_load;	1902	$self->pre_load;
1746	Coro::cede;	1903	cf::cede_to_tick;
1747		1904
		1905	my $f = new_from_file cf::object::thawer $self->{load_path};
		1906	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1907	$self->_load_objects ($f)
1749	or return;	1908	or return;
1750		1909
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1910	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1911	if delete $self->{load_original};
1753		1912
1754	if (my $uniq = $self->uniq_path) {	1913	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1914	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1915	unless (aio_stat $uniq) {
		1916	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1917	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1918	$self->_load_objects ($f);
		1919	$f->resolve_delayed_derefs;
		1920	}
1759	}	1921	}
1760	}	1922	}
1761		1923
1762	Coro::cede;	1924	$f->resolve_delayed_derefs;
		1925
		1926	cf::cede_to_tick;
1763	# now do the right thing for maps	1927	# now do the right thing for maps
1764	$self->link_multipart_objects;	1928	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1929	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1930	unless $self->difficulty;
1767	Coro::cede;	1931	cf::cede_to_tick;
1768		1932
1769	unless ($self->{deny_activate}) {	1933	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1934	$self->decay_objects;
1771	$self->fix_auto_apply;	1935	$self->fix_auto_apply;
1772	$self->update_buttons;	1936	$self->update_buttons;
1773	Coro::cede;	1937	cf::cede_to_tick;
1774	$self->set_darkness_map;	1938	$self->set_darkness_map;
1775	Coro::cede;	1939	cf::cede_to_tick;
1776	$self->activate;	1940	$self->activate;
1777	}	1941	}
		1942
		1943	$self->{last_save} = $cf::RUNTIME;
		1944	$self->last_access ($cf::RUNTIME);
1778		1945
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1946	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1947	}
1781		1948
1782	$self->post_load;	1949	$self->post_load;
…		…
1793		1960
1794	$self	1961	$self
1795	}	1962	}
1796		1963
1797	# find and load all maps in the 3x3 area around a map	1964	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	1965	sub load_neighbours {
1799	my ($map) = @_;	1966	my ($map) = @_;
1800		1967
1801	my @diag; # diagonal neighbours	1968	my @neigh; # diagonal neighbours
1802		1969
1803	for (0 .. 3) {	1970	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	1971	my $neigh = $map->tile_path ($_)
1805	or next;	1972	or next;
1806	$neigh = find $neigh, $map	1973	$neigh = find $neigh, $map
1807	or next;	1974	or next;
1808	$neigh->load;	1975	$neigh->load;
1809		1976
		1977	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1978	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1979	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	1980	}
1813		1981
1814	for (@diag) {	1982	for (grep defined $_->[0], @neigh) {
		1983	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	1984	my $neigh = find $path, $origin
1816	or next;	1985	or next;
1817	$neigh->load;	1986	$neigh->load;
1818	}	1987	}
1819	}	1988	}
1820		1989
…		…
1825	}	1994	}
1826		1995
1827	sub do_load_sync {	1996	sub do_load_sync {
1828	my ($map) = @_;	1997	my ($map) = @_;
1829		1998
		1999	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2000	if $Coro::current == $Coro::main;
		2001
1830	cf::sync_job { $map->load };	2002	cf::sync_job { $map->load };
1831	}	2003	}
1832		2004
1833	our %MAP_PREFETCH;	2005	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2006	our $MAP_PREFETCHER = undef;
1835		2007
1836	sub find_async {	2008	sub find_async {
1837	my ($path, $origin) = @_;	2009	my ($path, $origin, $load) = @_;
1838		2010
1839	$path = normalise $path, $origin && $origin->{path};	2011	$path = normalise $path, $origin && $origin->{path};
1840		2012
1841	if (my $map = $cf::MAP{$path}) {	2013	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2014	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2015	}
1844		2016
1845	undef $MAP_PREFETCH{$path};	2017	$MAP_PREFETCH{$path} \|= $load;
		2018
1846	$MAP_PREFETCHER \|\|= cf::async {	2019	$MAP_PREFETCHER \|\|= cf::async {
1847	while (%MAP_PREFETCH) {	2020	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2021	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2022	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2023	$map->load if $v;
		2024	}
1852		2025
1853	delete $MAP_PREFETCH{$path};	2026	delete $MAP_PREFETCH{$k};
1854	}	2027	}
1855	}	2028	}
1856	undef $MAP_PREFETCHER;	2029	undef $MAP_PREFETCHER;
1857	};	2030	};
1858	$MAP_PREFETCHER->prio (6);	2031	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2034	}
1862		2035
1863	sub save {	2036	sub save {
1864	my ($self) = @_;	2037	my ($self) = @_;
1865		2038
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2039	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2040
1868	$self->{last_save} = $cf::RUNTIME;	2041	$self->{last_save} = $cf::RUNTIME;
1869		2042
1870	return unless $self->dirty;	2043	return unless $self->dirty;
1871		2044
…		…
1894	my ($self) = @_;	2067	my ($self) = @_;
1895		2068
1896	# save first because save cedes	2069	# save first because save cedes
1897	$self->save;	2070	$self->save;
1898		2071
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2072	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2073
1901	return if $self->players;	2074	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2075	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2076	return if $self->{deny_save};
1904		2077
		2078	$self->in_memory (cf::MAP_SWAPPED);
		2079
		2080	$self->deactivate;
		2081	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2082	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2083	}
1908		2084
1909	sub reset_at {	2085	sub reset_at {
1910	my ($self) = @_;	2086	my ($self) = @_;
1911		2087
…		…
1943	if $uniq;	2119	if $uniq;
1944	}	2120	}
1945		2121
1946	delete $cf::MAP{$self->path};	2122	delete $cf::MAP{$self->path};
1947		2123
		2124	$self->deactivate;
		2125	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2126	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2127
1952	$self->unlink_save;	2128	$self->unlink_save;
1953	$self->destroy;	2129	$self->destroy;
1954	}	2130	}
1955		2131
1956	my $nuke_counter = "aaaa";	2132	my $nuke_counter = "aaaa";
1957		2133
1958	sub nuke {	2134	sub nuke {
1959	my ($self) = @_;	2135	my ($self) = @_;
1960		2136
		2137	{
		2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2139
1961	delete $cf::MAP{$self->path};	2140	delete $cf::MAP{$self->path};
1962		2141
1963	$self->unlink_save;	2142	$self->unlink_save;
1964		2143
1965	bless $self, "cf::map";	2144	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2145	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2146	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2147	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2148	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2149
1971	$cf::MAP{$self->path} = $self;	2150	$cf::MAP{$self->path} = $self;
		2151	}
1972		2152
1973	$self->reset; # polite request, might not happen	2153	$self->reset; # polite request, might not happen
1974	}	2154	}
1975		2155
1976	=item $maps = cf::map::tmp_maps	2156	=item $maps = cf::map::tmp_maps
…		…
2052		2232
2053	sub inv_recursive {	2233	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2234	inv_recursive_ inv $_[0]
2055	}	2235	}
2056		2236
		2237	=item $ref = $ob->ref
		2238
		2239	creates and returns a persistent reference to an objetc that can be stored as a string.
		2240
		2241	=item $ob = cf::object::deref ($refstring)
		2242
		2243	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2244	even if the object actually exists. May block.
		2245
		2246	=cut
		2247
		2248	sub deref {
		2249	my ($ref) = @_;
		2250
		2251	# temporary compatibility#TODO#remove
		2252	$ref =~ s{^<}{player/<};
		2253
		2254	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2255	my ($uuid, $name) = ($1, $2);
		2256	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2257	or return;
		2258	$pl->ob->uuid eq $uuid
		2259	or return;
		2260
		2261	$pl->ob
		2262	} else {
		2263	warn "$ref: cannot resolve object reference\n";
		2264	undef
		2265	}
		2266	}
		2267
2057	package cf;	2268	package cf;
2058		2269
2059	=back	2270	=back
2060		2271
2061	=head3 cf::object::player	2272	=head3 cf::object::player
…		…
2083		2294
2084	} else {	2295	} else {
2085	my $pl = $self->contr;	2296	my $pl = $self->contr;
2086		2297
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2298	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2299	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2300	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090	$diag->{id},
2091	msgtype => "reply",
2092	msg => $diag->{pl}->expand_cfpod ($msg),
2093	add_topics => []
2094	);
2095		2301
2096	} else {	2302	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2303	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2304	$self->message ($msg, $flags);
2099	}	2305	}
2100	}	2306	}
		2307	}
		2308
		2309	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2310
		2311	=cut
		2312
		2313	sub cf::object::send_msg {
		2314	my $pl = shift->contr
		2315	or return;
		2316	$pl->send_msg (@_);
2101	}	2317	}
2102		2318
2103	=item $player_object->may ("access")	2319	=item $player_object->may ("access")
2104		2320
2105	Returns wether the given player is authorized to access resource "access"	2321	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2400	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2401	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2402	if $x <=0 && $y <= 0;
2187		2403
2188	$map->load;	2404	$map->load;
2189	$map->load_diag;	2405	$map->load_neighbours;
2190		2406
2191	return unless $self->contr->active;	2407	return unless $self->contr->active;
2192	$self->activate_recursive;	2408	$self->activate_recursive;
2193		2409
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2410	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2411	$self->enter_map ($map, $x, $y);
2196	}	2412	}
2197		2413
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2414	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2415
2200	Moves the player to the given map-path and coordinates by first freezing	2416	Moves the player to the given map-path and coordinates by first freezing
2201	her, loading and preparing them map, calling the provided $check callback	2417	her, loading and preparing them map, calling the provided $check callback
2202	that has to return the map if sucecssful, and then unfreezes the player on	2418	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2419	the new (success) or old (failed) map position. In either case, $done will
		2420	be called at the end of this process.
2204		2421
2205	=cut	2422	=cut
2206		2423
2207	our $GOTOGEN;	2424	our $GOTOGEN;
2208		2425
2209	sub cf::object::player::goto {	2426	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2427	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2428
2212	# do generation counting so two concurrent goto's will be executed in-order	2429	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2430	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2431
2215	$self->enter_link;	2432	$self->enter_link;
…		…
2235		2452
2236	if ($gen == $self->{_goto_generation}) {	2453	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2454	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2455	$self->leave_link ($map, $x, $y);
2239	}	2456	}
		2457
		2458	$done->() if $done;
2240	})->prio (1);	2459	})->prio (1);
2241	}	2460	}
2242		2461
2243	=item $player_object->enter_exit ($exit_object)	2462	=item $player_object->enter_exit ($exit_object)
2244		2463
…		…
2313	my $hp = $exit->stats->hp;	2532	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2533	my $sp = $exit->stats->sp;
2315		2534
2316	$self->enter_link;	2535	$self->enter_link;
2317		2536
		2537	# if exit is damned, update players death & WoR home-position
		2538	$self->contr->savebed ($slaying, $hp, $sp)
		2539	if $exit->flag (FLAG_DAMNED);
		2540
2318	(async {	2541	(async {
2319	$self->deactivate_recursive; # just to be sure	2542	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2543	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2544	$self->goto ($slaying, $hp, $sp);
2322		2545
…		…
2349		2572
2350	utf8::encode $text;	2573	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2574	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2352	}	2575	}
2353		2576
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2577	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2578
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2579	Send a drawinfo or msg packet to the client, formatting the msg for the
2357	client if neccessary. C<$type> should be a string identifying the type of	2580	client if neccessary. C<$type> should be a string identifying the type of
2358	the message, with C<log> being the default. If C<$color> is negative, suppress	2581	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2582	the message unless the client supports the msg packet.
2360		2583
2361	=cut	2584	=cut
2362		2585
		2586	our %CHANNEL = (
		2587	"c/identify" => {
		2588	id => "identify",
		2589	title => "Identify",
		2590	reply => undef,
		2591	tooltip => "Items recently identified",
		2592	},
		2593	"c/examine" => {
		2594	id => "examine",
		2595	title => "Examine",
		2596	reply => undef,
		2597	tooltip => "Signs and other items you examined",
		2598	},
		2599	);
		2600
2363	sub cf::client::send_msg {	2601	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2602	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2603
2366	$msg = $self->pl->expand_cfpod ($msg);	2604	$msg = $self->pl->expand_cfpod ($msg);
2367		2605
		2606	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2607
		2608	# check predefined channels, for the benefit of C
		2609	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2610
		2611	if (ref $channel) {
		2612	# send meta info to client, if not yet sent
		2613	unless (exists $self->{channel}{$channel->{id}}) {
		2614	$self->{channel}{$channel->{id}} = $channel;
		2615	$self->ext_msg (channel_info => $channel)
		2616	if $self->can_msg;
		2617	}
		2618
		2619	$channel = $channel->{id};
		2620	}
		2621
		2622	return unless @extra \|\| length $msg;
		2623
2368	if ($self->can_msg) {	2624	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2625	# default colour, mask it out
		2626	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2627	if $color & cf::NDI_DEF;
		2628
		2629	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2630	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2631	} else {
2371	# replace some tags by gcfclient-compatible ones
2372	for ($msg) {
2373	1 while
2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2632	if ($color >= 0) {
		2633	# replace some tags by gcfclient-compatible ones
		2634	for ($msg) {
		2635	1 while
		2636	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2637	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2638	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2639	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2640	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2641	}
		2642
		2643	$color &= cf::NDI_COLOR_MASK;
		2644
		2645	utf8::encode $msg;
		2646
2382	if ($msg =~ /\[/) {	2647	if (0 && $msg =~ /\[/) {
		2648	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2649	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2650	} else {
		2651	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2385	$self->send_packet ("drawinfo $color $msg")	2652	$self->send_packet ("drawinfo $color $msg")
2386	}	2653	}
2387	}	2654	}
2388	}	2655	}
2389	}	2656	}
2390		2657
2391	=item $client->ext_event ($type, %msg)	2658	=item $client->ext_msg ($type, @msg)
2392		2659
2393	Sends an exti event to the client.	2660	Sends an ext event to the client.
2394		2661
2395	=cut	2662	=cut
2396		2663
2397	sub cf::client::ext_event($$%) {	2664	sub cf::client::ext_msg($$@) {
2398	my ($self, $type, %msg) = @_;	2665	my ($self, $type, @msg) = @_;
2399		2666
		2667	if ($self->extcmd == 2) {
		2668	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2669	} elsif ($self->extcmd == 1) { # TODO: remove
2400	$msg{msgtype} = "event_$type";	2670	push @msg, msgtype => "event_$type";
2401	$self->send_packet ("ext " . cf::to_json \%msg);	2671	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2672	}
		2673	}
		2674
		2675	=item $client->ext_reply ($msgid, @msg)
		2676
		2677	Sends an ext reply to the client.
		2678
		2679	=cut
		2680
		2681	sub cf::client::ext_reply($$@) {
		2682	my ($self, $id, @msg) = @_;
		2683
		2684	if ($self->extcmd == 2) {
		2685	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2686	} elsif ($self->extcmd == 1) {
		2687	#TODO: version 1, remove
		2688	unshift @msg, msgtype => "reply", msgid => $id;
		2689	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2690	}
2402	}	2691	}
2403		2692
2404	=item $success = $client->query ($flags, "text", \&cb)	2693	=item $success = $client->query ($flags, "text", \&cb)
2405		2694
2406	Queues a query to the client, calling the given callback with	2695	Queues a query to the client, calling the given callback with
2407	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2696	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2697	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409		2698
2410	Queries can fail, so check the return code. Or don't, as queries will become	2699	Queries can fail, so check the return code. Or don't, as queries will
2411	reliable at some point in the future.	2700	become reliable at some point in the future.
2412		2701
2413	=cut	2702	=cut
2414		2703
2415	sub cf::client::query {	2704	sub cf::client::query {
2416	my ($self, $flags, $text, $cb) = @_;	2705	my ($self, $flags, $text, $cb) = @_;
…		…
2424	utf8::encode $text;	2713	utf8::encode $text;
2425	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2714	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426		2715
2427	$self->send_packet ($self->{query_queue}[0][0])	2716	$self->send_packet ($self->{query_queue}[0][0])
2428	if @{ $self->{query_queue} } == 1;	2717	if @{ $self->{query_queue} } == 1;
		2718
		2719	1
2429	}	2720	}
2430		2721
2431	cf::client->attach (	2722	cf::client->attach (
		2723	on_connect => sub {
		2724	my ($ns) = @_;
		2725
		2726	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2727	},
2432	on_reply => sub {	2728	on_reply => sub {
2433	my ($ns, $msg) = @_;	2729	my ($ns, $msg) = @_;
2434		2730
2435	# this weird shuffling is so that direct followup queries	2731	# this weird shuffling is so that direct followup queries
2436	# get handled first	2732	# get handled first
…		…
2448	} else {	2744	} else {
2449	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2745	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450	}	2746	}
2451	}	2747	}
2452	},	2748	},
		2749	on_exticmd => sub {
		2750	my ($ns, $buf) = @_;
		2751
		2752	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2753
		2754	if (ref $msg) {
		2755	my ($type, $reply, @payload) =
		2756	"ARRAY" eq ref $msg
		2757	? @$msg
		2758	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2759
		2760	my @reply;
		2761
		2762	if (my $cb = $EXTICMD{$type}) {
		2763	@reply = $cb->($ns, @payload);
		2764	}
		2765
		2766	$ns->ext_reply ($reply, @reply)
		2767	if $reply;
		2768
		2769	} else {
		2770	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2771	}
		2772
		2773	cf::override;
		2774	},
2453	);	2775	);
2454		2776
2455	=item $client->async (\&cb)	2777	=item $client->async (\&cb)
2456		2778
2457	Create a new coroutine, running the specified callback. The coroutine will	2779	Create a new coroutine, running the specified callback. The coroutine will
…		…
2498	our $safe = new Safe "safe";	2820	our $safe = new Safe "safe";
2499	our $safe_hole = new Safe::Hole;	2821	our $safe_hole = new Safe::Hole;
2500		2822
2501	$SIG{FPE} = 'IGNORE';	2823	$SIG{FPE} = 'IGNORE';
2502		2824
2503	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2825	$safe->permit_only (Opcode::opset qw(
		2826	:base_core :base_mem :base_orig :base_math
		2827	grepstart grepwhile mapstart mapwhile
		2828	sort time
		2829	));
2504		2830
2505	# here we export the classes and methods available to script code	2831	# here we export the classes and methods available to script code
2506		2832
2507	=pod	2833	=pod
2508		2834
2509	The following functions and methods are available within a safe environment:	2835	The following functions and methods are available within a safe environment:
2510		2836
2511	cf::object contr pay_amount pay_player map	2837	cf::object
		2838	contr pay_amount pay_player map x y force_find force_add
		2839	insert remove name archname title slaying race decrease_ob_nr
		2840
2512	cf::object::player player	2841	cf::object::player
2513	cf::player peaceful	2842	player
2514	cf::map trigger	2843
		2844	cf::player
		2845	peaceful
		2846
		2847	cf::map
		2848	trigger
2515		2849
2516	=cut	2850	=cut
2517		2851
2518	for (	2852	for (
2519	["cf::object" => qw(contr pay_amount pay_player map)],	2853	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2854	insert remove inv name archname title slaying race
		2855	decrease_ob_nr)],
2520	["cf::object::player" => qw(player)],	2856	["cf::object::player" => qw(player)],
2521	["cf::player" => qw(peaceful)],	2857	["cf::player" => qw(peaceful)],
2522	["cf::map" => qw(trigger)],	2858	["cf::map" => qw(trigger)],
2523	) {	2859	) {
2524	no strict 'refs';	2860	no strict 'refs';
…		…
2600	# the server's init and main functions	2936	# the server's init and main functions
2601		2937
2602	sub load_facedata($) {	2938	sub load_facedata($) {
2603	my ($path) = @_;	2939	my ($path) = @_;
2604		2940
		2941	# HACK to clear player env face cache, we need some signal framework
		2942	# for this (global event?)
		2943	%ext::player_env::MUSIC_FACE_CACHE = ();
		2944
		2945	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2946
2605	warn "loading facedata from $path\n";	2947	warn "loading facedata from $path\n";
2606		2948
2607	my $facedata;	2949	my $facedata;
2608	0 < aio_load $path, $facedata	2950	0 < aio_load $path, $facedata
2609	or die "$path: $!";	2951	or die "$path: $!";
…		…
2611	$facedata = Coro::Storable::thaw $facedata;	2953	$facedata = Coro::Storable::thaw $facedata;
2612		2954
2613	$facedata->{version} == 2	2955	$facedata->{version} == 2
2614	or cf::cleanup "$path: version mismatch, cannot proceed.";	2956	or cf::cleanup "$path: version mismatch, cannot proceed.";
2615		2957
		2958	# patch in the exptable
		2959	$facedata->{resource}{"res/exp_table"} = {
		2960	type => FT_RSRC,
		2961	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2962	};
		2963	cf::cede_to_tick;
		2964
2616	{	2965	{
2617	my $faces = $facedata->{faceinfo};	2966	my $faces = $facedata->{faceinfo};
2618		2967
2619	while (my ($face, $info) = each %$faces) {	2968	while (my ($face, $info) = each %$faces) {
2620	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2969	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2621	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2970	cf::face::set_visibility $idx, $info->{visibility};
		2971	cf::face::set_magicmap $idx, $info->{magicmap};
2622	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2972	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2973	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624	Coro::cede;	2974
		2975	cf::cede_to_tick;
2625	}	2976	}
2626		2977
2627	while (my ($face, $info) = each %$faces) {	2978	while (my ($face, $info) = each %$faces) {
2628	next unless $info->{smooth};	2979	next unless $info->{smooth};
2629	my $idx = cf::face::find $face	2980	my $idx = cf::face::find $face
2630	or next;	2981	or next;
2631	if (my $smooth = cf::face::find $info->{smooth}) {	2982	if (my $smooth = cf::face::find $info->{smooth}) {
		2983	cf::face::set_smooth $idx, $smooth;
2632	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2984	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633	} else {	2985	} else {
2634	warn "smooth face '$info->{smooth}' not found for face '$face'";	2986	warn "smooth face '$info->{smooth}' not found for face '$face'";
2635	}	2987	}
2636	Coro::cede;	2988
		2989	cf::cede_to_tick;
2637	}	2990	}
2638	}	2991	}
2639		2992
2640	{	2993	{
2641	my $anims = $facedata->{animinfo};	2994	my $anims = $facedata->{animinfo};
2642		2995
2643	while (my ($anim, $info) = each %$anims) {	2996	while (my ($anim, $info) = each %$anims) {
2644	cf::anim::set $anim, $info->{frames}, $info->{facings};	2997	cf::anim::set $anim, $info->{frames}, $info->{facings};
2645	Coro::cede;	2998	cf::cede_to_tick;
2646	}	2999	}
2647		3000
2648	cf::anim::invalidate_all; # d'oh	3001	cf::anim::invalidate_all; # d'oh
2649	}	3002	}
2650		3003
		3004	{
		3005	# TODO: for gcfclient pleasure, we should give resources
		3006	# that gcfclient doesn't grok a >10000 face index.
		3007	my $res = $facedata->{resource};
		3008
		3009	my $soundconf = delete $res->{"res/sound.conf"};
		3010
		3011	while (my ($name, $info) = each %$res) {
		3012	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3013	my $data;
		3014
		3015	if ($info->{type} & 1) {
		3016	# prepend meta info
		3017
		3018	my $meta = $enc->encode ({
		3019	name => $name,
		3020	%{ $info->{meta} \|\| {} },
		3021	});
		3022
		3023	$data = pack "(w/a)", $meta, $info->{data};
		3024	} else {
		3025	$data = $info->{data};
		3026	}
		3027
		3028	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3029	cf::face::set_type $idx, $info->{type};
		3030
		3031	cf::cede_to_tick;
		3032	}
		3033
		3034	if ($soundconf) {
		3035	$soundconf = $enc->decode (delete $soundconf->{data});
		3036
		3037	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3038	my $sound = $soundconf->{compat}[$_]
		3039	or next;
		3040
		3041	my $face = cf::face::find "sound/$sound->[1]";
		3042	cf::sound::set $sound->[0] => $face;
		3043	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3044	}
		3045
		3046	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3047	my $face = cf::face::find "sound/$v";
		3048	cf::sound::set $k => $face;
		3049	}
		3050	}
		3051	}
		3052
2651	1	3053	1
2652	}	3054	}
2653		3055
		3056	register_exticmd fx_want => sub {
		3057	my ($ns, $want) = @_;
		3058
		3059	while (my ($k, $v) = each %$want) {
		3060	$ns->fx_want ($k, $v);
		3061	}
		3062	};
		3063
2654	sub reload_regions {	3064	sub reload_regions {
		3065	# HACK to clear player env face cache, we need some signal framework
		3066	# for this (global event?)
		3067	%ext::player_env::MUSIC_FACE_CACHE = ();
		3068
2655	load_resource_file "$MAPDIR/regions"	3069	load_resource_file "$MAPDIR/regions"
2656	or die "unable to load regions file\n";	3070	or die "unable to load regions file\n";
		3071
		3072	for (cf::region::list) {
		3073	$_->{match} = qr/$_->{match}/
		3074	if exists $_->{match};
		3075	}
2657	}	3076	}
2658		3077
2659	sub reload_facedata {	3078	sub reload_facedata {
2660	load_facedata "$DATADIR/facedata"	3079	load_facedata "$DATADIR/facedata"
2661	or die "unable to load facedata\n";	3080	or die "unable to load facedata\n";
2662	}	3081	}
2663		3082
2664	sub reload_archetypes {	3083	sub reload_archetypes {
		3084	load_resource_file "$DATADIR/archetypes"
		3085	or die "unable to load archetypes\n";
		3086	#d# NEED to laod twice to resolve forward references
		3087	# this really needs to be done in an extra post-pass
		3088	# (which needs to be synchronous, so solve it differently)
2665	load_resource_file "$DATADIR/archetypes"	3089	load_resource_file "$DATADIR/archetypes"
2666	or die "unable to load archetypes\n";	3090	or die "unable to load archetypes\n";
2667	}	3091	}
2668		3092
2669	sub reload_treasures {	3093	sub reload_treasures {
…		…
2685		3109
2686	sub init {	3110	sub init {
2687	reload_resources;	3111	reload_resources;
2688	}	3112	}
2689		3113
2690	sub cfg_load {	3114	sub reload_config {
2691	open my $fh, "<:utf8", "$CONFDIR/config"	3115	open my $fh, "<:utf8", "$CONFDIR/config"
2692	or return;	3116	or return;
2693		3117
2694	local $/;	3118	local $/;
2695	*CFG = YAML::Syck::Load <$fh>;	3119	*CFG = YAML::Syck::Load <$fh>;
…		…
2715	(async {	3139	(async {
2716	Event::one_event;	3140	Event::one_event;
2717	})->prio (Coro::PRIO_MAX);	3141	})->prio (Coro::PRIO_MAX);
2718	};	3142	};
2719		3143
2720	cfg_load;	3144	reload_config;
2721	db_init;	3145	db_init;
2722	load_extensions;	3146	load_extensions;
2723		3147
2724	$TICK_WATCHER->start;	3148	$TICK_WATCHER->start;
2725	Event::loop;	3149	Event::loop;
…		…
2863	%EXT_CORO = ();	3287	%EXT_CORO = ();
2864		3288
2865	warn "removing commands";	3289	warn "removing commands";
2866	%COMMAND = ();	3290	%COMMAND = ();
2867		3291
2868	warn "removing ext commands";	3292	warn "removing ext/exti commands";
2869	%EXTCMD = ();	3293	%EXTCMD = ();
		3294	%EXTICMD = ();
2870		3295
2871	warn "unloading/nuking all extensions";	3296	warn "unloading/nuking all extensions";
2872	for my $pkg (@EXTS) {	3297	for my $pkg (@EXTS) {
2873	warn "... unloading $pkg";	3298	warn "... unloading $pkg";
2874		3299
…		…
2917	warn "reloading cf.pm";	3342	warn "reloading cf.pm";
2918	require cf;	3343	require cf;
2919	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3344	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920		3345
2921	warn "loading config and database again";	3346	warn "loading config and database again";
2922	cf::cfg_load;	3347	cf::reload_config;
2923		3348
2924	warn "loading extensions";	3349	warn "loading extensions";
2925	cf::load_extensions;	3350	cf::load_extensions;
2926		3351
2927	warn "reattaching attachments to objects/players";	3352	warn "reattaching attachments to objects/players";
…		…
3020	or die;	3445	or die;
3021		3446
3022	$map->width (50);	3447	$map->width (50);
3023	$map->height (50);	3448	$map->height (50);
3024	$map->alloc;	3449	$map->alloc;
3025	$map->_load_objects ("/tmp/x.map", 1);	3450	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3026	my $t = Event::time - $t;	3451	my $t = Event::time - $t;
3027		3452
3028	#next unless $t < 0.0013;#d#	3453	#next unless $t < 0.0013;#d#
3029	if ($t < $min) {	3454	if ($t < $min) {
3030	$min = $t;	3455	$min = $t;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs. Revision 1.359 by root, Sat Sep 8 18:15:55 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.359 by root, Sat Sep 8 18:15:55 2007 UTC