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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs. Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC