ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.269 by root, Tue May 22 21:35:26 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 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
…		…
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.
168		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.
		178
169	=back	179	=back
170		180
171	=cut	181	=cut
172		182
173	BEGIN {	183	BEGIN {
…		…
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	201	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		202	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	203	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193		204
194	# we bless all objects into (empty) derived classes to force a method lookup	205	# we bless all objects into (empty) derived classes to force a method lookup
195	# within the Safe compartment.	206	# within the Safe compartment.
196	for my $pkg (qw(	207	for my $pkg (qw(
197	cf::global cf::attachable	208	cf::global cf::attachable
…		…
205	}	216	}
206		217
207	$Event::DIED = sub {	218	$Event::DIED = sub {
208	warn "error in event callback: @_";	219	warn "error in event callback: @_";
209	};	220	};
		221
		222	#############################################################################
210		223
211	=head2 UTILITY FUNCTIONS	224	=head2 UTILITY FUNCTIONS
212		225
213	=over 4	226	=over 4
214		227
…		…
233	$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;
234	$d	247	$d
235	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
236	}	249	}
237		250
238	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240	=item $ref = cf::from_json $json	251	=item $ref = cf::from_json $json
241		252
242	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
243		254
244	=item $json = cf::to_json $ref	255	=item $json = cf::to_json $ref
245		256
246	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]) }
247		265
248	=item cf::lock_wait $string	266	=item cf::lock_wait $string
249		267
250	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
251		269
…		…
254	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
255	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,
256	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
257	returned.	275	returned.
258		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
259	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
260	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
261		282
262	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
263		284
264	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.
265		286
266	=cut	287	=cut
267		288
268	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
269		291
270	sub lock_wait($) {	292	sub lock_wait($) {
271	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#
272		299
273	# wait for lock, if any	300	# wait for lock, if any
274	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
275	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
276	Coro::schedule;	303	Coro::schedule;
…		…
282		309
283	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
284	lock_wait $key;	311	lock_wait $key;
285		312
286	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
287		315
288	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
289	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
290	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
291	}	320	}
292	}	321	}
293		322
…		…
305	};	334	};
306	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
307	$guard	336	$guard
308	}	337	}
309		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;
		393	}
		394
