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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 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 {
…		…
177	$msg .= "\n"	187	$msg .= "\n"
178	unless $msg =~ /\n$/;	188	unless $msg =~ /\n$/;
179		189
180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181		191
182	utf8::encode $msg;
183	LOG llevError, $msg;	192	LOG llevError, $msg;
184	};	193	};
185	}	194	}
186		195
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	246	$d
238	} \|\| "[unable to dump $_[0]: '$@']";	247	} \|\| "[unable to dump $_[0]: '$@']";
239	}	248	}
240		249
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
244		251
245	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
246		253
247	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
248		255
249	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
		257
		258	=cut
		259
		260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		261
		262	sub to_json ($) { $json_coder->encode ($_[0]) }
		263	sub from_json ($) { $json_coder->decode ($_[0]) }
250		264
251	=item cf::lock_wait $string	265	=item cf::lock_wait $string
252		266
253	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
254		268
…		…
257	Wait until the given lock is available and then acquires it and returns	271	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,	272	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	273	for example when the coroutine gets canceled), the lock is automatically
260	returned.	274	returned.
261		275
		276	Locks are not recursive, locking from the same coro twice results in a
		277	deadlocked coro.
		278
262	Lock names should begin with a unique identifier (for example, cf::map::find	279	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	280	uses map_find and cf::map::load uses map_load).
264		281
265	=item $locked = cf::lock_active $string	282	=item $locked = cf::lock_active $string
266		283
267	Return true if the lock is currently active, i.e. somebody has locked it.	284	Return true if the lock is currently active, i.e. somebody has locked it.
268		285
269	=cut	286	=cut
270		287
271	our %LOCK;	288	our %LOCK;
		289	our %LOCKER;#d#
