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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.338 by root, Tue Aug 21 01:07:47 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 1.4 ();
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;
…		…
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
…		…
306	my $guard = Coro::guard {	321	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	322	$TICK_WATCHER->start;
308	};	323	};
309	$TICK_WATCHER->stop;	324	$TICK_WATCHER->stop;
310	$guard	325	$guard
		326	}
		327
		328	=item cf::get_slot $time[, $priority[, $name]]
		329
		330	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		331	This call blocks and returns only when you have at least C<$time> seconds
		332	of cpu time till the next tick. The slot is only valid till the next cede.
		333
		334	The optional C<$name> can be used to identify the job to run. It might be
		335	used for statistical purposes and should identify the same time-class.
		336
		337	Useful for short background jobs.
		338
		339	=cut
		340
		341	our @SLOT_QUEUE;
		342	our $SLOT_QUEUE;
		343
		344	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		345	$SLOT_QUEUE = Coro::async {
		346	my $signal = new Coro::Signal;
		347
		348	while () {
		349	next_job:
		350	my $avail = cf::till_tick;
		351	if ($avail > 0.01) {
		352	for (0 .. $#SLOT_QUEUE) {
		353	if ($SLOT_QUEUE[$_][0] < $avail) {
		354	my $job = splice @SLOT_QUEUE, $_, 1, ();
		355	$job->[2]->send;
		356	Coro::cede;
		357	goto next_job;
		358	}
		359	}
		360	}
		361
		362	if (@SLOT_QUEUE) {
		363	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		364	push @cf::WAIT_FOR_TICK, $signal;
		365	$signal->wait;
		366	} else {
		367	Coro::schedule;
		368	}
		369	}
		370	};
		371
		372	sub get_slot($;$$) {
		373	my ($time, $pri, $name) = @_;
		374
		375	$time = $TICK * .6 if $time > $TICK * .6;
		376	my $sig = new Coro::Signal;
		377
		378	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		379	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		380	$SLOT_QUEUE->ready;
		381	$sig->wait;
311	}	382	}
312		383
313	=item cf::async { BLOCK }	384	=item cf::async { BLOCK }
314		385
315	Currently the same as Coro::async_pool, meaning you cannot use	386	Currently the same as Coro::async_pool, meaning you cannot use
…		…
405	=cut	476	=cut
406		477
407	sub fork_call(&@) {	478	sub fork_call(&@) {
408	my ($cb, @args) = @_;	479	my ($cb, @args) = @_;
409		480
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	481	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	482	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	483	# TODO: investigate and fix (liekly this will be rather laborious)
413	or die "pipe: $!";
414		484
415	if (my $pid = fork) {	485	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;	486	reset_signals;
428	local $SIG{__WARN__};	487	&$cb
429	local $SIG{__DIE__};	488	}, @args;
430	eval {
431	close $fh1;
432		489
433	my @res = eval { $cb->(@args) };	490	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	491	}
441		492
442	=item $value = cf::db_get $family => $key	493	=item $value = cf::db_get $family => $key
443		494
444	Returns a single value from the environment database.	495	Returns a single value from the environment database.
…		…
840	";	891	";
841	die if $@;	892	die if $@;
842	}	893	}
843		894
844	our $override;	895	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	896	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		897
847	sub override {	898	sub override {
848	$override = 1;	899	$override = 1;
849	@invoke_results = ();	900	@INVOKE_RESULTS = (@_);
850	}	901	}
851		902
852	sub do_invoke {	903	sub do_invoke {
853	my $event = shift;	904	my $event = shift;
854	my $callbacks = shift;	905	my $callbacks = shift;
855		906
856	@invoke_results = ();	907	@INVOKE_RESULTS = ();
857		908
858	local $override;	909	local $override;
859		910
860	for (@$callbacks) {	911	for (@$callbacks) {
861	eval { &{$_->[1]} };	912	eval { &{$_->[1]} };
…		…
878		929
879	Generate an object-specific event with the given arguments.	930	Generate an object-specific event with the given arguments.
880		931
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	932	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	933	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	934	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		935
885	=back	936	=back
886		937
887	=cut	938	=cut
888		939
889	#############################################################################	940	#############################################################################
890	# object support	941	# object support
		942	#
		943
		944	sub _can_merge {
		945	my ($ob1, $ob2) = @_;
		946
		947	local $Storable::canonical = 1;
		948	my $fob1 = Storable::freeze $ob1;
		949	my $fob2 = Storable::freeze $ob2;
		950
		951	$fob1 eq $fob2
		952	}
891		953
892	sub reattach {	954	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	955	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	956	my ($obj) = @_;
895		957
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1091	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1092	}
1031		1093
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1094	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1095
1034	Register a callback fro execution when the client sends an extcmd packet.	1096	Register a callback for execution when the client sends an (synchronous)
		1097	extcmd packet. Ext commands will be processed in the order they are
		1098	received by the server, like other user commands. The first argument is
		1099	the logged-in player. Ext commands can only be processed after a player
		1100	has logged in successfully.
1035		1101
1036	If the callback returns something, it is sent back as if reply was being	1102	If the callback returns something, it is sent back as if reply was being
1037	called.	1103	called.
1038		1104
		1105	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1106
		1107	Register a callback for execution when the client sends an (asynchronous)
		1108	exticmd packet. Exti commands are processed by the server as soon as they
		1109	are received, i.e. out of order w.r.t. other commands. The first argument
		1110	is a client socket. Exti commands can be received anytime, even before
		1111	log-in.
		1112
		1113	If the callback returns something, it is sent back as if reply was being
		1114	called.
		1115
1039	=cut	1116	=cut
1040		1117
1041	sub register_extcmd {	1118	sub register_extcmd {
1042	my ($name, $cb) = @_;	1119	my ($name, $cb) = @_;
1043		1120
1044	$EXTCMD{$name} = $cb;	1121	$EXTCMD{$name} = $cb;
		1122	}
		1123
		1124	sub register_exticmd {
		1125	my ($name, $cb) = @_;
		1126
		1127	$EXTICMD{$name} = $cb;
1045	}	1128	}
1046		1129
1047	cf::player->attach (	1130	cf::player->attach (
1048	on_command => sub {	1131	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1132	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1141	cf::override;
1059	},	1142	},
1060	on_extcmd => sub {	1143	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1144	my ($pl, $buf) = @_;
1062		1145
1063	my $msg = eval { from_json $buf };	1146	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1147
1065	if (ref $msg) {	1148	if (ref $msg) {
		1149	my ($type, $reply, @payload) =
		1150	"ARRAY" eq ref $msg
		1151	? @$msg
		1152	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1153
		1154	my @reply;
		1155
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1156	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1157	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1158	}
		1159
		1160	$pl->ext_reply ($reply, @reply)
		1161	if $reply;
		1162
1071	} else {	1163	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1164	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1165	}
1074		1166
1075	cf::override;	1167	cf::override;
…		…
1246	$cf::PLAYER{$login} = $self;	1338	$cf::PLAYER{$login} = $self;
1247		1339
1248	$self	1340	$self
1249	}	1341	}
1250		1342
		1343	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1344
		1345	=cut
		1346
		1347	sub send_msg {
		1348	my $ns = shift->ns
		1349	or return;
		1350	$ns->send_msg (@_);
		1351	}
		1352
1251	=item $pl->quit_character	1353	=item $pl->quit_character
1252		1354
1253	Nukes the player without looking back. If logged in, the connection will	1355	Nukes the player without looking back. If logged in, the connection will
1254	be destroyed. May block for a long time.	1356	be destroyed. May block for a long time.
1255		1357
…		…
1347	}	1449	}
1348		1450
1349	\@paths	1451	\@paths
1350	}	1452	}
1351		1453
		1454	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1455
		1456	Expand crossfire pod fragments into protocol xml.
		1457
		1458	=cut
		1459
		1460	sub expand_cfpod {
		1461	((my $self), (local $_)) = @_;
		1462
		1463	# escape & and <
		1464	s/&/&/g;
		1465	s/(?<![BIUGH])</</g;
		1466
		1467	# this is buggy, it needs to properly take care of nested <'s
		1468
		1469	1 while
		1470	# replace B<>, I<>, U<> etc.
		1471	s/B<([^\>]*)>/<b>$1<\/b>/
		1472	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1473	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1474	# replace G<male\|female> tags
		1475	\|\| s{G<([^>\|])\\|([^>])>}{
		1476	$self->gender ? $2 : $1
		1477	}ge
		1478	# replace H<hint text>
		1479	\|\| s{H<([^\>]*)>}
		1480	{
		1481	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1482	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1483	"")
		1484	[$self->{hintmode}]
		1485	}ge;
		1486
		1487	# create single paragraphs (very hackish)
		1488	s/(?<=\S)\n(?=\w)/ /g;
		1489
		1490	# compress some whitespace
		1491	s/\s+\n/\n/g; # ws line-ends
		1492	s/\n\n+/\n/g; # double lines
		1493	s/^\n+//; # beginning lines
		1494	s/\n+$//; # ending lines
		1495
		1496	$_
		1497	}
		1498
		1499	sub hintmode {
		1500	$_[0]{hintmode} = $_[1] if @_ > 1;
		1501	$_[0]{hintmode}
		1502	}
		1503