310	=item cf::async { BLOCK }	395	=item cf::async { BLOCK }
311		396
312	Currently the same as Coro::async_pool, meaning you cannot use	397	Currently the same as Coro::async_pool, meaning you cannot use
313	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	398	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314	thing you are allowed to do is call C<prio> on it.	399	thing you are allowed to do is call C<prio> on it.
…		…
317		402
318	BEGIN { *async = \&Coro::async_pool }	403	BEGIN { *async = \&Coro::async_pool }
319		404
320	=item cf::sync_job { BLOCK }	405	=item cf::sync_job { BLOCK }
321		406
322	The design of crossfire+ requires that the main coro ($Coro::main) is	407	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323	always able to handle events or runnable, as crossfire+ is only partly	408	is always able to handle events or runnable, as Crossfire TRT is only
324	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	409	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		410	acceptable.
325		411
326	If it must be done, put the blocking parts into C<sync_job>. This will run	412	If it must be done, put the blocking parts into C<sync_job>. This will run
327	the given BLOCK in another coroutine while waiting for the result. The	413	the given BLOCK in another coroutine while waiting for the result. The
328	server will be frozen during this time, so the block should either finish	414	server will be frozen during this time, so the block should either finish
329	fast or be very important.	415	fast or be very important.
…		…
389	$EXT_CORO{$coro+0} = $coro;	475	$EXT_CORO{$coro+0} = $coro;
390		476
391	$coro	477	$coro
392	}	478	}
393		479
394	sub write_runtime {	480	=item fork_call { }, $args
395	my $runtime = "$LOCALDIR/runtime";
396		481
397	# first touch the runtime file to show we are still running:	482	Executes the given code block with the given arguments in a seperate
398	# the fsync below can take a very very long time.	483	process, returning the results. Everything must be serialisable with
		484	Coro::Storable. May, of course, block. Note that the executed sub may
		485	never block itself or use any form of Event handling.
399		486
400	if (my $fh = aio_open $runtime, O_WRONLY, 0) {	487	=cut
401	utime undef, undef, $fh;
402	}
403		488
404	my $guard = cf::lock_acquire "write_runtime";	489	sub fork_call(&@) {
		490	my ($cb, @args) = @_;
405		491
406	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	492	# we seemingly have to make a local copy of the whole thing,
407	or return;	493	# otherwise perl prematurely frees the stuff :/
		494	# TODO: investigate and fix (likely this will be rather laborious)
408		495
409	my $value = $cf::RUNTIME + 90 + 10;	496	my @res = Coro::Util::fork_eval {
410	# 10 is the runtime save interval, for a monotonic clock	497	reset_signals;
411	# 60 allows for the watchdog to kill the server.	498	&$cb
		499	}, @args;
412		500
413	(aio_write $fh, 0, (length $value), $value, 0) <= 0	501	wantarray ? @res : $res[-1]
414	and return;	502	}
415		503
416	# always fsync - this file is important	504	=item $value = cf::db_get $family => $key
417	aio_fsync $fh
418	and return;
419		505
420	# touch it again to show we are up-to-date	506	Returns a single value from the environment database.
421	utime undef, undef, $fh;
422		507
423	close $fh	508	=item cf::db_put $family => $key => $value
424	or return;
425		509
426	aio_rename "$runtime~", $runtime	510	Stores the given C<$value> in the family. It can currently store binary
427	and return;	511	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
428		512
429	warn "runtime file written.\n";#d#	513	=cut
430		514
		515	our $DB;
		516
		517	sub db_init {
		518	unless ($DB) {
		519	$DB = BDB::db_create $DB_ENV;
		520
		521	cf::sync_job {
		522	eval {
		523	$DB->set_flags (BDB::CHKSUM);
		524
		525	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		526	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		527	cf::cleanup "db_open(db): $!" if $!;
		528	};
		529	cf::cleanup "db_open(db): $@" if $@;
		530	};
431	1	531	}
		532	}
		533
		534	sub db_get($$) {
		535	my $key = "$_[0]/$_[1]";
		536
		537	cf::sync_job {
		538	BDB::db_get $DB, undef, $key, my $data;
		539
		540	$! ? ()
		541	: $data
		542	}
		543	}
		544
		545	sub db_put($$$) {
		546	BDB::dbreq_pri 4;
		547	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		548	}
		549
		550	=item cf::cache $id => [$paths...], $processversion => $process
		551
		552	Generic caching function that returns the value of the resource $id,
		553	caching and regenerating as required.
		554
		555	This function can block.
		556
		557	=cut
		558
		559	sub cache {
		560	my ($id, $src, $processversion, $process) = @_;
		561
		562	my $meta =
		563	join "\x00",
		564	$processversion,
		565	map {
		566	aio_stat $_
		567	and Carp::croak "$_: $!";
		568
		569	($_, (stat _)[7,9])
		570	} @$src;
		571
		572	my $dbmeta = db_get cache => "$id/meta";
		573	if ($dbmeta ne $meta) {
		574	# changed, we may need to process
		575
		576	my @data;
		577	my $md5;
		578
		579	for (0 .. $#$src) {
		580	0 <= aio_load $src->[$_], $data[$_]
		581	or Carp::croak "$src->[$_]: $!";
		582	}
		583
		584	# if processing is expensive, check
		585	# checksum first
		586	if (1) {
		587	$md5 =
		588	join "\x00",
		589	$processversion,
		590	map {
		591	cf::cede_to_tick;
		592	($src->[$_], Digest::MD5::md5_hex $data[$_])
		593	} 0.. $#$src;
		594
		595
		596	my $dbmd5 = db_get cache => "$id/md5";
		597	if ($dbmd5 eq $md5) {
		598	db_put cache => "$id/meta", $meta;
		599
		600	return db_get cache => "$id/data";
		601	}
		602	}
		603
		604	my $t1 = Time::HiRes::time;
		605	my $data = $process->(\@data);
		606	my $t2 = Time::HiRes::time;
		607
		608	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		609
		610	db_put cache => "$id/data", $data;
		611	db_put cache => "$id/md5" , $md5;
		612	db_put cache => "$id/meta", $meta;
		613
		614	return $data;
		615	}
		616
		617	db_get cache => "$id/data"
432	}	618	}
433		619
434	=item cf::datalog type => key => value, ...	620	=item cf::datalog type => key => value, ...
435		621
436	Log a datalog packet of the given type with the given key-value pairs.	622	Log a datalog packet of the given type with the given key-value pairs.
…		…
454	attach callbacks/event handlers (a collection of which is called an "attachment")	640	attach callbacks/event handlers (a collection of which is called an "attachment")
455	to it. All such attachable objects support the following methods.	641	to it. All such attachable objects support the following methods.
456		642
457	In the following description, CLASS can be any of C<global>, C<object>	643	In the following description, CLASS can be any of C<global>, C<object>
458	C<player>, C<client> or C<map> (i.e. the attachable objects in	644	C<player>, C<client> or C<map> (i.e. the attachable objects in
459	crossfire+).	645	Crossfire TRT).
460		646
461	=over 4	647	=over 4
462		648
463	=item $attachable->attach ($attachment, key => $value...)	649	=item $attachable->attach ($attachment, key => $value...)
464		650
…		…
666	_attach $registry, $klass, @attach;	852	_attach $registry, $klass, @attach;
667	}	853	}
668		854
669	$obj->{$name} = \%arg;	855	$obj->{$name} = \%arg;
670	} else {	856	} else {
671	warn "object uses attachment '$name' that is not available, postponing.\n";	857	warn "object uses attachment '$name' which is not available, postponing.\n";
672	}	858	}
673		859
674	$obj->{_attachment}{$name} = undef;	860	$obj->{_attachment}{$name} = undef;
675	}	861	}
676		862
…		…
716	";	902	";
717	die if $@;	903	die if $@;
718	}	904	}
719		905
720	our $override;	906	our $override;
721	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?
722		908
723	sub override {	909	sub override {
724	$override = 1;	910	$override = 1;
725	@invoke_results = ();	911	@INVOKE_RESULTS = (@_);
726	}	912	}
727		913
728	sub do_invoke {	914	sub do_invoke {
729	my $event = shift;	915	my $event = shift;
730	my $callbacks = shift;	916	my $callbacks = shift;
731		917
732	@invoke_results = ();	918	@INVOKE_RESULTS = ();
733		919
734	local $override;	920	local $override;
735		921
736	for (@$callbacks) {	922	for (@$callbacks) {
737	eval { &{$_->[1]} };	923	eval { &{$_->[1]} };
…		…
754		940
755	Generate an object-specific event with the given arguments.	941	Generate an object-specific event with the given arguments.
756		942
757	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
758	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
759	results (if you must, access C<@cf::invoke_results> directly).	945	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760		946
761	=back	947	=back
762		948
763	=cut	949	=cut
764		950
765	#############################################################################	951	#############################################################################
766	# 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	}
767		964
768	sub reattach {	965	sub reattach {
769	# basically do the same as instantiate, without calling instantiate	966	# basically do the same as instantiate, without calling instantiate
770	my ($obj) = @_;	967	my ($obj) = @_;
771		968
…		…
815	},	1012	},
816	);	1013	);
817		1014
818	sub object_freezer_save {	1015	sub object_freezer_save {
819	my ($filename, $rdata, $objs) = @_;	1016	my ($filename, $rdata, $objs) = @_;
		1017
		1018	my $guard = cf::lock_acquire "io";
820		1019
821	sync_job {	1020	sync_job {
822	if (length $$rdata) {	1021	if (length $$rdata) {
823	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
824	$filename, length $$rdata, scalar @$objs;	1023	$filename, length $$rdata, scalar @$objs;
…		…
848	}	1047	}
849	} else {	1048	} else {
850	aio_unlink $filename;	1049	aio_unlink $filename;
851	aio_unlink "$filename.pst";	1050	aio_unlink "$filename.pst";
852	}	1051	}
853	}	1052	};
		1053
		1054	undef $guard;
854	}	1055	}
855		1056
856	sub object_freezer_as_string {	1057	sub object_freezer_as_string {
857	my ($rdata, $objs) = @_;	1058	my ($rdata, $objs) = @_;
858		1059
…		…
863		1064
864	sub object_thawer_load {	1065	sub object_thawer_load {
865	my ($filename) = @_;	1066	my ($filename) = @_;
866		1067
867	my ($data, $av);	1068	my ($data, $av);
		1069
		1070	my $guard = cf::lock_acquire "io";
868		1071
869	(aio_load $filename, $data) >= 0	1072	(aio_load $filename, $data) >= 0
870	or return;	1073	or return;
871		1074
872	unless (aio_stat "$filename.pst") {	1075	unless (aio_stat "$filename.pst") {
873	(aio_load "$filename.pst", $av) >= 0	1076	(aio_load "$filename.pst", $av) >= 0
874	or return;	1077	or return;
		1078
		1079	undef $guard;
875	$av = eval { (Storable::thaw $av)->{objs} };	1080	$av = eval { (Storable::thaw $av)->{objs} };
876	}	1081	}
877		1082
878	warn sprintf "loading %s (%d)\n",	1083	warn sprintf "loading %s (%d)\n",
879	$filename, length $data, scalar @{$av || []};#d#	1084	$filename, length $data, scalar @{$av || []};
		1085
880	return ($data, $av);	1086	($data, $av)
881	}	1087	}
		1088
		1089	=head2 COMMAND CALLBACKS
		1090
		1091	=over 4
		1092
		1093	=cut
882		1094
883	#############################################################################	1095	#############################################################################
884	# command handling &c	1096	# command handling &c
885		1097
886	=item cf::register_command $name => \&callback($ob,$args);	1098	=item cf::register_command $name => \&callback($ob,$args);
…		…
899	push @{ $COMMAND{$name} }, [$caller, $cb];	1111	push @{ $COMMAND{$name} }, [$caller, $cb];
900	}	1112	}
901		1113
902	=item cf::register_extcmd $name => \&callback($pl,$packet);	1114	=item cf::register_extcmd $name => \&callback($pl,$packet);
903		1115
904	Register a callbackf ro 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.
905		1121
906	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
907	called.	1123	called.
908		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
909	=cut	1136	=cut
910		1137
911	sub register_extcmd {	1138	sub register_extcmd {
912	my ($name, $cb) = @_;	1139	my ($name, $cb) = @_;
913		1140
914	$EXTCMD{$name} = $cb;	1141	$EXTCMD{$name} = $cb;
		1142	}
		1143
		1144	sub register_exticmd {
		1145	my ($name, $cb) = @_;
		1146
		1147	$EXTICMD{$name} = $cb;
915	}	1148	}
916		1149
917	cf::player->attach (	1150	cf::player->attach (
918	on_command => sub {	1151	on_command => sub {
919	my ($pl, $name, $params) = @_;	1152	my ($pl, $name, $params) = @_;
…		…
928	cf::override;	1161	cf::override;
929	},	1162	},
930	on_extcmd => sub {	1163	on_extcmd => sub {
931	my ($pl, $buf) = @_;	1164	my ($pl, $buf) = @_;
932		1165
933	my $msg = eval { from_json $buf };	1166	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934		1167
935	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
936	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1176	if (my $cb = $EXTCMD{$type}) {
937	if (my %reply = $cb->($pl, $msg)) {	1177	@reply = $cb->($pl, @payload);
938	$pl->ext_reply ($msg->{msgid}, %reply);
939	}
940	}	1178	}
		1179
		1180	$pl->ext_reply ($reply, @reply)
		1181	if $reply;
		1182
941	} else {	1183	} else {
942	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1184	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943	}	1185	}
944		1186
945	cf::override;	1187	cf::override;
946	},	1188	},
947	);	1189	);
948		1190
949	sub load_extension {
950	my ($path) = @_;
951
952	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
953	my $base = $1;
954	my $pkg = $1;
955	$pkg =~ s/[^[:word:]]/_/g;
956	$pkg = "ext::$pkg";
957
958	warn "... loading '$path' into '$pkg'\n";
959
960	open my $fh, "<:utf8", $path
961	or die "$path: $!";
962
963	my $source =
964	"package $pkg; use strict; use utf8;\n"
965	. "#line 1 \"$path\"\n{\n"
966	. (do { local $/; <$fh> })
967	. "\n};\n1";
968
969	unless (eval $source) {
970	my $msg = $@ ? "$path: $@\n"
971	: "extension disabled.\n";
972	if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973	warn $@;
974	warn "mandatory extension failed to load, exiting.\n";
975	exit 1;
976	}
977	die $@;
978	}
979
980	push @EXTS, $pkg;
981	}
982
983	sub load_extensions {	1191	sub load_extensions {
		1192	cf::sync_job {
		1193	my %todo;
		1194
984	for my $ext (<$LIBDIR/*.ext>) {	1195	for my $path (<$LIBDIR/*.ext>) {
985	next unless -r $ext;	1196	next unless -r $path;
986	eval {	1197
987	load_extension $ext;	1198	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1199	my $base = $1;
		1200	my $pkg = $1;
		1201	$pkg =~ s/[^[:word:]]/_/g;
		1202	$pkg = "ext::$pkg";
		1203
		1204	open my $fh, "<:utf8", $path
		1205	or die "$path: $!";
		1206
		1207	my $source = do { local $/; <$fh> };
		1208
		1209	my %ext = (
		1210	path => $path,
		1211	base => $base,
		1212	pkg => $pkg,
		1213	);
		1214
		1215	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1216	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
		1217
		1218	$ext{source} =
		1219	"package $pkg; use strict; use utf8;\n"
		1220	. "#line 1 \"$path\"\n{\n"
		1221	. $source
		1222	. "\n};\n1";
		1223
		1224	$todo{$base} = \%ext;
		1225	}
		1226
		1227	my %done;
		1228	while (%todo) {
		1229	my $progress;
		1230
		1231	while (my ($k, $v) = each %todo) {
		1232	for (split /,\s*/, $v->{meta}{depends}) {
		1233	goto skip
		1234	unless exists $done{$_};
		1235	}
		1236
		1237	warn "... loading '$k' into '$v->{pkg}'\n";
		1238
		1239	unless (eval $v->{source}) {
		1240	my $msg = $@ ? "$v->{path}: $@\n"
		1241	: "$v->{base}: extension inactive.\n";
		1242
		1243	if (exists $v->{meta}{mandatory}) {
		1244	warn $msg;
		1245	warn "mandatory extension failed to load, exiting.\n";
		1246	exit 1;
		1247	}
		1248
		1249	warn $msg;
		1250	}
		1251
		1252	$done{$k} = delete $todo{$k};
		1253	push @EXTS, $v->{pkg};
		1254	$progress = 1;
988	1	1255	}
989	} or warn "$ext not loaded: $@";	1256
		1257	skip:
		1258	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1259	unless $progress;
		1260	}