272		290
273	sub lock_wait($) {	291	sub lock_wait($) {
274	my ($key) = @_;	292	my ($key) = @_;
		293
		294	if ($LOCKER{$key} == $Coro::current) {#d#
		295	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		296	return;#d#
		297	}#d#
275		298
276	# wait for lock, if any	299	# wait for lock, if any
277	while ($LOCK{$key}) {	300	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	301	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	302	Coro::schedule;
…		…
285		308
286	# wait, to be sure we are not locked	309	# wait, to be sure we are not locked
287	lock_wait $key;	310	lock_wait $key;
288		311
289	$LOCK{$key} = [];	312	$LOCK{$key} = [];
		313	$LOCKER{$key} = $Coro::current;#d#
290		314
291	Coro::guard {	315	Coro::guard {
		316	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	317	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	318	$_->ready for @{ delete $LOCK{$key} };
294	}	319	}
295	}	320	}
296		321
…		…
306	my $guard = Coro::guard {	331	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	332	$TICK_WATCHER->start;
308	};	333	};
309	$TICK_WATCHER->stop;	334	$TICK_WATCHER->stop;
310	$guard	335	$guard
		336	}
		337
		338	=item cf::get_slot $time[, $priority[, $name]]
		339
		340	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		341	This call blocks and returns only when you have at least C<$time> seconds
		342	of cpu time till the next tick. The slot is only valid till the next cede.
		343
		344	The optional C<$name> can be used to identify the job to run. It might be
		345	used for statistical purposes and should identify the same time-class.
		346
		347	Useful for short background jobs.
		348
		349	=cut
		350
		351	our @SLOT_QUEUE;
		352	our $SLOT_QUEUE;
		353
		354	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		355	$SLOT_QUEUE = Coro::async {
		356	my $signal = new Coro::Signal;
		357
		358	while () {
		359	next_job:
		360	my $avail = cf::till_tick;
		361	if ($avail > 0.01) {
		362	for (0 .. $#SLOT_QUEUE) {
		363	if ($SLOT_QUEUE[$_][0] < $avail) {
		364	my $job = splice @SLOT_QUEUE, $_, 1, ();
		365	$job->[2]->send;
		366	Coro::cede;
		367	goto next_job;
		368	}
		369	}
		370	}
		371
		372	if (@SLOT_QUEUE) {
		373	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		374	push @cf::WAIT_FOR_TICK, $signal;
		375	$signal->wait;
		376	} else {
		377	Coro::schedule;
		378	}
		379	}
		380	};
		381
		382	sub get_slot($;$$) {
		383	my ($time, $pri, $name) = @_;
		384
		385	$time = $TICK * .6 if $time > $TICK * .6;
		386	my $sig = new Coro::Signal;
		387
		388	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		389	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		390	$SLOT_QUEUE->ready;
		391	$sig->wait;
311	}	392	}
312		393
313	=item cf::async { BLOCK }	394	=item cf::async { BLOCK }
314		395
315	Currently the same as Coro::async_pool, meaning you cannot use	396	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	486	=cut
406		487
407	sub fork_call(&@) {	488	sub fork_call(&@) {
408	my ($cb, @args) = @_;	489	my ($cb, @args) = @_;
409		490
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	491	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	492	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	493	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		494
415	if (my $pid = fork) {	495	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;	496	reset_signals;
428	local $SIG{__WARN__};	497	&$cb
429	local $SIG{__DIE__};	498	}, @args;
430	eval {
431	close $fh1;
432		499
433	my @res = eval { $cb->(@args) };	500	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	501	}
441		502
442	=item $value = cf::db_get $family => $key	503	=item $value = cf::db_get $family => $key
443		504
444	Returns a single value from the environment database.	505	Returns a single value from the environment database.
…		…
524	if (1) {	585	if (1) {
525	$md5 =	586	$md5 =
526	join "\x00",	587	join "\x00",
527	$processversion,	588	$processversion,
528	map {	589	map {
529	Coro::cede;	590	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	591	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	592	} 0.. $#$src;
532		593
533		594
534	my $dbmd5 = db_get cache => "$id/md5";	595	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	901	";
841	die if $@;	902	die if $@;
842	}	903	}
843		904
844	our $override;	905	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	906	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		907
847	sub override {	908	sub override {
848	$override = 1;	909	$override = 1;
849	@invoke_results = ();	910	@INVOKE_RESULTS = (@_);
850	}	911	}
851		912
852	sub do_invoke {	913	sub do_invoke {
853	my $event = shift;	914	my $event = shift;
854	my $callbacks = shift;	915	my $callbacks = shift;
855		916
856	@invoke_results = ();	917	@INVOKE_RESULTS = ();
857		918
858	local $override;	919	local $override;
859		920
860	for (@$callbacks) {	921	for (@$callbacks) {
861	eval { &{$_->[1]} };	922	eval { &{$_->[1]} };
…		…
878		939
879	Generate an object-specific event with the given arguments.	940	Generate an object-specific event with the given arguments.
880		941
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	942	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	943	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	944	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		945
885	=back	946	=back
886		947
887	=cut	948	=cut
888		949
889	#############################################################################	950	#############################################################################
890	# object support	951	# object support
		952	#
		953
		954	sub _can_merge {
		955	my ($ob1, $ob2) = @_;
		956
		957	local $Storable::canonical = 1;
		958	my $fob1 = Storable::freeze $ob1;
		959	my $fob2 = Storable::freeze $ob2;
		960
		961	$fob1 eq $fob2
		962	}
891		963
892	sub reattach {	964	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	965	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	966	my ($obj) = @_;
895		967
…		…
940	);	1012	);
941		1013
942	sub object_freezer_save {	1014	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1015	my ($filename, $rdata, $objs) = @_;
944		1016
		1017	my $guard = cf::lock_acquire "io";
		1018
945	sync_job {	1019	sync_job {
946	if (length $$rdata) {	1020	if (length $$rdata) {
		1021	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1022	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1023	$decname, length $$rdata, scalar @$objs;
949		1024
950	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1025	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1026	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1027	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1028	aio_fsync $fh if $cf::USE_FSYNC;
…		…
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
		1083	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1084	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av \|\| []};	1085	$decname, length $data, scalar @{$av \|\| []};
		1086
1004	return ($data, $av);	1087	($data, $av)
1005	}	1088	}
1006		1089
1007	=head2 COMMAND CALLBACKS	1090	=head2 COMMAND CALLBACKS
1008		1091
1009	=over 4	1092	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1112	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1113	}
1031		1114
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1115	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1116
1034	Register a callback fro execution when the client sends an extcmd packet.	1117	Register a callback for execution when the client sends an (synchronous)
		1118	extcmd packet. Ext commands will be processed in the order they are
		1119	received by the server, like other user commands. The first argument is
		1120	the logged-in player. Ext commands can only be processed after a player
		1121	has logged in successfully.
1035		1122
1036	If the callback returns something, it is sent back as if reply was being	1123	If the callback returns something, it is sent back as if reply was being
1037	called.	1124	called.
1038		1125
		1126	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1127
		1128	Register a callback for execution when the client sends an (asynchronous)
		1129	exticmd packet. Exti commands are processed by the server as soon as they
		1130	are received, i.e. out of order w.r.t. other commands. The first argument
		1131	is a client socket. Exti commands can be received anytime, even before
		1132	log-in.
		1133
		1134	If the callback returns something, it is sent back as if reply was being
		1135	called.
		1136
1039	=cut	1137	=cut
1040		1138
1041	sub register_extcmd {	1139	sub register_extcmd {
1042	my ($name, $cb) = @_;	1140	my ($name, $cb) = @_;
1043		1141
1044	$EXTCMD{$name} = $cb;	1142	$EXTCMD{$name} = $cb;
		1143	}
		1144
		1145	sub register_exticmd {
		1146	my ($name, $cb) = @_;
		1147
		1148	$EXTICMD{$name} = $cb;
1045	}	1149	}
1046		1150
1047	cf::player->attach (	1151	cf::player->attach (
1048	on_command => sub {	1152	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1153	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1162	cf::override;
1059	},	1163	},
1060	on_extcmd => sub {	1164	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1165	my ($pl, $buf) = @_;
1062		1166
1063	my $msg = eval { from_json $buf };	1167	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1168
1065	if (ref $msg) {	1169	if (ref $msg) {
		1170	my ($type, $reply, @payload) =
		1171	"ARRAY" eq ref $msg
		1172	? @$msg
		1173	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1174
		1175	my @reply;
		1176
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1177	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1178	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1179	}
		1180
		1181	$pl->ext_reply ($reply, @reply)
		1182	if $reply;
		1183
1071	} else {	1184	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1185	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1186	}
1074		1187
1075	cf::override;	1188	cf::override;
…		…
1165		1278
1166	=head3 cf::player	1279	=head3 cf::player
1167		1280
1168	=over 4	1281	=over 4
1169		1282
		1283	=item cf::player::num_playing
		1284
		1285	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1286
		1287	=cut
		1288
		1289	sub num_playing {
		1290	scalar grep
		1291	$_->ob->map
		1292	&& !$_->hidden
		1293	&& !$_->ob->flag (cf::FLAG_WIZ),
		1294	cf::player::list
		1295	}
		1296
1170	=item cf::player::find $login	1297	=item cf::player::find $login
1171		1298
1172	Returns the given player object, loading it if necessary (might block).	1299	Returns the given player object, loading it if necessary (might block).
1173		1300
1174	=cut	1301	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1336	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1337	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1338	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1339	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1340
1214	my $pl = load_pl path $login	1341	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1342	or return;
		1343
		1344	$f->next;
		1345	my $pl = cf::player::load_pl $f
		1346	or return;
		1347	local $cf::PLAYER_LOADING{$login} = $pl;
		1348	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1349	$cf::PLAYER{$login} = $pl
1217	}	1350	}
1218	}	1351	}
1219	}	1352	}
1220		1353
…		…
1230		1363
1231	aio_mkdir playerdir $pl, 0770;	1364	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1365	$pl->{last_save} = $cf::RUNTIME;
1233		1366
1234	$pl->save_pl ($path);	1367	$pl->save_pl ($path);
1235	Coro::cede;	1368	cf::cede_to_tick;
1236	}	1369	}
1237		1370
1238	sub new($) {	1371	sub new($) {
1239	my ($login) = @_;	1372	my ($login) = @_;
1240		1373
…		…
1244	$self->{deny_save} = 1;	1377	$self->{deny_save} = 1;
1245		1378
1246	$cf::PLAYER{$login} = $self;	1379	$cf::PLAYER{$login} = $self;
1247		1380
1248	$self	1381	$self
		1382	}
		1383
		1384	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1385
		1386	=cut
		1387
		1388	sub send_msg {
		1389	my $ns = shift->ns
		1390	or return;
		1391	$ns->send_msg (@_);
1249	}	1392	}
1250		1393
1251	=item $pl->quit_character	1394	=item $pl->quit_character
1252		1395
1253	Nukes the player without looking back. If logged in, the connection will	1396	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1451	or return [];
1309		1452
1310	my @logins;	1453	my @logins;
1311		1454
1312	for my $login (@$dirs) {	1455	for my $login (@$dirs) {
		1456	my $path = path $login;
		1457
		1458	# a .pst is a dead give-away for a valid player
		1459	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1460	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1461	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1462	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1463	}
1316		1464
1317	utf8::decode $login;	1465	utf8::decode $login;
1318	push @logins, $login;	1466	push @logins, $login;
1319	}	1467	}
1320		1468
…		…
1358	sub expand_cfpod {	1506	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1507	((my $self), (local $_)) = @_;
1360		1508
1361	# escape & and <	1509	# escape & and <
1362	s/&/&/g;	1510	s/&/&/g;
1363	s/(?<![BIUGH])</</g;	1511	s/(?<![BIUGHT])</</g;
1364		1512
1365	# this is buggy, it needs to properly take care of nested <'s	1513	# this is buggy, it needs to properly take care of nested <'s
1366		1514
1367	1 while	1515	1 while
1368	# replace B<>, I<>, U<> etc.	1516	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1517	s/B<([^\>]*)>/<b>$1<\/b>/
1370	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1518	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1371	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1519	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1520	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male\|female> tags	1521	# replace G<male\|female> tags
1373	\|\| s{G<([^>\|])\\|([^>])>}{	1522	\|\| s{G<([^>\|])\\|([^>])>}{
1374	$self->gender ? $2 : $1	1523	$self->gender ? $2 : $1
1375	}ge	1524	}ge
1376	# replace H<hint text>	1525	# replace H<hint text>
1377	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1526	\|\| s{H<([^\>]*)>}
		1527	{
		1528	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1529	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1530	"")
		1531	[$self->{hintmode}]
		1532	}ge;