1352	=item $player->ext_reply ($msgid, %msg)	1504	=item $player->ext_reply ($msgid, @msg)
1353		1505
1354	Sends an ext reply to the player.	1506	Sends an ext reply to the player.
1355		1507
1356	=cut	1508	=cut
1357		1509
1358	sub ext_reply($$%) {	1510	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1511	my ($self, $id, @msg) = @_;
1360		1512
1361	$msg{msgid} = $id;	1513	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1514	}
1365		1515
1366	=item $player->ext_event ($type, %msg)	1516	=item $player->ext_msg ($type, @msg)
1367		1517
1368	Sends an ext event to the client.	1518	Sends an ext event to the client.
1369		1519
1370	=cut	1520	=cut
1371		1521
1372	sub ext_event($$%) {	1522	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1523	my ($self, $type, @msg) = @_;
1374		1524
1375	$self->ns->ext_event ($type, %msg);	1525	$self->ns->ext_msg ($type, @msg);
1376	}	1526	}
1377		1527
1378	=head3 cf::region	1528	=head3 cf::region
1379		1529
1380	=over 4	1530	=over 4
…		…
1393	my ($path) = @_;	1543	my ($path) = @_;
1394		1544
1395	my ($match, $specificity);	1545	my ($match, $specificity);
1396		1546
1397	for my $region (list) {	1547	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1548	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1549	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1550	if $region->specificity > $specificity;
1401	}	1551	}
1402	}	1552	}
1403		1553
…		…
1523	$self->init; # pass $1 etc.	1673	$self->init; # pass $1 etc.
1524	return $self;	1674	return $self;
1525	}	1675	}
1526	}	1676	}
1527		1677
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1678	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1679	()
1530	}	1680	}
1531		1681
1532	sub init {	1682	sub init {
1533	my ($self) = @_;	1683	my ($self) = @_;
…		…
1741	$self->set_darkness_map;	1891	$self->set_darkness_map;
1742	Coro::cede;	1892	Coro::cede;
1743	$self->activate;	1893	$self->activate;
1744	}	1894	}
1745		1895
		1896	$self->{last_save} = $cf::RUNTIME;
		1897	$self->last_access ($cf::RUNTIME);
		1898