990	}	1261	};
991	}	1262	}
992		1263
993	#############################################################################	1264	#############################################################################
		1265
		1266	=back
994		1267
995	=head2 CORE EXTENSIONS	1268	=head2 CORE EXTENSIONS
996		1269
997	Functions and methods that extend core crossfire objects.	1270	Functions and methods that extend core crossfire objects.
998		1271
…		…
1048	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1321	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1322	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1323	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051	aio_unlink +(playerdir $login) . "/$login.pl";	1324	aio_unlink +(playerdir $login) . "/$login.pl";
1052		1325
1053	my $pl = load_pl path $login	1326	my $f = new_from_file cf::object::thawer path $login
1054	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;
1055	$cf::PLAYER{$login} = $pl	1334	$cf::PLAYER{$login} = $pl
1056	}	1335	}
1057	}	1336	}
1058	}	1337	}
1059		1338
…		…
1069		1348
1070	aio_mkdir playerdir $pl, 0770;	1349	aio_mkdir playerdir $pl, 0770;
1071	$pl->{last_save} = $cf::RUNTIME;	1350	$pl->{last_save} = $cf::RUNTIME;
1072		1351
1073	$pl->save_pl ($path);	1352	$pl->save_pl ($path);
1074	Coro::cede;	1353	cf::cede_to_tick;
1075	}	1354	}
1076		1355
1077	sub new($) {	1356	sub new($) {
1078	my ($login) = @_;	1357	my ($login) = @_;
1079		1358
…		…
1083	$self->{deny_save} = 1;	1362	$self->{deny_save} = 1;
1084		1363
1085	$cf::PLAYER{$login} = $self;	1364	$cf::PLAYER{$login} = $self;
1086		1365
1087	$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 (@_);
1088	}	1377	}
1089		1378
1090	=item $pl->quit_character	1379	=item $pl->quit_character
1091		1380
1092	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
…		…
1147	or return [];	1436	or return [];
1148		1437
1149	my @logins;	1438	my @logins;
1150		1439
1151	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") {
1152	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1445	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153	aio_read $fh, 0, 512, my $buf, 0 or next;	1446	aio_read $fh, 0, 512, my $buf, 0 or next;
1154	$buf !~ /^password -------------$/m or next; # official not-valid tag	1447	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1448	}
1155		1449
1156	utf8::decode $login;	1450	utf8::decode $login;
1157	push @logins, $login;	1451	push @logins, $login;
1158	}	1452	}
1159		1453
…		…
1186	}	1480	}
1187		1481
1188	\@paths	1482	\@paths
1189	}	1483	}
1190		1484
		1485	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1486
		1487	Expand crossfire pod fragments into protocol xml.
		1488
		1489	=cut
		1490
		1491	sub expand_cfpod {
		1492	((my $self), (local $_)) = @_;
		1493
		1494	# escape & and <
		1495	s/&/&amp;/g;
		1496	s/(?<![BIUGHT])</&lt;/g;
		1497
		1498	# this is buggy, it needs to properly take care of nested <'s
		1499
		1500	1 while
		1501	# replace B<>, I<>, U<> etc.
		1502	s/B<([^\>]*)>/<b>$1<\/b>/
		1503	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1504	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1505	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1506	# replace G<male|female> tags
		1507	|| s{G<([^>|]*)\|([^>]*)>}{
		1508	$self->gender ? $2 : $1
		1509	}ge
		1510	# replace H<hint text>
		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;
		1518
		1519	# create single paragraphs (very hackish)
		1520	s/(?<=\S)\n(?=\w)/ /g;
		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
		1528	$_
		1529	}
		1530
		1531	sub hintmode {
		1532	$_[0]{hintmode} = $_[1] if @_ > 1;
		1533	$_[0]{hintmode}
		1534	}
		1535
1191	=item $player->ext_reply ($msgid, %msg)	1536	=item $player->ext_reply ($msgid, @msg)
1192		1537
1193	Sends an ext reply to the player.	1538	Sends an ext reply to the player.
1194		1539
1195	=cut	1540	=cut
1196		1541
1197	sub ext_reply($$%) {	1542	sub ext_reply($$@) {
1198	my ($self, $id, %msg) = @_;	1543	my ($self, $id, @msg) = @_;
1199		1544
1200	$msg{msgid} = $id;	1545	$self->ns->ext_reply ($id, @msg)
1201
1202	$self->send ("ext " . cf::to_json \%msg);
1203	}	1546	}
1204		1547
1205	=item $player->ext_event ($type, %msg)	1548	=item $player->ext_msg ($type, @msg)
1206		1549
1207	Sends an ext event to the client.	1550	Sends an ext event to the client.
1208		1551
1209	=cut	1552	=cut
1210		1553
1211	sub ext_event($$%) {	1554	sub ext_msg($$@) {
1212	my ($self, $type, %msg) = @_;	1555	my ($self, $type, @msg) = @_;
1213		1556
1214	$self->ns->ext_event ($type, %msg);	1557	$self->ns->ext_msg ($type, @msg);
1215	}	1558	}
1216		1559
1217	=head3 cf::region	1560	=head3 cf::region
1218		1561
1219	=over 4	1562	=over 4
…		…
1222		1565
1223	package cf::region;	1566	package cf::region;
1224		1567
1225	=item cf::region::find_by_path $path	1568	=item cf::region::find_by_path $path
1226		1569
1227	Tries to decuce the probable region for a map knowing only its path.	1570	Tries to decuce the likely region for a map knowing only its path.
1228		1571
1229	=cut	1572	=cut
1230		1573
1231	sub find_by_path($) {	1574	sub find_by_path($) {
1232	my ($path) = @_;	1575	my ($path) = @_;
1233		1576
1234	my ($match, $specificity);	1577	my ($match, $specificity);
1235		1578
1236	for my $region (list) {	1579	for my $region (list) {
1237	if ($region->match && $path =~ $region->match) {	1580	if ($region->{match} && $path =~ $region->{match}) {
1238	($match, $specificity) = ($region, $region->specificity)	1581	($match, $specificity) = ($region, $region->specificity)
1239	if $region->specificity > $specificity;	1582	if $region->specificity > $specificity;
1240	}	1583	}
1241	}	1584	}
1242		1585
…		…
1306	my ($self, $merge) = @_;	1649	my ($self, $merge) = @_;
1307		1650
1308	# we have to keep some variables in memory intact	1651	# we have to keep some variables in memory intact
1309	local $self->{path};	1652	local $self->{path};
1310	local $self->{load_path};	1653	local $self->{load_path};
1311	local $self->{deny_save};
1312	local $self->{deny_reset};
1313		1654
1314	$self->SUPER::thawer_merge ($merge);	1655	$self->SUPER::thawer_merge ($merge);
1315	}	1656	}
1316		1657
1317	sub normalise {	1658	sub normalise {
…		…
1364	$self->init; # pass $1 etc.	1705	$self->init; # pass $1 etc.
1365	return $self;	1706	return $self;
1366	}	1707	}
1367	}	1708	}
1368		1709
1369	Carp::carp "unable to resolve path '$path' (base '$base').";	1710	Carp::cluck "unable to resolve path '$path' (base '$base').";
1370	()	1711	()
1371	}	1712	}
1372		1713
1373	sub init {	1714	sub init {
1374	my ($self) = @_;	1715	my ($self) = @_;
…		…
1417		1758
1418	$_->change_map_light ($change)	1759	$_->change_map_light ($change)
1419	for grep $_->outdoor, values %cf::MAP;	1760	for grep $_->outdoor, values %cf::MAP;
1420	}	1761	}
1421		1762
		1763	sub decay_objects {
		1764	my ($self) = @_;
		1765
		1766	return if $self->{deny_reset};
		1767
		1768	$self->do_decay_objects;
		1769	}
		1770