1378		1533
1379	# create single paragraphs (very hackish)	1534	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1535	s/(?<=\S)\n(?=\w)/ /g;
1381		1536
		1537	# compress some whitespace
		1538	s/\s+\n/\n/g; # ws line-ends
		1539	s/\n\n+/\n/g; # double lines
		1540	s/^\n+//; # beginning lines
		1541	s/\n+$//; # ending lines
		1542
1382	$_	1543	$_
1383	}	1544	}
1384		1545
		1546	sub hintmode {
		1547	$_[0]{hintmode} = $_[1] if @_ > 1;
		1548	$_[0]{hintmode}
		1549	}
		1550
1385	=item $player->ext_reply ($msgid, %msg)	1551	=item $player->ext_reply ($msgid, @msg)
1386		1552
1387	Sends an ext reply to the player.	1553	Sends an ext reply to the player.
1388		1554
1389	=cut	1555	=cut
1390		1556
1391	sub ext_reply($$%) {	1557	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1558	my ($self, $id, @msg) = @_;
1393		1559
1394	$msg{msgid} = $id;	1560	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1561	}
1398		1562
1399	=item $player->ext_event ($type, %msg)	1563	=item $player->ext_msg ($type, @msg)
1400		1564
1401	Sends an ext event to the client.	1565	Sends an ext event to the client.
1402		1566
1403	=cut	1567	=cut
1404		1568
1405	sub ext_event($$%) {	1569	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1570	my ($self, $type, @msg) = @_;
1407		1571
1408	$self->ns->ext_event ($type, %msg);	1572	$self->ns->ext_msg ($type, @msg);
1409	}	1573	}
1410		1574
1411	=head3 cf::region	1575	=head3 cf::region
1412		1576
1413	=over 4	1577	=over 4
…		…
1426	my ($path) = @_;	1590	my ($path) = @_;
1427		1591
1428	my ($match, $specificity);	1592	my ($match, $specificity);
1429		1593
1430	for my $region (list) {	1594	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1595	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1596	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1597	if $region->specificity > $specificity;
1434	}	1598	}
1435	}	1599	}
1436		1600
…		…
1556	$self->init; # pass $1 etc.	1720	$self->init; # pass $1 etc.
1557	return $self;	1721	return $self;
1558	}	1722	}
1559	}	1723	}
1560		1724
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1725	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1726	()
1563	}	1727	}
1564		1728
1565	sub init {	1729	sub init {
1566	my ($self) = @_;	1730	my ($self) = @_;
…		…
1629		1793
1630	sub load_header_from($) {	1794	sub load_header_from($) {
1631	my ($self, $path) = @_;	1795	my ($self, $path) = @_;
1632		1796
1633	utf8::encode $path;	1797	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1798	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1799	or return;
		1800
		1801	$self->_load_header ($f)
		1802	or return;
		1803
		1804	local $MAP_LOADING{$self->{path}} = $self;
		1805	$f->resolve_delayed_derefs;
1639		1806
1640	$self->{load_path} = $path;	1807	$self->{load_path} = $path;
1641		1808
1642	1	1809	1
1643	}	1810	}
…		…
1697	sub find {	1864	sub find {
1698	my ($path, $origin) = @_;	1865	my ($path, $origin) = @_;
1699		1866
1700	$path = normalise $path, $origin && $origin->path;	1867	$path = normalise $path, $origin && $origin->path;
1701		1868
		1869	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1870	cf::lock_wait "map_find:$path";
1703		1871
1704	$cf::MAP{$path} \|\| do {	1872	$cf::MAP{$path} \|\| do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1873	my $guard1 = cf::lock_acquire "map_find:$path";
		1874	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1875
1706	my $map = new_from_path cf::map $path	1876	my $map = new_from_path cf::map $path
1707	or return;	1877	or return;
1708		1878
1709	$map->{last_save} = $cf::RUNTIME;	1879	$map->{last_save} = $cf::RUNTIME;
1710		1880
…		…
1712	or return;	1882	or return;
1713		1883
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1884	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1885	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1886	#$cf::WAIT_FOR_TICK->wait;
		1887	undef $guard1;
		1888	undef $guard2;
1717	$map->reset;	1889	$map->reset;
1718	undef $guard;
1719	return find $path;	1890	return find $path;
1720	}	1891	}
1721		1892
1722	$cf::MAP{$path} = $map	1893	$cf::MAP{$path} = $map
1723	}	1894	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1903	local $self->{deny_reset} = 1; # loading can take a long time
1733		1904
1734	my $path = $self->{path};	1905	my $path = $self->{path};
1735		1906
1736	{	1907	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1908	my $guard = cf::lock_acquire "map_data:$path";
1738		1909
		1910	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1911	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1912
1741	$self->in_memory (cf::MAP_LOADING);	1913	$self->in_memory (cf::MAP_LOADING);
1742		1914
1743	$self->alloc;	1915	$self->alloc;
1744		1916
1745	$self->pre_load;	1917	$self->pre_load;
1746	Coro::cede;	1918	cf::cede_to_tick;
1747		1919
		1920	my $f = new_from_file cf::object::thawer $self->{load_path};
		1921	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1922	$self->_load_objects ($f)
1749	or return;	1923	or return;
1750		1924
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1925	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1926	if delete $self->{load_original};
1753		1927
1754	if (my $uniq = $self->uniq_path) {	1928	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1929	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1930	unless (aio_stat $uniq) {
		1931	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1932	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1933	$self->_load_objects ($f);
		1934	$f->resolve_delayed_derefs;
		1935	}
1759	}	1936	}
1760	}	1937	}
1761		1938
1762	Coro::cede;	1939	$f->resolve_delayed_derefs;
		1940
		1941	cf::cede_to_tick;