1746	$self->in_memory (cf::MAP_IN_MEMORY);	1899	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	1900	}
1748		1901
1749	$self->post_load;	1902	$self->post_load;
1750	}	1903	}
…		…
1760		1913
1761	$self	1914	$self
1762	}	1915	}
1763		1916
1764	# find and load all maps in the 3x3 area around a map	1917	# find and load all maps in the 3x3 area around a map
1765	sub load_diag {	1918	sub load_neighbours {
1766	my ($map) = @_;	1919	my ($map) = @_;
1767		1920
1768	my @diag; # diagonal neighbours	1921	my @neigh; # diagonal neighbours
1769		1922
1770	for (0 .. 3) {	1923	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	1924	my $neigh = $map->tile_path ($_)
1772	or next;	1925	or next;
1773	$neigh = find $neigh, $map	1926	$neigh = find $neigh, $map
1774	or next;	1927	or next;
1775	$neigh->load;	1928	$neigh->load;
1776		1929
		1930	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1931	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	1932	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	1933	}
1780		1934
1781	for (@diag) {	1935	for (grep defined $_->[0], @neigh) {
		1936	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	1937	my $neigh = find $path, $origin
1783	or next;	1938	or next;
1784	$neigh->load;	1939	$neigh->load;
1785	}	1940	}
1786	}	1941	}
1787		1942
…		…
1811		1966
1812	undef $MAP_PREFETCH{$path};	1967	undef $MAP_PREFETCH{$path};
1813	$MAP_PREFETCHER \|\|= cf::async {	1968	$MAP_PREFETCHER \|\|= cf::async {
1814	while (%MAP_PREFETCH) {	1969	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	1970	for my $path (keys %MAP_PREFETCH) {
1816	my $map = find $path	1971	if (my $map = find $path) {
1817	or next;
1818	$map->load;	1972	$map->load;
		1973	}
1819		1974
1820	delete $MAP_PREFETCH{$path};	1975	delete $MAP_PREFETCH{$path};
1821	}	1976	}
1822	}	1977	}
1823	undef $MAP_PREFETCHER;	1978	undef $MAP_PREFETCHER;
…		…
2050		2205
2051	} else {	2206	} else {
2052	my $pl = $self->contr;	2207	my $pl = $self->contr;
2053		2208
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2209	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2210	my $dialog = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2211	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058	);
2059		2212
2060	} else {	2213	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2214	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2215	$self->message ($msg, $flags);
2063	}	2216	}
2064	}	2217	}
		2218	}
		2219
		2220	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2221
		2222	=cut
		2223
		2224	sub cf::object::send_msg {
		2225	my $pl = shift->contr
		2226	or return;
		2227	$pl->send_msg (@_);
2065	}	2228	}
2066		2229
2067	=item $player_object->may ("access")	2230	=item $player_object->may ("access")
2068		2231
2069	Returns wether the given player is authorized to access resource "access"	2232	Returns wether the given player is authorized to access resource "access"
…		…
2148	# use -1 or undef as default coordinates, not 0, 0	2311	# use -1 or undef as default coordinates, not 0, 0
2149	($x, $y) = ($map->enter_x, $map->enter_y)	2312	($x, $y) = ($map->enter_x, $map->enter_y)
2150	if $x <=0 && $y <= 0;	2313	if $x <=0 && $y <= 0;
2151		2314
2152	$map->load;	2315	$map->load;
2153	$map->load_diag;	2316	$map->load_neighbours;
2154		2317
2155	return unless $self->contr->active;	2318	return unless $self->contr->active;
2156	$self->activate_recursive;	2319	$self->activate_recursive;
2157		2320
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2321	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2322	$self->enter_map ($map, $x, $y);
2160	}	2323	}
2161		2324
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2325	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2326
2164	Moves the player to the given map-path and coordinates by first freezing	2327	Moves the player to the given map-path and coordinates by first freezing
2165	her, loading and preparing them map, calling the provided $check callback	2328	her, loading and preparing them map, calling the provided $check callback
2166	that has to return the map if sucecssful, and then unfreezes the player on	2329	that has to return the map if sucecssful, and then unfreezes the player on
2167	the new (success) or old (failed) map position.	2330	the new (success) or old (failed) map position. In either case, $done will
		2331	be called at the end of this process.