1422	sub unlink_save {	1771	sub unlink_save {
1423	my ($self) = @_;	1772	my ($self) = @_;
1424		1773
1425	utf8::encode (my $save = $self->save_path);	1774	utf8::encode (my $save = $self->save_path);
1426	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1775	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1429		1778
1430	sub load_header_from($) {	1779	sub load_header_from($) {
1431	my ($self, $path) = @_;	1780	my ($self, $path) = @_;
1432		1781
1433	utf8::encode $path;	1782	utf8::encode $path;
1434	#aio_open $path, O_RDONLY, 0	1783	my $f = new_from_file cf::object::thawer $path
1435	# or return;
1436
1437	$self->_load_header ($path)
1438	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;
1439		1791
1440	$self->{load_path} = $path;	1792	$self->{load_path} = $path;
1441		1793
1442	1	1794	1
1443	}	1795	}
…		…
1482	$self->load_header_orig	1834	$self->load_header_orig
1483	or return;	1835	or return;
1484	$self->prepare_orig;	1836	$self->prepare_orig;
1485	}	1837	}
1486		1838
		1839	$self->{deny_reset} = 1
		1840	if $self->no_reset;
		1841
1487	$self->default_region (cf::region::find_by_path $self->{path})	1842	$self->default_region (cf::region::find_by_path $self->{path})
1488	unless $self->default_region;	1843	unless $self->default_region;
1489		1844
1490	1	1845	1
1491	}	1846	}
…		…
1494	sub find {	1849	sub find {
1495	my ($path, $origin) = @_;	1850	my ($path, $origin) = @_;
1496		1851
1497	$path = normalise $path, $origin && $origin->path;	1852	$path = normalise $path, $origin && $origin->path;
1498		1853
		1854	cf::lock_wait "map_data:$path";#d#remove
1499	cf::lock_wait "map_find:$path";	1855	cf::lock_wait "map_find:$path";
1500		1856
1501	$cf::MAP{$path} || do {	1857	$cf::MAP{$path} || do {
1502	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
1503	my $map = new_from_path cf::map $path	1861	my $map = new_from_path cf::map $path
1504	or return;	1862	or return;
1505		1863
1506	$map->{last_save} = $cf::RUNTIME;	1864	$map->{last_save} = $cf::RUNTIME;
1507		1865
1508	$map->load_header	1866	$map->load_header
1509	or return;	1867	or return;
1510		1868
1511	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1869	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512	# doing this can freeze the server in a sync job, obviously	1870	# doing this can freeze the server in a sync job, obviously
1513	#$cf::WAIT_FOR_TICK->wait;	1871	#$cf::WAIT_FOR_TICK->wait;
		1872	undef $guard1;
		1873	undef $guard2;
1514	$map->reset;	1874	$map->reset;
1515	undef $guard;
1516	return find $path;	1875	return find $path;
1517	}	1876	}
1518		1877
1519	$cf::MAP{$path} = $map	1878	$cf::MAP{$path} = $map
1520	}	1879	}
…		…
1529	local $self->{deny_reset} = 1; # loading can take a long time	1888	local $self->{deny_reset} = 1; # loading can take a long time
1530		1889
1531	my $path = $self->{path};	1890	my $path = $self->{path};
1532		1891
1533	{	1892	{
1534	my $guard = cf::lock_acquire "map_load:$path";	1893	my $guard = cf::lock_acquire "map_data:$path";
1535		1894
		1895	return unless $self->valid;
1536	return if $self->in_memory != cf::MAP_SWAPPED;	1896	return unless $self->in_memory == cf::MAP_SWAPPED;
1537		1897
1538	$self->in_memory (cf::MAP_LOADING);	1898	$self->in_memory (cf::MAP_LOADING);
1539		1899
1540	$self->alloc;	1900	$self->alloc;
1541		1901
1542	$self->pre_load;	1902	$self->pre_load;
1543	Coro::cede;	1903	cf::cede_to_tick;
1544		1904
		1905	my $f = new_from_file cf::object::thawer $self->{load_path};
		1906	$f->skip_block;
1545	$self->_load_objects ($self->{load_path}, 1)	1907	$self->_load_objects ($f)
1546	or return;	1908	or return;
1547		1909
1548	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1910	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549	if delete $self->{load_original};	1911	if delete $self->{load_original};
1550		1912
1551	if (my $uniq = $self->uniq_path) {	1913	if (my $uniq = $self->uniq_path) {
1552	utf8::encode $uniq;	1914	utf8::encode $uniq;
1553	if (aio_open $uniq, O_RDONLY, 0) {	1915	unless (aio_stat $uniq) {
		1916	if (my $f = new_from_file cf::object::thawer $uniq) {
1554	$self->clear_unique_items;	1917	$self->clear_unique_items;
1555	$self->_load_objects ($uniq, 0);	1918	$self->_load_objects ($f);
		1919	$f->resolve_delayed_derefs;
		1920	}
1556	}	1921	}
1557	}	1922	}
1558		1923
1559	Coro::cede;	1924	$f->resolve_delayed_derefs;
		1925
		1926	cf::cede_to_tick;
1560	# now do the right thing for maps	1927	# now do the right thing for maps
1561	$self->link_multipart_objects;	1928	$self->link_multipart_objects;
1562	$self->difficulty ($self->estimate_difficulty)	1929	$self->difficulty ($self->estimate_difficulty)
1563	unless $self->difficulty;	1930	unless $self->difficulty;
1564	Coro::cede;	1931	cf::cede_to_tick;
1565		1932
1566	unless ($self->{deny_activate}) {	1933	unless ($self->{deny_activate}) {
1567	$self->decay_objects;	1934	$self->decay_objects;
1568	$self->fix_auto_apply;	1935	$self->fix_auto_apply;
1569	$self->update_buttons;	1936	$self->update_buttons;
1570	Coro::cede;	1937	cf::cede_to_tick;
1571	$self->set_darkness_map;	1938	$self->set_darkness_map;
1572	Coro::cede;	1939	cf::cede_to_tick;
1573	$self->activate;	1940	$self->activate;
1574	}	1941	}
		1942
		1943	$self->{last_save} = $cf::RUNTIME;
		1944	$self->last_access ($cf::RUNTIME);
1575		1945
1576	$self->in_memory (cf::MAP_IN_MEMORY);	1946	$self->in_memory (cf::MAP_IN_MEMORY);
1577	}	1947	}
1578		1948
1579	$self->post_load;	1949	$self->post_load;
…		…
1583	my ($self, $ob) = @_;	1953	my ($self, $ob) = @_;
1584		1954
1585	return find "~" . $ob->name . "/" . $self->{path}	1955	return find "~" . $ob->name . "/" . $self->{path}
1586	if $self->per_player;	1956	if $self->per_player;
1587		1957
		1958	# return find "?party/" . $ob->name . "/" . $self->{path}
		1959	# if $self->per_party;
		1960