1763	# now do the right thing for maps	1942	# now do the right thing for maps
1764	$self->link_multipart_objects;	1943	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1944	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1945	unless $self->difficulty;
1767	Coro::cede;	1946	cf::cede_to_tick;
1768		1947
1769	unless ($self->{deny_activate}) {	1948	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1949	$self->decay_objects;
1771	$self->fix_auto_apply;	1950	$self->fix_auto_apply;
1772	$self->update_buttons;	1951	$self->update_buttons;
1773	Coro::cede;	1952	cf::cede_to_tick;
1774	$self->set_darkness_map;	1953	$self->set_darkness_map;
1775	Coro::cede;	1954	cf::cede_to_tick;
1776	$self->activate;	1955	$self->activate;
1777	}	1956	}
		1957
		1958	$self->{last_save} = $cf::RUNTIME;
		1959	$self->last_access ($cf::RUNTIME);
1778		1960
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1961	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1962	}
1781		1963
1782	$self->post_load;	1964	$self->post_load;
…		…
1793		1975
1794	$self	1976	$self
1795	}	1977	}
1796		1978
1797	# find and load all maps in the 3x3 area around a map	1979	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	1980	sub load_neighbours {
1799	my ($map) = @_;	1981	my ($map) = @_;
1800		1982
1801	my @diag; # diagonal neighbours	1983	my @neigh; # diagonal neighbours
1802		1984
1803	for (0 .. 3) {	1985	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	1986	my $neigh = $map->tile_path ($_)
1805	or next;	1987	or next;
1806	$neigh = find $neigh, $map	1988	$neigh = find $neigh, $map
1807	or next;	1989	or next;
1808	$neigh->load;	1990	$neigh->load;
1809		1991
		1992	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1993	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1994	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	1995	}