2168		2332
2169	=cut	2333	=cut
2170		2334
2171	our $GOTOGEN;	2335	our $GOTOGEN;
2172		2336
2173	sub cf::object::player::goto {	2337	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2338	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2339
2176	# do generation counting so two concurrent goto's will be executed in-order	2340	# do generation counting so two concurrent goto's will be executed in-order
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2341	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2342
2179	$self->enter_link;	2343	$self->enter_link;
…		…
2199		2363
2200	if ($gen == $self->{_goto_generation}) {	2364	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2365	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2366	$self->leave_link ($map, $x, $y);
2203	}	2367	}
		2368
		2369	$done->() if $done;
2204	})->prio (1);	2370	})->prio (1);
2205	}	2371	}
2206		2372
2207	=item $player_object->enter_exit ($exit_object)	2373	=item $player_object->enter_exit ($exit_object)
2208		2374
…		…
2277	my $hp = $exit->stats->hp;	2443	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2444	my $sp = $exit->stats->sp;
2279		2445
2280	$self->enter_link;	2446	$self->enter_link;
2281		2447
		2448	# if exit is damned, update players death & WoR home-position
		2449	$self->contr->savebed ($slaying, $hp, $sp)
		2450	if $exit->flag (FLAG_DAMNED);
		2451
2282	(async {	2452	(async {
2283	$self->deactivate_recursive; # just to be sure	2453	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2454	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2455	$self->goto ($slaying, $hp, $sp);
2286		2456
…		…
2313		2483
2314	utf8::encode $text;	2484	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2485	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2316	}	2486	}
2317		2487
		2488	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2489
		2490	Send a drawinfo or msg packet to the client, formatting the msg for the
		2491	client if neccessary. C<$type> should be a string identifying the type of
		2492	the message, with C<log> being the default. If C<$color> is negative, suppress
		2493	the message unless the client supports the msg packet.
		2494
		2495	=cut
		2496
		2497	sub cf::client::send_msg {
		2498	my ($self, $channel, $msg, $color, @extra) = @_;
		2499
		2500	$msg = $self->pl->expand_cfpod ($msg);
		2501
		2502	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2503
		2504	if (ref $channel) {
		2505	# send meta info to client, if not yet sent
		2506	unless (exists $self->{channel}{$channel->{id}}) {
		2507	$self->{channel}{$channel->{id}} = $channel;
		2508	$self->ext_msg (channel_info => $channel);
		2509	}
		2510
		2511	$channel = $channel->{id};
		2512	}
		2513
		2514	return unless @extra \|\| length $msg;
		2515
		2516	if ($self->can_msg) {
		2517	# default colour, mask it out
		2518	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2519	if $color & cf::NDI_DEF;
		2520
		2521	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2522	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2523	} else {
		2524	if ($color >= 0) {
		2525	# replace some tags by gcfclient-compatible ones
		2526	for ($msg) {
		2527	1 while
		2528	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2529	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2530	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2531	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2532	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2533	}
		2534
		2535	$color &= cf::NDI_COLOR_MASK;
		2536
		2537	utf8::encode $msg;
		2538
		2539	if (0 && $msg =~ /\[/) {
		2540	# COMMAND/INFO
		2541	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2542	} else {
		2543	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2544	$self->send_packet ("drawinfo $color $msg")
		2545	}
		2546	}
		2547	}
		2548	}
		2549
2318	=item $client->ext_event ($type, %msg)	2550	=item $client->ext_msg ($type, @msg)
2319		2551
2320	Sends an exti event to the client.	2552	Sends an ext event to the client.
2321		2553
2322	=cut	2554	=cut
2323		2555
2324	sub cf::client::ext_event($$%) {	2556	sub cf::client::ext_msg($$@) {
2325	my ($self, $type, %msg) = @_;	2557	my ($self, $type, @msg) = @_;
2326		2558
		2559	my $extcmd = $self->extcmd;
		2560
		2561	if ($extcmd == 2) {
		2562	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2563	} elsif ($extcmd == 1) { # TODO: remove
2327	$msg{msgtype} = "event_$type";	2564	push @msg, msgtype => "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2565	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2566	}
		2567	}
		2568
		2569	=item $client->ext_reply ($msgid, @msg)
		2570
		2571	Sends an ext reply to the client.
		2572
		2573	=cut
		2574
		2575	sub cf::client::ext_reply($$@) {
		2576	my ($self, $id, @msg) = @_;
		2577
		2578	if ($self->extcmd == 2) {
		2579	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2580	} elsif ($self->ns->extcmd == 1) {
		2581	#TODO: version 1, remove
		2582	unshift @msg, msgtype => "reply", msgid => $id;
		2583	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2584	}
2329	}	2585	}
2330		2586
2331	=item $success = $client->query ($flags, "text", \&cb)	2587	=item $success = $client->query ($flags, "text", \&cb)
2332		2588
2333	Queues a query to the client, calling the given callback with	2589	Queues a query to the client, calling the given callback with
2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2590	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2591	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2592
2337	Queries can fail, so check the return code. Or don't, as queries will become	2593	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2594	become reliable at some point in the future.
2339		2595
2340	=cut	2596	=cut
2341		2597
2342	sub cf::client::query {	2598	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2599	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2607	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2608	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2609
2354	$self->send_packet ($self->{query_queue}[0][0])	2610	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2611	if @{ $self->{query_queue} } == 1;
		2612
		2613	1
2356	}	2614	}
2357		2615
2358	cf::client->attach (	2616	cf::client->attach (
		2617	on_connect => sub {
		2618	my ($ns) = @_;
		2619
		2620	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2621	},
2359	on_reply => sub {	2622	on_reply => sub {
2360	my ($ns, $msg) = @_;	2623	my ($ns, $msg) = @_;
2361		2624
2362	# this weird shuffling is so that direct followup queries	2625	# this weird shuffling is so that direct followup queries
2363	# get handled first	2626	# get handled first
…		…
2375	} else {	2638	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2639	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2640	}
2378	}	2641	}
2379	},	2642	},
		2643	on_exticmd => sub {
		2644	my ($ns, $buf) = @_;
		2645
		2646	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2647
		2648	if (ref $msg) {
		2649	my ($type, $reply, @payload) =
		2650	"ARRAY" eq ref $msg
		2651	? @$msg
		2652	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2653
		2654	my @reply;
		2655
		2656	if (my $cb = $EXTICMD{$type}) {
		2657	@reply = $cb->($ns, @payload);
		2658	}
		2659
		2660	$ns->ext_reply ($reply, @reply)
		2661	if $reply;
		2662
		2663	} else {
		2664	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2665	}
		2666
		2667	cf::override;
		2668	},
2380	);	2669	);
2381		2670
2382	=item $client->async (\&cb)	2671	=item $client->async (\&cb)
2383		2672
2384	Create a new coroutine, running the specified callback. The coroutine will	2673	Create a new coroutine, running the specified callback. The coroutine will
…		…
2425	our $safe = new Safe "safe";	2714	our $safe = new Safe "safe";
2426	our $safe_hole = new Safe::Hole;	2715	our $safe_hole = new Safe::Hole;
2427		2716
2428	$SIG{FPE} = 'IGNORE';	2717	$SIG{FPE} = 'IGNORE';
2429		2718
2430	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2719	$safe->permit_only (Opcode::opset qw(
		2720	:base_core :base_mem :base_orig :base_math
		2721	grepstart grepwhile mapstart mapwhile
		2722	sort time
		2723	));