1588	$self	1961	$self
1589	}	1962	}
1590		1963
1591	# 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
1592	sub load_diag {	1965	sub load_neighbours {
1593	my ($map) = @_;	1966	my ($map) = @_;
1594		1967
1595	my @diag; # diagonal neighbours	1968	my @neigh; # diagonal neighbours
1596		1969
1597	for (0 .. 3) {	1970	for (0 .. 3) {
1598	my $neigh = $map->tile_path ($_)	1971	my $neigh = $map->tile_path ($_)
1599	or next;	1972	or next;
1600	$neigh = find $neigh, $map	1973	$neigh = find $neigh, $map
1601	or next;	1974	or next;
1602	$neigh->load;	1975	$neigh->load;
1603		1976
		1977	push @neigh,
1604	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1978	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1605	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1979	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1606	}	1980	}
1607		1981
1608	for (@diag) {	1982	for (grep defined $_->[0], @neigh) {
		1983	my ($path, $origin) = @$_;
1609	my $neigh = find @$_	1984	my $neigh = find $path, $origin
1610	or next;	1985	or next;
1611	$neigh->load;	1986	$neigh->load;
1612	}	1987	}
1613	}	1988	}
1614		1989
…		…
1619	}	1994	}
1620		1995
1621	sub do_load_sync {	1996	sub do_load_sync {
1622	my ($map) = @_;	1997	my ($map) = @_;
1623		1998
		1999	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2000	if $Coro::current == $Coro::main;
		2001
1624	cf::sync_job { $map->load };	2002	cf::sync_job { $map->load };
1625	}	2003	}
1626		2004
1627	our %MAP_PREFETCH;	2005	our %MAP_PREFETCH;
1628	our $MAP_PREFETCHER = undef;	2006	our $MAP_PREFETCHER = undef;
1629		2007
1630	sub find_async {	2008	sub find_async {
1631	my ($path, $origin) = @_;	2009	my ($path, $origin, $load) = @_;
1632		2010
1633	$path = normalise $path, $origin && $origin->{path};	2011	$path = normalise $path, $origin && $origin->{path};
1634		2012
1635	if (my $map = $cf::MAP{$path}) {	2013	if (my $map = $cf::MAP{$path}) {
1636	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2014	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637	}	2015	}
1638		2016
1639	undef $MAP_PREFETCH{$path};	2017	$MAP_PREFETCH{$path} |= $load;
		2018
1640	$MAP_PREFETCHER ||= cf::async {	2019	$MAP_PREFETCHER ||= cf::async {
1641	while (%MAP_PREFETCH) {	2020	while (%MAP_PREFETCH) {
1642	for my $path (keys %MAP_PREFETCH) {	2021	while (my ($k, $v) = each %MAP_PREFETCH) {
1643	my $map = find $path	2022	if (my $map = find $k) {
1644	or next;
1645	$map->load;	2023	$map->load if $v;
		2024	}
1646		2025
1647	delete $MAP_PREFETCH{$path};	2026	delete $MAP_PREFETCH{$k};
1648	}	2027	}
1649	}	2028	}
1650	undef $MAP_PREFETCHER;	2029	undef $MAP_PREFETCHER;
1651	};	2030	};
1652	$MAP_PREFETCHER->prio (6);	2031	$MAP_PREFETCHER->prio (6);
…		…
1655	}	2034	}
1656		2035
1657	sub save {	2036	sub save {
1658	my ($self) = @_;	2037	my ($self) = @_;
1659		2038
1660	my $lock = cf::lock_acquire "map_data:" . $self->path;	2039	my $lock = cf::lock_acquire "map_data:$self->{path}";
1661		2040
1662	$self->{last_save} = $cf::RUNTIME;	2041	$self->{last_save} = $cf::RUNTIME;
1663		2042
1664	return unless $self->dirty;	2043	return unless $self->dirty;
1665		2044
…		…
1688	my ($self) = @_;	2067	my ($self) = @_;
1689		2068
1690	# save first because save cedes	2069	# save first because save cedes
1691	$self->save;	2070	$self->save;
1692		2071
1693	my $lock = cf::lock_acquire "map_data:" . $self->path;	2072	my $lock = cf::lock_acquire "map_data:$self->{path}";
1694		2073
1695	return if $self->players;	2074	return if $self->players;
1696	return if $self->in_memory != cf::MAP_IN_MEMORY;	2075	return if $self->in_memory != cf::MAP_IN_MEMORY;
1697	return if $self->{deny_save};	2076	return if $self->{deny_save};
1698		2077
		2078	$self->in_memory (cf::MAP_SWAPPED);
		2079
		2080	$self->deactivate;
		2081	$_->clear_links_to ($self) for values %cf::MAP;
1699	$self->clear;	2082	$self->clear;
1700	$self->in_memory (cf::MAP_SWAPPED);
1701	}	2083	}
1702		2084
1703	sub reset_at {	2085	sub reset_at {
1704	my ($self) = @_;	2086	my ($self) = @_;
1705		2087
1706	# TODO: safety, remove and allow resettable per-player maps	2088	# TODO: safety, remove and allow resettable per-player maps
1707	return 1e99 if $self->isa ("ext::map_per_player");#d#
1708	return 1e99 if $self->{deny_reset};	2089	return 1e99 if $self->{deny_reset};
1709		2090
1710	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	2091	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;	2092	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712		2093
…		…
1723	my ($self) = @_;	2104	my ($self) = @_;
1724		2105
1725	my $lock = cf::lock_acquire "map_data:$self->{path}";	2106	my $lock = cf::lock_acquire "map_data:$self->{path}";
1726		2107
1727	return if $self->players;	2108	return if $self->players;
1728	return if $self->isa ("ext::map_per_player");#d#
1729		2109
1730	warn "resetting map ", $self->path;#d#	2110	warn "resetting map ", $self->path;
1731		2111
1732	$self->in_memory (cf::MAP_SWAPPED);	2112	$self->in_memory (cf::MAP_SWAPPED);
1733		2113
1734	# need to save uniques path	2114	# need to save uniques path
1735	unless ($self->{deny_save}) {	2115	unless ($self->{deny_save}) {
…		…
1739	if $uniq;	2119	if $uniq;
1740	}	2120	}
1741		2121
1742	delete $cf::MAP{$self->path};	2122	delete $cf::MAP{$self->path};
1743		2123
		2124	$self->deactivate;
		2125	$_->clear_links_to ($self) for values %cf::MAP;
1744	$self->clear;	2126	$self->clear;
1745
1746	$_->clear_links_to ($self) for values %cf::MAP;
1747		2127
1748	$self->unlink_save;	2128	$self->unlink_save;
1749	$self->destroy;	2129	$self->destroy;
1750	}	2130	}
1751		2131
1752	my $nuke_counter = "aaaa";	2132	my $nuke_counter = "aaaa";
1753		2133
1754	sub nuke {	2134	sub nuke {
1755	my ($self) = @_;	2135	my ($self) = @_;
1756		2136
		2137	{
		2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2139
1757	delete $cf::MAP{$self->path};	2140	delete $cf::MAP{$self->path};
1758		2141
1759	$self->unlink_save;	2142	$self->unlink_save;
1760		2143
1761	bless $self, "cf::map";	2144	bless $self, "cf::map";
1762	delete $self->{deny_reset};	2145	delete $self->{deny_reset};
1763	$self->{deny_save} = 1;	2146	$self->{deny_save} = 1;
1764	$self->reset_timeout (1);	2147	$self->reset_timeout (1);
1765	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2148	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766		2149
1767	$cf::MAP{$self->path} = $self;	2150	$cf::MAP{$self->path} = $self;
		2151	}
1768		2152
1769	$self->reset; # polite request, might not happen	2153	$self->reset; # polite request, might not happen
		2154	}
		2155
		2156	=item $maps = cf::map::tmp_maps
		2157
		2158	Returns an arrayref with all map paths of currently instantiated and saved
		2159	maps. May block.
		2160
		2161	=cut
		2162
		2163	sub tmp_maps() {
		2164	[
		2165	map {
		2166	utf8::decode $_;
		2167	/\.map$/
		2168	? normalise $_
		2169	: ()
		2170	} @{ aio_readdir $TMPDIR or [] }
		2171	]
		2172	}
		2173
		2174	=item $maps = cf::map::random_maps
		2175
		2176	Returns an arrayref with all map paths of currently instantiated and saved
		2177	random maps. May block.
		2178
		2179	=cut
		2180
		2181	sub random_maps() {
		2182	[
		2183	map {
		2184	utf8::decode $_;
		2185	/\.map$/
		2186	? normalise "?random/$_"
		2187	: ()
		2188	} @{ aio_readdir $RANDOMDIR or [] }
		2189	]
1770	}	2190	}
1771		2191
1772	=item cf::map::unique_maps	2192	=item cf::map::unique_maps
1773		2193
1774	Returns an arrayref of paths of all shared maps that have	2194	Returns an arrayref of paths of all shared maps that have
1775	instantiated unique items. May block.	2195	instantiated unique items. May block.
1776		2196
1777	=cut	2197	=cut
1778		2198
1779	sub unique_maps() {	2199	sub unique_maps() {
1780	my $files = aio_readdir $UNIQUEDIR	2200	[
1781	or return;	2201	map {
1782
1783	my @paths;
1784
1785	for (@$files) {
1786	utf8::decode $_;	2202	utf8::decode $_;
1787	next if /\.pst$/;	2203	/\.map$/
1788	next unless /^$PATH_SEP/o;	2204	? normalise $_
1789		2205	: ()
1790	push @paths, cf::map::normalise $_;	2206	} @{ aio_readdir $UNIQUEDIR or [] }
1791	}	2207	]
1792
1793	\@paths
1794	}	2208	}
1795		2209
1796	package cf;	2210	package cf;
1797		2211
1798	=back	2212	=back
…		…
1816	map { $_, inv_recursive_ $_->inv } @_	2230	map { $_, inv_recursive_ $_->inv } @_
1817	}	2231	}
1818		2232
1819	sub inv_recursive {	2233	sub inv_recursive {
1820	inv_recursive_ inv $_[0]	2234	inv_recursive_ inv $_[0]
		2235	}
		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	}