1813		1996
1814	for (@diag) {	1997	for (grep defined $_->[0], @neigh) {
		1998	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	1999	my $neigh = find $path, $origin
1816	or next;	2000	or next;
1817	$neigh->load;	2001	$neigh->load;
1818	}	2002	}
1819	}	2003	}
1820		2004
…		…
1825	}	2009	}
1826		2010
1827	sub do_load_sync {	2011	sub do_load_sync {
1828	my ($map) = @_;	2012	my ($map) = @_;
1829		2013
		2014	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2015	if $Coro::current == $Coro::main;
		2016
1830	cf::sync_job { $map->load };	2017	cf::sync_job { $map->load };
1831	}	2018	}
1832		2019
1833	our %MAP_PREFETCH;	2020	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2021	our $MAP_PREFETCHER = undef;
1835		2022
1836	sub find_async {	2023	sub find_async {
1837	my ($path, $origin) = @_;	2024	my ($path, $origin, $load) = @_;
1838		2025
1839	$path = normalise $path, $origin && $origin->{path};	2026	$path = normalise $path, $origin && $origin->{path};
1840		2027
1841	if (my $map = $cf::MAP{$path}) {	2028	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2029	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2030	}
1844		2031
1845	undef $MAP_PREFETCH{$path};	2032	$MAP_PREFETCH{$path} \|= $load;
		2033
1846	$MAP_PREFETCHER \|\|= cf::async {	2034	$MAP_PREFETCHER \|\|= cf::async {
1847	while (%MAP_PREFETCH) {	2035	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2036	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2037	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2038	$map->load if $v;
		2039	}
1852		2040
1853	delete $MAP_PREFETCH{$path};	2041	delete $MAP_PREFETCH{$k};
1854	}	2042	}
1855	}	2043	}
1856	undef $MAP_PREFETCHER;	2044	undef $MAP_PREFETCHER;
1857	};	2045	};
1858	$MAP_PREFETCHER->prio (6);	2046	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2049	}
1862		2050
1863	sub save {	2051	sub save {
1864	my ($self) = @_;	2052	my ($self) = @_;
1865		2053
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2054	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2055
1868	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
1869		2057
1870	return unless $self->dirty;	2058	return unless $self->dirty;
1871		2059
…		…
1894	my ($self) = @_;	2082	my ($self) = @_;
1895		2083
1896	# save first because save cedes	2084	# save first because save cedes
1897	$self->save;	2085	$self->save;
1898		2086
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2087	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2088
1901	return if $self->players;	2089	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2090	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2091	return if $self->{deny_save};
1904		2092
		2093	$self->in_memory (cf::MAP_SWAPPED);
		2094
		2095	$self->deactivate;
		2096	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2097	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2098	}
1908		2099
1909	sub reset_at {	2100	sub reset_at {
1910	my ($self) = @_;	2101	my ($self) = @_;
1911		2102
…		…
1943	if $uniq;	2134	if $uniq;
1944	}	2135	}
1945		2136
1946	delete $cf::MAP{$self->path};	2137	delete $cf::MAP{$self->path};
1947		2138
		2139	$self->deactivate;
		2140	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2141	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2142
1952	$self->unlink_save;	2143	$self->unlink_save;
1953	$self->destroy;	2144	$self->destroy;
1954	}	2145	}
1955		2146
1956	my $nuke_counter = "aaaa";	2147	my $nuke_counter = "aaaa";
1957		2148
1958	sub nuke {	2149	sub nuke {
1959	my ($self) = @_;	2150	my ($self) = @_;
1960		2151
		2152	{
		2153	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2154
1961	delete $cf::MAP{$self->path};	2155	delete $cf::MAP{$self->path};
1962		2156
1963	$self->unlink_save;	2157	$self->unlink_save;
1964		2158
1965	bless $self, "cf::map";	2159	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2160	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2161	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2162	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2163	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2164
1971	$cf::MAP{$self->path} = $self;	2165	$cf::MAP{$self->path} = $self;
		2166	}
1972		2167
1973	$self->reset; # polite request, might not happen	2168	$self->reset; # polite request, might not happen
1974	}	2169	}
1975		2170
1976	=item $maps = cf::map::tmp_maps	2171	=item $maps = cf::map::tmp_maps
…		…
2052		2247
2053	sub inv_recursive {	2248	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2249	inv_recursive_ inv $_[0]
2055	}	2250	}
2056		2251
		2252	=item $ref = $ob->ref
		2253
		2254	creates and returns a persistent reference to an objetc that can be stored as a string.
		2255
		2256	=item $ob = cf::object::deref ($refstring)
		2257
		2258	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2259	even if the object actually exists. May block.
		2260
		2261	=cut
		2262
		2263	sub deref {
		2264	my ($ref) = @_;
		2265
		2266	# temporary compatibility#TODO#remove
		2267	$ref =~ s{^<}{player/<};
		2268
		2269	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2270	my ($uuid, $name) = ($1, $2);
		2271	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2272	or return;
		2273	$pl->ob->uuid eq $uuid
		2274	or return;
		2275
		2276	$pl->ob
		2277	} else {
		2278	warn "$ref: cannot resolve object reference\n";
		2279	undef
		2280	}
		2281	}
		2282
2057	package cf;	2283	package cf;
2058		2284
2059	=back	2285	=back
2060		2286
2061	=head3 cf::object::player	2287	=head3 cf::object::player
…		…
2083		2309
2084	} else {	2310	} else {
2085	my $pl = $self->contr;	2311	my $pl = $self->contr;
2086		2312
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2313	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2314	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2315	$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		2316
2096	} else {	2317	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2318	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2319	$self->message ($msg, $flags);
2099	}	2320	}
2100	}	2321	}
		2322	}
		2323
		2324	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2325
		2326	=cut
		2327
		2328	sub cf::object::send_msg {
		2329	my $pl = shift->contr
		2330	or return;
		2331	$pl->send_msg (@_);
2101	}	2332	}
2102		2333
2103	=item $player_object->may ("access")	2334	=item $player_object->may ("access")
2104		2335
2105	Returns wether the given player is authorized to access resource "access"	2336	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2415	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2416	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2417	if $x <=0 && $y <= 0;
2187		2418
2188	$map->load;	2419	$map->load;
2189	$map->load_diag;	2420	$map->load_neighbours;
2190		2421
2191	return unless $self->contr->active;	2422	return unless $self->contr->active;
2192	$self->activate_recursive;	2423	$self->activate_recursive;
2193		2424
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2425	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2426	$self->enter_map ($map, $x, $y);
2196	}	2427	}
2197		2428
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2429	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2430
2200	Moves the player to the given map-path and coordinates by first freezing	2431	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	2432	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	2433	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2434	the new (success) or old (failed) map position. In either case, $done will
		2435	be called at the end of this process.
2204		2436
2205	=cut	2437	=cut
2206		2438
2207	our $GOTOGEN;	2439	our $GOTOGEN;
2208		2440
2209	sub cf::object::player::goto {	2441	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2442	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2443
2212	# do generation counting so two concurrent goto's will be executed in-order	2444	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2445	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2446
2215	$self->enter_link;	2447	$self->enter_link;
…		…
2235		2467
2236	if ($gen == $self->{_goto_generation}) {	2468	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2469	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2470	$self->leave_link ($map, $x, $y);
2239	}	2471	}
		2472
		2473	$done->() if $done;
2240	})->prio (1);	2474	})->prio (1);
2241	}	2475	}
2242		2476
2243	=item $player_object->enter_exit ($exit_object)	2477	=item $player_object->enter_exit ($exit_object)
2244		2478
…		…
2313	my $hp = $exit->stats->hp;	2547	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2548	my $sp = $exit->stats->sp;
2315		2549
2316	$self->enter_link;	2550	$self->enter_link;
2317		2551
		2552	# if exit is damned, update players death & WoR home-position
		2553	$self->contr->savebed ($slaying, $hp, $sp)
		2554	if $exit->flag (FLAG_DAMNED);
		2555