2431		2724
2432	# here we export the classes and methods available to script code	2725	# here we export the classes and methods available to script code
2433		2726
2434	=pod	2727	=pod
2435		2728
2436	The following functions and methods are available within a safe environment:	2729	The following functions and methods are available within a safe environment:
2437		2730
2438	cf::object contr pay_amount pay_player map	2731	cf::object
		2732	contr pay_amount pay_player map x y force_find force_add
		2733	insert remove name archname title slaying race
		2734
2439	cf::object::player player	2735	cf::object::player
2440	cf::player peaceful	2736	player
2441	cf::map trigger	2737
		2738	cf::player
		2739	peaceful
		2740
		2741	cf::map
		2742	trigger
2442		2743
2443	=cut	2744	=cut
2444		2745
2445	for (	2746	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	2747	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2748	insert remove inv name archname title slaying race)],
2447	["cf::object::player" => qw(player)],	2749	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	2750	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	2751	["cf::map" => qw(trigger)],
2450	) {	2752	) {
2451	no strict 'refs';	2753	no strict 'refs';
…		…
2527	# the server's init and main functions	2829	# the server's init and main functions
2528		2830
2529	sub load_facedata($) {	2831	sub load_facedata($) {
2530	my ($path) = @_;	2832	my ($path) = @_;
2531		2833
		2834	my $enc = JSON::XS->new->utf8->canonical;
		2835
2532	warn "loading facedata from $path\n";	2836	warn "loading facedata from $path\n";
2533		2837
2534	my $facedata;	2838	my $facedata;
2535	0 < aio_load $path, $facedata	2839	0 < aio_load $path, $facedata
2536	or die "$path: $!";	2840	or die "$path: $!";
…		…
2538	$facedata = Coro::Storable::thaw $facedata;	2842	$facedata = Coro::Storable::thaw $facedata;
2539		2843
2540	$facedata->{version} == 2	2844	$facedata->{version} == 2
2541	or cf::cleanup "$path: version mismatch, cannot proceed.";	2845	or cf::cleanup "$path: version mismatch, cannot proceed.";
2542		2846
		2847	# patch in the exptable
		2848	$facedata->{resource}{"res/exp_table"} = {
		2849	type => FT_RSRC,
		2850	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2851	};
		2852	cf::cede_to_tick;
		2853
2543	{	2854	{
2544	my $faces = $facedata->{faceinfo};	2855	my $faces = $facedata->{faceinfo};
2545		2856
2546	while (my ($face, $info) = each %$faces) {	2857	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2858	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2859	cf::face::set_visibility $idx, $info->{visibility};
		2860	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2861	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2862	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551	Coro::cede;	2863
		2864	cf::cede_to_tick;
2552	}	2865	}
2553		2866
2554	while (my ($face, $info) = each %$faces) {	2867	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	2868	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	2869	my $idx = cf::face::find $face
2557	or next;	2870	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	2871	if (my $smooth = cf::face::find $info->{smooth}) {
		2872	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2873	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	2874	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	2875	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	2876	}
2563	Coro::cede;	2877
		2878	cf::cede_to_tick;
2564	}	2879	}
2565	}	2880	}
2566		2881
2567	{	2882	{
2568	my $anims = $facedata->{animinfo};	2883	my $anims = $facedata->{animinfo};
2569		2884
2570	while (my ($anim, $info) = each %$anims) {	2885	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	2886	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	2887	cf::cede_to_tick;
2573	}	2888	}
2574		2889
2575	cf::anim::invalidate_all; # d'oh	2890	cf::anim::invalidate_all; # d'oh
2576	}	2891	}
2577		2892
		2893	{
		2894	# TODO: for gcfclient pleasure, we should give resources
		2895	# that gcfclient doesn't grok a >10000 face index.
		2896	my $res = $facedata->{resource};
		2897
		2898	my $soundconf = delete $res->{"res/sound.conf"};
		2899
		2900	while (my ($name, $info) = each %$res) {
		2901	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2902	my $data;
		2903
		2904	if ($info->{type} & 1) {
		2905	# prepend meta info
		2906
		2907	my $meta = $enc->encode ({
		2908	name => $name,
		2909	%{ $info->{meta} \|\| {} },
		2910	});
		2911
		2912	$data = pack "(w/a)", $meta, $info->{data};
		2913	} else {
		2914	$data = $info->{data};
		2915	}
		2916
		2917	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		2918	cf::face::set_type $idx, $info->{type};
		2919
		2920	cf::cede_to_tick;
		2921	}
		2922
		2923	if ($soundconf) {
		2924	$soundconf = $enc->decode (delete $soundconf->{data});
		2925
		2926	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2927	my $sound = $soundconf->{compat}[$_]
		2928	or next;
		2929
		2930	my $face = cf::face::find "sound/$sound->[1]";
		2931	cf::sound::set $sound->[0] => $face;
		2932	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2933	}
		2934
		2935	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2936	my $face = cf::face::find "sound/$v";
		2937	cf::sound::set $k => $face;
		2938	}
		2939	}
		2940	}
		2941