1821	}	2266	}
1822		2267
1823	package cf;	2268	package cf;
1824		2269
1825	=back	2270	=back
…		…
1844		2289
1845	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2290	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846		2291
1847	if ($self->{record_replies}) {	2292	if ($self->{record_replies}) {
1848	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2293	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2294
1849	} else {	2295	} else {
		2296	my $pl = $self->contr;
		2297
		2298	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2299	my $dialog = $pl->{npc_dialog};
		2300	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2301
		2302	} else {
1850	$msg = $npc->name . " says: $msg" if $npc;	2303	$msg = $npc->name . " says: $msg" if $npc;
1851	$self->message ($msg, $flags);	2304	$self->message ($msg, $flags);
		2305	}
1852	}	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 (@_);
1853	}	2317	}
1854		2318
1855	=item $player_object->may ("access")	2319	=item $player_object->may ("access")
1856		2320
1857	Returns wether the given player is authorized to access resource "access"	2321	Returns wether the given player is authorized to access resource "access"
…		…
1904	$self->deactivate_recursive;	2368	$self->deactivate_recursive;
1905		2369
1906	return if UNIVERSAL::isa $self->map, "ext::map_link";	2370	return if UNIVERSAL::isa $self->map, "ext::map_link";
1907		2371
1908	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2372	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909	if $self->map;	2373	if $self->map && $self->map->{path} ne "{link}";
1910		2374
1911	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2375	$self->enter_map ($LINK_MAP || link_map, 10, 10);
1912	}	2376	}
1913		2377
1914	sub cf::object::player::leave_link {	2378	sub cf::object::player::leave_link {
1915	my ($self, $map, $x, $y) = @_;	2379	my ($self, $map, $x, $y) = @_;
		2380
		2381	return unless $self->contr->active;
1916		2382
1917	my $link_pos = delete $self->{_link_pos};	2383	my $link_pos = delete $self->{_link_pos};
1918		2384
1919	unless ($map) {	2385	unless ($map) {
1920	# restore original map position	2386	# restore original map position
…		…
1934	# use -1 or undef as default coordinates, not 0, 0	2400	# use -1 or undef as default coordinates, not 0, 0
1935	($x, $y) = ($map->enter_x, $map->enter_y)	2401	($x, $y) = ($map->enter_x, $map->enter_y)
1936	if $x <=0 && $y <= 0;	2402	if $x <=0 && $y <= 0;
1937		2403
1938	$map->load;	2404	$map->load;
1939	$map->load_diag;	2405	$map->load_neighbours;
1940		2406
1941	return unless $self->contr->active;	2407	return unless $self->contr->active;
1942	$self->activate_recursive;	2408	$self->activate_recursive;
1943		2409
1944	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2410	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945	$self->enter_map ($map, $x, $y);	2411	$self->enter_map ($map, $x, $y);
1946	}	2412	}
1947		2413
1948	cf::player->attach (
1949	on_logout => sub {
1950	my ($pl) = @_;
1951
1952	# abort map switching before logout
1953	if ($pl->ob->{_link_pos}) {
1954	cf::sync_job {
1955	$pl->ob->leave_link
1956	};
1957	}
1958	},
1959	on_login => sub {
1960	my ($pl) = @_;
1961
1962	# try to abort aborted map switching on player login :)
1963	# should happen only on crashes
1964	if ($pl->ob->{_link_pos}) {
1965	$pl->ob->enter_link;
1966	(async {
1967	$pl->ob->reply (undef,
1968	"There was an internal problem at your last logout, "
1969	. "the server will try to bring you to your intended destination in a second.",
1970	cf::NDI_RED);
1971	# we need this sleep as the login has a concurrent enter_exit running
1972	# and this sleep increases chances of the player not ending up in scorn
1973	Coro::Timer::sleep 1;
1974	$pl->ob->leave_link;
1975	})->prio (2);
1976	}
1977	},
1978	);
1979
1980	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2414	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1981		2415
1982	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
1983	her, loading and preparing them map, calling the provided $check callback	2417	her, loading and preparing them map, calling the provided $check callback
1984	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
1985	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.
1986		2421
1987	=cut	2422	=cut
		2423
		2424	our $GOTOGEN;
1988		2425
1989	sub cf::object::player::goto {	2426	sub cf::object::player::goto {
1990	my ($self, $path, $x, $y, $check) = @_;	2427	my ($self, $path, $x, $y, $check, $done) = @_;
		2428
		2429	# do generation counting so two concurrent goto's will be executed in-order
		2430	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1991		2431
1992	$self->enter_link;	2432	$self->enter_link;
1993		2433
1994	(async {	2434	(async {
1995	my $map = eval {	2435	my $map = eval {
…		…
2008	if ($@) {	2448	if ($@) {
2009	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);	2449	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010	LOG llevError | logBacktrace, Carp::longmess $@;	2450	LOG llevError | logBacktrace, Carp::longmess $@;
2011	}	2451	}
2012		2452
		2453	if ($gen == $self->{_goto_generation}) {
		2454	delete $self->{_goto_generation};
2013	$self->leave_link ($map, $x, $y);	2455	$self->leave_link ($map, $x, $y);
		2456	}
		2457
		2458	$done->() if $done;
2014	})->prio (1);	2459	})->prio (1);
2015	}	2460	}
2016		2461
2017	=item $player_object->enter_exit ($exit_object)	2462	=item $player_object->enter_exit ($exit_object)
2018		2463
…		…
2087	my $hp = $exit->stats->hp;	2532	my $hp = $exit->stats->hp;
2088	my $sp = $exit->stats->sp;	2533	my $sp = $exit->stats->sp;
2089		2534
2090	$self->enter_link;	2535	$self->enter_link;
2091		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
2092	(async {	2541	(async {
2093	$self->deactivate_recursive; # just to be sure	2542	$self->deactivate_recursive; # just to be sure
2094	unless (eval {	2543	unless (eval {
2095	$self->goto ($slaying, $hp, $sp);	2544	$self->goto ($slaying, $hp, $sp);
2096		2545
…		…
2123		2572
2124	utf8::encode $text;	2573	utf8::encode $text;
2125	$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);
2126	}	2575	}
2127		2576
		2577	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2578
		2579	Send a drawinfo or msg packet to the client, formatting the msg for the
		2580	client if neccessary. C<$type> should be a string identifying the type of
		2581	the message, with C<log> being the default. If C<$color> is negative, suppress
		2582	the message unless the client supports the msg packet.
		2583
		2584	=cut
		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
		2601	sub cf::client::send_msg {
		2602	my ($self, $channel, $msg, $color, @extra) = @_;
		2603
		2604	$msg = $self->pl->expand_cfpod ($msg);
		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
		2624	if ($self->can_msg) {
		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]));
		2631	} else {
		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
		2647	if (0 && $msg =~ /\[/) {
		2648	# COMMAND/INFO
		2649	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2650	} else {
		2651	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2652	$self->send_packet ("drawinfo $color $msg")
		2653	}
		2654	}
		2655	}
		2656	}
		2657
2128	=item $client->ext_event ($type, %msg)	2658	=item $client->ext_msg ($type, @msg)
2129		2659
2130	Sends an exti event to the client.	2660	Sends an ext event to the client.
2131		2661
2132	=cut	2662	=cut
2133		2663
2134	sub cf::client::ext_event($$%) {	2664	sub cf::client::ext_msg($$@) {
2135	my ($self, $type, %msg) = @_;	2665	my ($self, $type, @msg) = @_;
2136		2666
		2667	if ($self->extcmd == 2) {
		2668	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2669	} elsif ($self->extcmd == 1) { # TODO: remove
2137	$msg{msgtype} = "event_$type";	2670	push @msg, msgtype => "event_$type";
2138	$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	}
2139	}	2691	}
2140		2692
2141	=item $success = $client->query ($flags, "text", \&cb)	2693	=item $success = $client->query ($flags, "text", \&cb)
2142		2694
2143	Queues a query to the client, calling the given callback with	2695	Queues a query to the client, calling the given callback with
2144	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>,
2145	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>.
2146		2698
2147	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
2148	reliable at some point in the future.	2700	become reliable at some point in the future.
2149		2701
2150	=cut	2702	=cut
2151		2703
2152	sub cf::client::query {	2704	sub cf::client::query {
2153	my ($self, $flags, $text, $cb) = @_;	2705	my ($self, $flags, $text, $cb) = @_;
…		…
2161	utf8::encode $text;	2713	utf8::encode $text;
2162	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2714	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2163		2715
2164	$self->send_packet ($self->{query_queue}[0][0])	2716	$self->send_packet ($self->{query_queue}[0][0])
2165	if @{ $self->{query_queue} } == 1;	2717	if @{ $self->{query_queue} } == 1;
		2718
		2719	1
2166	}	2720	}
2167		2721
2168	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	},
2169	on_reply => sub {	2728	on_reply => sub {
2170	my ($ns, $msg) = @_;	2729	my ($ns, $msg) = @_;
2171		2730
2172	# this weird shuffling is so that direct followup queries	2731	# this weird shuffling is so that direct followup queries
2173	# get handled first	2732	# get handled first
…		…
2185	} else {	2744	} else {
2186	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2745	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2187	}	2746	}
2188	}	2747	}
2189	},	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	},
2190	);	2775	);
2191		2776
2192	=item $client->async (\&cb)	2777	=item $client->async (\&cb)
2193		2778
2194	Create a new coroutine, running the specified callback. The coroutine will	2779	Create a new coroutine, running the specified callback. The coroutine will
…		…
2235	our $safe = new Safe "safe";	2820	our $safe = new Safe "safe";
2236	our $safe_hole = new Safe::Hole;	2821	our $safe_hole = new Safe::Hole;
2237		2822
2238	$SIG{FPE} = 'IGNORE';	2823	$SIG{FPE} = 'IGNORE';
2239		2824
2240	$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	));
2241		2830
2242	# here we export the classes and methods available to script code	2831	# here we export the classes and methods available to script code
2243		2832
2244	=pod	2833	=pod
2245		2834
2246	The following functions and methods are available within a safe environment:	2835	The following functions and methods are available within a safe environment:
2247		2836
2248	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
2249	cf::object::player player	2841	cf::object::player
2250	cf::player peaceful	2842	player
2251	cf::map trigger	2843
		2844	cf::player
		2845	peaceful
		2846
		2847	cf::map
		2848	trigger