2318	(async {	2556	(async {
2319	$self->deactivate_recursive; # just to be sure	2557	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2558	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2559	$self->goto ($slaying, $hp, $sp);
2322		2560
…		…
2349		2587
2350	utf8::encode $text;	2588	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2589	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2352	}	2590	}
2353		2591
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2592	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2593
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2594	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	2595	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	2596	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2597	the message unless the client supports the msg packet.
2360		2598
2361	=cut	2599	=cut
2362		2600
		2601	our %CHANNEL = (
		2602	"c/identify" => {
		2603	id => "identify",
		2604	title => "Identify",
		2605	reply => undef,
		2606	tooltip => "Items recently identified",
		2607	},
		2608	"c/examine" => {
		2609	id => "examine",
		2610	title => "Examine",
		2611	reply => undef,
		2612	tooltip => "Signs and other items you examined",
		2613	},
		2614	);
		2615
2363	sub cf::client::send_msg {	2616	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2617	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2618
2366	$msg = $self->pl->expand_cfpod ($msg);	2619	$msg = $self->pl->expand_cfpod ($msg);
2367		2620
		2621	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2622
		2623	# check predefined channels, for the benefit of C
		2624	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2625
		2626	if (ref $channel) {
		2627	# send meta info to client, if not yet sent
		2628	unless (exists $self->{channel}{$channel->{id}}) {
		2629	$self->{channel}{$channel->{id}} = $channel;
		2630	$self->ext_msg (channel_info => $channel)
		2631	if $self->can_msg;
		2632	}
		2633
		2634	$channel = $channel->{id};
		2635	}
		2636
		2637	return unless @extra \|\| length $msg;
		2638
2368	if ($self->can_msg) {	2639	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2640	# default colour, mask it out
		2641	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2642	if $color & cf::NDI_DEF;
		2643
		2644	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2645	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2646	} 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]${2}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2647	if ($color >= 0) {
		2648	# replace some tags by gcfclient-compatible ones
		2649	for ($msg) {
		2650	1 while
		2651	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2652	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2653	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2654	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2655	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2656	}
		2657
		2658	$color &= cf::NDI_COLOR_MASK;
		2659
		2660	utf8::encode $msg;
		2661
2382	if (0 && $msg =~ /\[/) {	2662	if (0 && $msg =~ /\[/) {
		2663	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2664	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2665	} else {
2385	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2666	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2386	$self->send_packet ("drawinfo $color $msg")	2667	$self->send_packet ("drawinfo $color $msg")
2387	}	2668	}
2388	}	2669	}
2389	}	2670	}
2390	}	2671	}
2391		2672
2392	=item $client->ext_event ($type, %msg)	2673	=item $client->ext_msg ($type, @msg)
2393		2674
2394	Sends an exti event to the client.	2675	Sends an ext event to the client.
2395		2676
2396	=cut	2677	=cut
2397		2678
2398	sub cf::client::ext_event($$%) {	2679	sub cf::client::ext_msg($$@) {
2399	my ($self, $type, %msg) = @_;	2680	my ($self, $type, @msg) = @_;
2400		2681
		2682	if ($self->extcmd == 2) {
		2683	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2684	} elsif ($self->extcmd == 1) { # TODO: remove
2401	$msg{msgtype} = "event_$type";	2685	push @msg, msgtype => "event_$type";
2402	$self->send_packet ("ext " . cf::to_json \%msg);	2686	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2687	}
		2688	}
		2689
		2690	=item $client->ext_reply ($msgid, @msg)
		2691
		2692	Sends an ext reply to the client.
		2693
		2694	=cut
		2695
		2696	sub cf::client::ext_reply($$@) {
		2697	my ($self, $id, @msg) = @_;
		2698
		2699	if ($self->extcmd == 2) {
		2700	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2701	} elsif ($self->extcmd == 1) {
		2702	#TODO: version 1, remove
		2703	unshift @msg, msgtype => "reply", msgid => $id;
		2704	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2705	}
2403	}	2706	}
2404		2707
2405	=item $success = $client->query ($flags, "text", \&cb)	2708	=item $success = $client->query ($flags, "text", \&cb)
2406		2709
2407	Queues a query to the client, calling the given callback with	2710	Queues a query to the client, calling the given callback with
2408	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2711	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2712	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410		2713
2411	Queries can fail, so check the return code. Or don't, as queries will become	2714	Queries can fail, so check the return code. Or don't, as queries will
2412	reliable at some point in the future.	2715	become reliable at some point in the future.
2413		2716
2414	=cut	2717	=cut
2415		2718
2416	sub cf::client::query {	2719	sub cf::client::query {
2417	my ($self, $flags, $text, $cb) = @_;	2720	my ($self, $flags, $text, $cb) = @_;
…		…
2425	utf8::encode $text;	2728	utf8::encode $text;
2426	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2729	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427		2730
2428	$self->send_packet ($self->{query_queue}[0][0])	2731	$self->send_packet ($self->{query_queue}[0][0])
2429	if @{ $self->{query_queue} } == 1;	2732	if @{ $self->{query_queue} } == 1;
		2733
		2734	1
2430	}	2735	}
2431		2736
2432	cf::client->attach (	2737	cf::client->attach (
		2738	on_connect => sub {
		2739	my ($ns) = @_;
		2740
		2741	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2742	},
2433	on_reply => sub {	2743	on_reply => sub {
2434	my ($ns, $msg) = @_;	2744	my ($ns, $msg) = @_;
2435		2745
2436	# this weird shuffling is so that direct followup queries	2746	# this weird shuffling is so that direct followup queries
2437	# get handled first	2747	# get handled first
…		…
2449	} else {	2759	} else {
2450	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2760	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451	}	2761	}
2452	}	2762	}
2453	},	2763	},
		2764	on_exticmd => sub {
		2765	my ($ns, $buf) = @_;
		2766
		2767	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2768
		2769	if (ref $msg) {
		2770	my ($type, $reply, @payload) =
		2771	"ARRAY" eq ref $msg
		2772	? @$msg
		2773	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2774
		2775	my @reply;
		2776
		2777	if (my $cb = $EXTICMD{$type}) {
		2778	@reply = $cb->($ns, @payload);
		2779	}
		2780
		2781	$ns->ext_reply ($reply, @reply)
		2782	if $reply;
		2783
		2784	} else {
		2785	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2786	}
		2787
		2788	cf::override;
		2789	},