2578	1	2942	1
2579	}	2943	}
		2944
		2945	register_exticmd fx_want => sub {
		2946	my ($ns, $want) = @_;
		2947
		2948	while (my ($k, $v) = each %$want) {
		2949	$ns->fx_want ($k, $v);
		2950	}
		2951	};
2580		2952
2581	sub reload_regions {	2953	sub reload_regions {
2582	load_resource_file "$MAPDIR/regions"	2954	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	2955	or die "unable to load regions file\n";
		2956
		2957	for (cf::region::list) {
		2958	$_->{match} = qr/$_->{match}/
		2959	if exists $_->{match};
		2960	}
2584	}	2961	}
2585		2962
2586	sub reload_facedata {	2963	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	2964	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	2965	or die "unable to load facedata\n";
2589	}	2966	}
2590		2967
2591	sub reload_archetypes {	2968	sub reload_archetypes {
		2969	load_resource_file "$DATADIR/archetypes"
		2970	or die "unable to load archetypes\n";
		2971	#d# NEED to laod twice to resolve forward references
		2972	# this really needs to be done in an extra post-pass
		2973	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	2974	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	2975	or die "unable to load archetypes\n";
2594	}	2976	}
2595		2977
2596	sub reload_treasures {	2978	sub reload_treasures {
…		…
2790	%EXT_CORO = ();	3172	%EXT_CORO = ();
2791		3173
2792	warn "removing commands";	3174	warn "removing commands";
2793	%COMMAND = ();	3175	%COMMAND = ();
2794		3176
2795	warn "removing ext commands";	3177	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3178	%EXTCMD = ();
		3179	%EXTICMD = ();
2797		3180
2798	warn "unloading/nuking all extensions";	3181	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3182	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3183	warn "... unloading $pkg";
2801		3184

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs. Revision 1.338 by root, Tue Aug 21 01:07:47 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.338 by root, Tue Aug 21 01:07:47 2007 UTC