2252		2849
2253	=cut	2850	=cut
2254		2851
2255	for (	2852	for (
2256	["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)],
2257	["cf::object::player" => qw(player)],	2856	["cf::object::player" => qw(player)],
2258	["cf::player" => qw(peaceful)],	2857	["cf::player" => qw(peaceful)],
2259	["cf::map" => qw(trigger)],	2858	["cf::map" => qw(trigger)],
2260	) {	2859	) {
2261	no strict 'refs';	2860	no strict 'refs';
…		…
2332	=back	2931	=back
2333		2932
2334	=cut	2933	=cut
2335		2934
2336	#############################################################################	2935	#############################################################################
2337
2338	=head2 EXTENSION DATABASE SUPPORT
2339
2340	Crossfire maintains a very simple database for extension use. It can
2341	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2342	convert to/from binary).
2343
2344	The parameter C<$family> should best start with the name of the extension
2345	using it, it should be unique.
2346
2347	=over 4
2348
2349	=item $value = cf::db_get $family => $key
2350
2351	Returns a single value from the database.
2352
2353	=item cf::db_put $family => $key => $value
2354
2355	Stores the given C<$value> in the family.
2356
2357	=cut
2358
2359	our $DB;
2360
2361	sub db_init {
2362	unless ($DB) {
2363	$DB = BDB::db_create $DB_ENV;
2364
2365	cf::sync_job {
2366	eval {
2367	$DB->set_flags (BDB::CHKSUM);
2368
2369	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2370	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2371	cf::cleanup "db_open(db): $!" if $!;
2372	};
2373	cf::cleanup "db_open(db): $@" if $@;
2374	};
2375	}
2376	}
2377
2378	sub db_get($$) {
2379	my $key = "$_[0]/$_[1]";
2380
2381	cf::sync_job {
2382	BDB::db_get $DB, undef, $key, my $data;
2383
2384	$! ? ()
2385	: $data
2386	}
2387	}
2388
2389	sub db_put($$$) {
2390	BDB::dbreq_pri 4;
2391	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2392	}
2393
2394	=item cf::cache $id => [$paths...], $processversion => $process
2395
2396	Generic caching function that returns the value of the resource $id,
2397	caching and regenerating as required.
2398
2399	This function can block.
2400
2401	=cut
2402
2403	sub cache {
2404	my ($id, $src, $processversion, $process) = @_;
2405
2406	my $meta =
2407	join "\x00",
2408	$processversion,
2409	map {
2410	aio_stat $_
2411	and Carp::croak "$_: $!";
2412
2413	($_, (stat _)[7,9])
2414	} @$src;
2415
2416	my $dbmeta = db_get cache => "$id/meta";
2417	if ($dbmeta ne $meta) {
2418	# changed, we may need to process
2419
2420	my @data;
2421	my $md5;
2422
2423	for (0 .. $#$src) {
2424	0 <= aio_load $src->[$_], $data[$_]
2425	or Carp::croak "$src->[$_]: $!";
2426	}
2427
2428	# if processing is expensive, check
2429	# checksum first
2430	if (1) {
2431	$md5 =
2432	join "\x00",
2433	$processversion,
2434	map {
2435	Coro::cede;
2436	($src->[$_], Digest::MD5::md5_hex $data[$_])
2437	} 0.. $#$src;
2438
2439
2440	my $dbmd5 = db_get cache => "$id/md5";
2441	if ($dbmd5 eq $md5) {
2442	db_put cache => "$id/meta", $meta;
2443
2444	return db_get cache => "$id/data";
2445	}
2446	}
2447
2448	my $t1 = Time::HiRes::time;
2449	my $data = $process->(\@data);
2450	my $t2 = Time::HiRes::time;
2451
2452	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2453
2454	db_put cache => "$id/data", $data;
2455	db_put cache => "$id/md5" , $md5;
2456	db_put cache => "$id/meta", $meta;
2457
2458	return $data;
2459	}
2460
2461	db_get cache => "$id/data"
2462	}
2463
2464	=item fork_call { }, $args
2465
2466	Executes the given code block with the given arguments in a seperate
2467	process, returning the results. Everything must be serialisable with
2468	Coro::Storable. May, of course, block. Note that the executed sub may
2469	never block itself or use any form of Event handling.
2470
2471	=cut
2472
2473	sub fork_call(&@) {
2474	my ($cb, @args) = @_;
2475
2476	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2477	# or die "socketpair: $!";
2478	pipe my $fh1, my $fh2
2479	or die "pipe: $!";
2480
2481	if (my $pid = fork) {
2482	close $fh2;
2483
2484	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2485	$res = Coro::Storable::thaw $res;
2486
2487	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2488
2489	die $$res unless "ARRAY" eq ref $res;
2490
2491	return wantarray ? @$res : $res->[-1];
2492	} else {
2493	reset_signals;
2494	local $SIG{__WARN__};
2495	local $SIG{__DIE__};
2496	eval {
2497	close $fh1;
2498
2499	my @res = eval { $cb->(@args) };
2500	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2501	};
2502
2503	warn $@ if $@;
2504	_exit 0;
2505	}
2506	}
2507
2508
2509
2510	#############################################################################
2511	# the server's init and main functions	2936	# the server's init and main functions
2512		2937
2513	sub load_facedata($) {	2938	sub load_facedata($) {
2514	my ($path) = @_;	2939	my ($path) = @_;
		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;
2515		2946
2516	warn "loading facedata from $path\n";	2947	warn "loading facedata from $path\n";
2517		2948
2518	my $facedata;	2949	my $facedata;
2519	0 < aio_load $path, $facedata	2950	0 < aio_load $path, $facedata
…		…
2522	$facedata = Coro::Storable::thaw $facedata;	2953	$facedata = Coro::Storable::thaw $facedata;
2523		2954
2524	$facedata->{version} == 2	2955	$facedata->{version} == 2
2525	or cf::cleanup "$path: version mismatch, cannot proceed.";	2956	or cf::cleanup "$path: version mismatch, cannot proceed.";
2526		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
2527	{	2965	{
2528	my $faces = $facedata->{faceinfo};	2966	my $faces = $facedata->{faceinfo};
2529		2967
2530	while (my ($face, $info) = each %$faces) {	2968	while (my ($face, $info) = each %$faces) {
2531	my $idx = (cf::face::find $face) || cf::face::alloc $face;	2969	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2532	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2970	cf::face::set_visibility $idx, $info->{visibility};
		2971	cf::face::set_magicmap $idx, $info->{magicmap};
2533	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2972	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2534	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2973	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2535	Coro::cede;	2974
		2975	cf::cede_to_tick;
2536	}	2976	}
2537		2977
2538	while (my ($face, $info) = each %$faces) {	2978	while (my ($face, $info) = each %$faces) {
2539	next unless $info->{smooth};	2979	next unless $info->{smooth};
2540	my $idx = cf::face::find $face	2980	my $idx = cf::face::find $face
2541	or next;	2981	or next;
2542	if (my $smooth = cf::face::find $info->{smooth}) {	2982	if (my $smooth = cf::face::find $info->{smooth}) {
		2983	cf::face::set_smooth $idx, $smooth;
2543	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2984	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2544	} else {	2985	} else {
2545	warn "smooth face '$info->{smooth}' not found for face '$face'";	2986	warn "smooth face '$info->{smooth}' not found for face '$face'";
2546	}	2987	}
2547	Coro::cede;	2988
		2989	cf::cede_to_tick;
2548	}	2990	}
2549	}	2991	}
2550		2992
2551	{	2993	{
2552	my $anims = $facedata->{animinfo};	2994	my $anims = $facedata->{animinfo};
2553		2995
2554	while (my ($anim, $info) = each %$anims) {	2996	while (my ($anim, $info) = each %$anims) {
2555	cf::anim::set $anim, $info->{frames}, $info->{facings};	2997	cf::anim::set $anim, $info->{frames}, $info->{facings};
2556	Coro::cede;	2998	cf::cede_to_tick;
2557	}	2999	}
2558		3000
2559	cf::anim::invalidate_all; # d'oh	3001	cf::anim::invalidate_all; # d'oh
2560	}	3002	}
2561		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
2562	1	3053	1
2563	}	3054	}
2564		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
2565	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
2566	load_resource_file "$MAPDIR/regions"	3069	load_resource_file "$MAPDIR/regions"
2567	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	}
2568	}	3076	}
2569		3077
2570	sub reload_facedata {	3078	sub reload_facedata {
2571	load_facedata "$DATADIR/facedata"	3079	load_facedata "$DATADIR/facedata"
2572	or die "unable to load facedata\n";	3080	or die "unable to load facedata\n";
2573	}	3081	}
2574		3082
2575	sub reload_archetypes {	3083	sub reload_archetypes {
2576	load_resource_file "$DATADIR/archetypes"	3084	load_resource_file "$DATADIR/archetypes"
2577	or die "unable to load archetypes\n";	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)
		3089	load_resource_file "$DATADIR/archetypes"
		3090	or die "unable to load archetypes\n";
2578	}	3091	}
2579		3092
2580	sub reload_treasures {	3093	sub reload_treasures {
2581	load_resource_file "$DATADIR/treasures"	3094	load_resource_file "$DATADIR/treasures"
2582	or die "unable to load treasurelists\n";	3095	or die "unable to load treasurelists\n";
…		…
2585	sub reload_resources {	3098	sub reload_resources {
2586	warn "reloading resource files...\n";	3099	warn "reloading resource files...\n";
2587		3100
2588	reload_regions;	3101	reload_regions;
2589	reload_facedata;	3102	reload_facedata;
		3103	#reload_archetypes;#d#
2590	reload_archetypes;	3104	reload_archetypes;
2591	reload_treasures;	3105	reload_treasures;
2592		3106
2593	warn "finished reloading resource files\n";	3107	warn "finished reloading resource files\n";
2594	}	3108	}
2595		3109
2596	sub init {	3110	sub init {
2597	reload_resources;	3111	reload_resources;
2598	}	3112	}
2599		3113
2600	sub cfg_load {	3114	sub reload_config {
2601	open my $fh, "<:utf8", "$CONFDIR/config"	3115	open my $fh, "<:utf8", "$CONFDIR/config"
2602	or return;	3116	or return;
2603		3117
2604	local $/;	3118	local $/;
2605	*CFG = YAML::Syck::Load <$fh>;	3119	*CFG = YAML::Syck::Load <$fh>;
…		…
2625	(async {	3139	(async {
2626	Event::one_event;	3140	Event::one_event;
2627	})->prio (Coro::PRIO_MAX);	3141	})->prio (Coro::PRIO_MAX);
2628	};	3142	};
2629		3143
2630	cfg_load;	3144	reload_config;
2631	db_init;	3145	db_init;
2632	load_extensions;	3146	load_extensions;
2633		3147
2634	$TICK_WATCHER->start;	3148	$TICK_WATCHER->start;
2635	Event::loop;	3149	Event::loop;
…		…
2651	},	3165	},
2652	);	3166	);
2653	}	3167	}
2654	}	3168	}
2655		3169
		3170	sub write_runtime {
		3171	my $runtime = "$LOCALDIR/runtime";
		3172
		3173	# first touch the runtime file to show we are still running:
		3174	# the fsync below can take a very very long time.
		3175
		3176	IO::AIO::aio_utime $runtime, undef, undef;
		3177
		3178	my $guard = cf::lock_acquire "write_runtime";
		3179
		3180	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
		3181	or return;
		3182
		3183	my $value = $cf::RUNTIME + 90 + 10;
		3184	# 10 is the runtime save interval, for a monotonic clock
		3185	# 60 allows for the watchdog to kill the server.
		3186
		3187	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		3188	and return;
		3189
		3190	# always fsync - this file is important
		3191	aio_fsync $fh
		3192	and return;
		3193
		3194	# touch it again to show we are up-to-date
		3195	aio_utime $fh, undef, undef;
		3196
		3197	close $fh
		3198	or return;
		3199
		3200	aio_rename "$runtime~", $runtime
		3201	and return;
		3202
		3203	warn "runtime file written.\n";
		3204
		3205	1
		3206	}
		3207