2454	);	2790	);
2455		2791
2456	=item $client->async (\&cb)	2792	=item $client->async (\&cb)
2457		2793
2458	Create a new coroutine, running the specified callback. The coroutine will	2794	Create a new coroutine, running the specified callback. The coroutine will
…		…
2499	our $safe = new Safe "safe";	2835	our $safe = new Safe "safe";
2500	our $safe_hole = new Safe::Hole;	2836	our $safe_hole = new Safe::Hole;
2501		2837
2502	$SIG{FPE} = 'IGNORE';	2838	$SIG{FPE} = 'IGNORE';
2503		2839
2504	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2840	$safe->permit_only (Opcode::opset qw(
		2841	:base_core :base_mem :base_orig :base_math
		2842	grepstart grepwhile mapstart mapwhile
		2843	sort time
		2844	));
2505		2845
2506	# here we export the classes and methods available to script code	2846	# here we export the classes and methods available to script code
2507		2847
2508	=pod	2848	=pod
2509		2849
2510	The following functions and methods are available within a safe environment:	2850	The following functions and methods are available within a safe environment:
2511		2851
2512	cf::object contr pay_amount pay_player map	2852	cf::object
		2853	contr pay_amount pay_player map x y force_find force_add
		2854	insert remove name archname title slaying race decrease_ob_nr
		2855
2513	cf::object::player player	2856	cf::object::player
2514	cf::player peaceful	2857	player
2515	cf::map trigger	2858
		2859	cf::player
		2860	peaceful
		2861
		2862	cf::map
		2863	trigger
2516		2864
2517	=cut	2865	=cut
2518		2866
2519	for (	2867	for (
2520	["cf::object" => qw(contr pay_amount pay_player map)],	2868	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2869	insert remove inv name archname title slaying race
		2870	decrease_ob_nr)],
2521	["cf::object::player" => qw(player)],	2871	["cf::object::player" => qw(player)],
2522	["cf::player" => qw(peaceful)],	2872	["cf::player" => qw(peaceful)],
2523	["cf::map" => qw(trigger)],	2873	["cf::map" => qw(trigger)],
2524	) {	2874	) {
2525	no strict 'refs';	2875	no strict 'refs';
…		…
2601	# the server's init and main functions	2951	# the server's init and main functions
2602		2952
2603	sub load_facedata($) {	2953	sub load_facedata($) {
2604	my ($path) = @_;	2954	my ($path) = @_;
2605		2955
		2956	# HACK to clear player env face cache, we need some signal framework
		2957	# for this (global event?)
		2958	%ext::player_env::MUSIC_FACE_CACHE = ();
		2959
		2960	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2961
2606	warn "loading facedata from $path\n";	2962	warn "loading facedata from $path\n";
2607		2963
2608	my $facedata;	2964	my $facedata;
2609	0 < aio_load $path, $facedata	2965	0 < aio_load $path, $facedata
2610	or die "$path: $!";	2966	or die "$path: $!";
…		…
2612	$facedata = Coro::Storable::thaw $facedata;	2968	$facedata = Coro::Storable::thaw $facedata;
2613		2969
2614	$facedata->{version} == 2	2970	$facedata->{version} == 2
2615	or cf::cleanup "$path: version mismatch, cannot proceed.";	2971	or cf::cleanup "$path: version mismatch, cannot proceed.";
2616		2972
		2973	# patch in the exptable
		2974	$facedata->{resource}{"res/exp_table"} = {
		2975	type => FT_RSRC,
		2976	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2977	};
		2978	cf::cede_to_tick;
		2979
2617	{	2980	{
2618	my $faces = $facedata->{faceinfo};	2981	my $faces = $facedata->{faceinfo};
2619		2982
2620	while (my ($face, $info) = each %$faces) {	2983	while (my ($face, $info) = each %$faces) {
2621	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2984	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2622	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2985	cf::face::set_visibility $idx, $info->{visibility};
		2986	cf::face::set_magicmap $idx, $info->{magicmap};
2623	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2987	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2988	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625	Coro::cede;	2989
		2990	cf::cede_to_tick;
2626	}	2991	}
2627		2992
2628	while (my ($face, $info) = each %$faces) {	2993	while (my ($face, $info) = each %$faces) {
2629	next unless $info->{smooth};	2994	next unless $info->{smooth};
2630	my $idx = cf::face::find $face	2995	my $idx = cf::face::find $face
2631	or next;	2996	or next;
2632	if (my $smooth = cf::face::find $info->{smooth}) {	2997	if (my $smooth = cf::face::find $info->{smooth}) {
		2998	cf::face::set_smooth $idx, $smooth;
2633	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2999	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634	} else {	3000	} else {
2635	warn "smooth face '$info->{smooth}' not found for face '$face'";	3001	warn "smooth face '$info->{smooth}' not found for face '$face'";
2636	}	3002	}
2637	Coro::cede;	3003
		3004	cf::cede_to_tick;
2638	}	3005	}
2639	}	3006	}
2640		3007
2641	{	3008	{
2642	my $anims = $facedata->{animinfo};	3009	my $anims = $facedata->{animinfo};
2643		3010
2644	while (my ($anim, $info) = each %$anims) {	3011	while (my ($anim, $info) = each %$anims) {
2645	cf::anim::set $anim, $info->{frames}, $info->{facings};	3012	cf::anim::set $anim, $info->{frames}, $info->{facings};
2646	Coro::cede;	3013	cf::cede_to_tick;
2647	}	3014	}
2648		3015
2649	cf::anim::invalidate_all; # d'oh	3016	cf::anim::invalidate_all; # d'oh
2650	}	3017	}
2651		3018
		3019	{
		3020	# TODO: for gcfclient pleasure, we should give resources
		3021	# that gcfclient doesn't grok a >10000 face index.
		3022	my $res = $facedata->{resource};
		3023
		3024	my $soundconf = delete $res->{"res/sound.conf"};
		3025
		3026	while (my ($name, $info) = each %$res) {
		3027	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3028	my $data;
		3029
		3030	if ($info->{type} & 1) {
		3031	# prepend meta info
		3032
		3033	my $meta = $enc->encode ({
		3034	name => $name,
		3035	%{ $info->{meta} \|\| {} },
		3036	});
		3037
		3038	$data = pack "(w/a)", $meta, $info->{data};
		3039	} else {
		3040	$data = $info->{data};
		3041	}
		3042
		3043	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3044	cf::face::set_type $idx, $info->{type};
		3045
		3046	cf::cede_to_tick;
		3047	}
		3048
		3049	if ($soundconf) {
		3050	$soundconf = $enc->decode (delete $soundconf->{data});
		3051
		3052	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3053	my $sound = $soundconf->{compat}[$_]
		3054	or next;
		3055
		3056	my $face = cf::face::find "sound/$sound->[1]";
		3057	cf::sound::set $sound->[0] => $face;
		3058	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3059	}
		3060
		3061	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3062	my $face = cf::face::find "sound/$v";
		3063	cf::sound::set $k => $face;
		3064	}
		3065	}
		3066	}
		3067
2652	1	3068	1
2653	}	3069	}
2654		3070
		3071	register_exticmd fx_want => sub {
		3072	my ($ns, $want) = @_;
		3073
		3074	while (my ($k, $v) = each %$want) {
		3075	$ns->fx_want ($k, $v);
		3076	}
		3077	};
		3078