2656	sub emergency_save() {	3208	sub emergency_save() {
2657	my $freeze_guard = cf::freeze_mainloop;	3209	my $freeze_guard = cf::freeze_mainloop;
2658		3210
2659	warn "enter emergency perl save\n";	3211	warn "enter emergency perl save\n";
2660		3212
…		…
2735	%EXT_CORO = ();	3287	%EXT_CORO = ();
2736		3288
2737	warn "removing commands";	3289	warn "removing commands";
2738	%COMMAND = ();	3290	%COMMAND = ();
2739		3291
2740	warn "removing ext commands";	3292	warn "removing ext/exti commands";
2741	%EXTCMD = ();	3293	%EXTCMD = ();
		3294	%EXTICMD = ();
2742		3295
2743	warn "unloading/nuking all extensions";	3296	warn "unloading/nuking all extensions";
2744	for my $pkg (@EXTS) {	3297	for my $pkg (@EXTS) {
2745	warn "... unloading $pkg";	3298	warn "... unloading $pkg";
2746		3299
…		…
2789	warn "reloading cf.pm";	3342	warn "reloading cf.pm";
2790	require cf;	3343	require cf;
2791	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3344	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2792		3345
2793	warn "loading config and database again";	3346	warn "loading config and database again";
2794	cf::cfg_load;	3347	cf::reload_config;
2795		3348
2796	warn "loading extensions";	3349	warn "loading extensions";
2797	cf::load_extensions;	3350	cf::load_extensions;
2798		3351
2799	warn "reattaching attachments to objects/players";	3352	warn "reattaching attachments to objects/players";
…		…
2892	or die;	3445	or die;
2893		3446
2894	$map->width (50);	3447	$map->width (50);
2895	$map->height (50);	3448	$map->height (50);
2896	$map->alloc;	3449	$map->alloc;
2897	$map->_load_objects ("/tmp/x.map", 1);	3450	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2898	my $t = Event::time - $t;	3451	my $t = Event::time - $t;
2899		3452
2900	#next unless $t < 0.0013;#d#	3453	#next unless $t < 0.0013;#d#
2901	if ($t < $min) {	3454	if ($t < $min) {
2902	$min = $t;	3455	$min = $t;

Diff Legend

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