2655	sub reload_regions {	3079	sub reload_regions {
		3080	# HACK to clear player env face cache, we need some signal framework
		3081	# for this (global event?)
		3082	%ext::player_env::MUSIC_FACE_CACHE = ();
		3083
2656	load_resource_file "$MAPDIR/regions"	3084	load_resource_file "$MAPDIR/regions"
2657	or die "unable to load regions file\n";	3085	or die "unable to load regions file\n";
		3086
		3087	for (cf::region::list) {
		3088	$_->{match} = qr/$_->{match}/
		3089	if exists $_->{match};
		3090	}
2658	}	3091	}
2659		3092
2660	sub reload_facedata {	3093	sub reload_facedata {
2661	load_facedata "$DATADIR/facedata"	3094	load_facedata "$DATADIR/facedata"
2662	or die "unable to load facedata\n";	3095	or die "unable to load facedata\n";
2663	}	3096	}
2664		3097
2665	sub reload_archetypes {	3098	sub reload_archetypes {
		3099	load_resource_file "$DATADIR/archetypes"
		3100	or die "unable to load archetypes\n";
		3101	#d# NEED to laod twice to resolve forward references
		3102	# this really needs to be done in an extra post-pass
		3103	# (which needs to be synchronous, so solve it differently)
2666	load_resource_file "$DATADIR/archetypes"	3104	load_resource_file "$DATADIR/archetypes"
2667	or die "unable to load archetypes\n";	3105	or die "unable to load archetypes\n";
2668	}	3106	}
2669		3107
2670	sub reload_treasures {	3108	sub reload_treasures {
…		…
2686		3124
2687	sub init {	3125	sub init {
2688	reload_resources;	3126	reload_resources;
2689	}	3127	}
2690		3128
2691	sub cfg_load {	3129	sub reload_config {
2692	open my $fh, "<:utf8", "$CONFDIR/config"	3130	open my $fh, "<:utf8", "$CONFDIR/config"
2693	or return;	3131	or return;
2694		3132
2695	local $/;	3133	local $/;
2696	*CFG = YAML::Syck::Load <$fh>;	3134	*CFG = YAML::Syck::Load <$fh>;
…		…
2716	(async {	3154	(async {
2717	Event::one_event;	3155	Event::one_event;
2718	})->prio (Coro::PRIO_MAX);	3156	})->prio (Coro::PRIO_MAX);
2719	};	3157	};
2720		3158
2721	cfg_load;	3159	reload_config;
2722	db_init;	3160	db_init;
2723	load_extensions;	3161	load_extensions;
2724		3162
2725	$TICK_WATCHER->start;	3163	$TICK_WATCHER->start;
2726	Event::loop;	3164	Event::loop;
…		…
2864	%EXT_CORO = ();	3302	%EXT_CORO = ();
2865		3303
2866	warn "removing commands";	3304	warn "removing commands";
2867	%COMMAND = ();	3305	%COMMAND = ();
2868		3306
2869	warn "removing ext commands";	3307	warn "removing ext/exti commands";
2870	%EXTCMD = ();	3308	%EXTCMD = ();
		3309	%EXTICMD = ();
2871		3310
2872	warn "unloading/nuking all extensions";	3311	warn "unloading/nuking all extensions";
2873	for my $pkg (@EXTS) {	3312	for my $pkg (@EXTS) {
2874	warn "... unloading $pkg";	3313	warn "... unloading $pkg";
2875		3314
…		…
2918	warn "reloading cf.pm";	3357	warn "reloading cf.pm";
2919	require cf;	3358	require cf;
2920	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3359	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921		3360
2922	warn "loading config and database again";	3361	warn "loading config and database again";
2923	cf::cfg_load;	3362	cf::reload_config;
2924		3363
2925	warn "loading extensions";	3364	warn "loading extensions";
2926	cf::load_extensions;	3365	cf::load_extensions;
2927		3366
2928	warn "reattaching attachments to objects/players";	3367	warn "reattaching attachments to objects/players";
…		…
3021	or die;	3460	or die;
3022		3461
3023	$map->width (50);	3462	$map->width (50);
3024	$map->height (50);	3463	$map->height (50);
3025	$map->alloc;	3464	$map->alloc;
3026	$map->_load_objects ("/tmp/x.map", 1);	3465	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3027	my $t = Event::time - $t;	3466	my $t = Event::time - $t;
3028		3467
3029	#next unless $t < 0.0013;#d#	3468	#next unless $t < 0.0013;#d#
3030	if ($t < $min) {	3469	if ($t < $min) {
3031	$min = $t;	3470	$min = $t;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.286 by root, Sun Jun 24 04:27:20 2007 UTC vs. Revision 1.362 by root, Mon Sep 10 12:44:06 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 2007 UTC