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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.328 by root, Wed Aug 8 06:24:30 2007 UTC

…		…
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	166	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		167
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	169	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		171
		172	=item @cf::INVOKE_RESULTS
		173
		174	This array contains the results of the last C<invoke ()> call. When
		175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		176	that call.
171		177
172	=back	178	=back
173		179
174	=cut	180	=cut
175		181
…		…
316	};	322	};
317	$TICK_WATCHER->stop;	323	$TICK_WATCHER->stop;
318	$guard	324	$guard
319	}	325	}
320		326
		327	=item cf::get_slot $time[, $priority[, $name]]
		328
		329	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		330	This call blocks and returns only when you have at least C<$time> seconds
		331	of cpu time till the next tick. The slot is only valid till the next cede.
		332
		333	The optional C<$name> can be used to identify the job to run. It might be
		334	used for statistical purposes and should identify the same time-class.
		335
		336	Useful for short background jobs.
		337
		338	=cut
		339
		340	our @SLOT_QUEUE;
		341	our $SLOT_QUEUE;
		342
		343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		344	$SLOT_QUEUE = Coro::async {
		345	my $signal = new Coro::Signal;
		346
		347	while () {
		348	next_job:
		349	my $avail = cf::till_tick;
		350	if ($avail > 0.01) {
		351	for (0 .. $#SLOT_QUEUE) {
		352	if ($SLOT_QUEUE[$_][0] < $avail) {
		353	my $job = splice @SLOT_QUEUE, $_, 1, ();
		354	$job->[2]->send;
		355	Coro::cede;
		356	goto next_job;
		357	}
		358	}
		359	}
		360
		361	if (@SLOT_QUEUE) {
		362	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		363	push @cf::WAIT_FOR_TICK, $signal;
		364	$signal->wait;
		365	} else {
		366	Coro::schedule;
		367	}
		368	}
		369	};
		370
		371	sub get_slot($;$$) {
		372	my ($time, $pri, $name) = @_;
		373
		374	$time = $TICK * .6 if $time > $TICK * .6;
		375	my $sig = new Coro::Signal;
		376
		377	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		378	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		379	$SLOT_QUEUE->ready;
		380	$sig->wait;
		381	}
		382
321	=item cf::async { BLOCK }	383	=item cf::async { BLOCK }
322		384
323	Currently the same as Coro::async_pool, meaning you cannot use	385	Currently the same as Coro::async_pool, meaning you cannot use
324	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	386	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325	thing you are allowed to do is call C<prio> on it.	387	thing you are allowed to do is call C<prio> on it.
…		…
866	";	928	";
867	die if $@;	929	die if $@;
868	}	930	}
869		931
870	our $override;	932	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	933	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		934
873	sub override {	935	sub override {
874	$override = 1;	936	$override = 1;
875	@invoke_results = ();	937	@INVOKE_RESULTS = (@_);
876	}	938	}
877		939
878	sub do_invoke {	940	sub do_invoke {
879	my $event = shift;	941	my $event = shift;
880	my $callbacks = shift;	942	my $callbacks = shift;
881		943
882	@invoke_results = ();	944	@INVOKE_RESULTS = ();
883		945
884	local $override;	946	local $override;
885		947
886	for (@$callbacks) {	948	for (@$callbacks) {
887	eval { &{$_->[1]} };	949	eval { &{$_->[1]} };
…		…
904		966
905	Generate an object-specific event with the given arguments.	967	Generate an object-specific event with the given arguments.
906		968
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	969	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	970	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	971	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		972
911	=back	973	=back
912		974
913	=cut	975	=cut
914		976
915	#############################################################################	977	#############################################################################
916	# object support	978	# object support
		979	#
		980
		981	sub _can_merge {
		982	my ($ob1, $ob2) = @_;
		983
		984	local $Storable::canonical = 1;
		985	my $fob1 = Storable::freeze $ob1;
		986	my $fob2 = Storable::freeze $ob2;
		987
		988	$fob1 eq $fob2
		989	}
917		990
918	sub reattach {	991	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	992	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	993	my ($obj) = @_;
921		994
…		…
1108	my ($pl, $buf) = @_;	1181	my ($pl, $buf) = @_;
1109		1182
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1183	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1184
1112	if (ref $msg) {	1185	if (ref $msg) {
		1186	my ($type, $reply, @payload) =
		1187	"ARRAY" eq ref $msg
		1188	? @$msg
		1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1190
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1192	my @reply = $cb->($pl, @payload);
		1193
1115	$pl->ext_reply ($msg->{msgid}, %reply);	1194	$pl->ext_reply ($reply, @reply)
1116	}	1195	if $reply;
1117	}	1196	}
1118	} else {	1197	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1199	}
1121		1200
…		…
1444	sub hintmode {	1523	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1524	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1525	$_[0]{hintmode}
1447	}	1526	}
1448		1527
1449	=item $player->ext_reply ($msgid, %msg)	1528	=item $player->ext_reply ($msgid, @msg)
1450		1529
1451	Sends an ext reply to the player.	1530	Sends an ext reply to the player.
1452		1531
1453	=cut	1532	=cut
1454		1533
1455	sub ext_reply($$%) {	1534	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1535	my ($self, $id, @msg) = @_;
1457		1536
1458	$msg{msgid} = $id;	1537	if ($self->ns->extcmd == 2) {
		1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
		1539	} elsif ($self->ns->extcmd == 1) {
		1540	#TODO: version 1, remove
		1541	unshift @msg, msgtype => "reply", msgid => $id;
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));	1542	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
		1543	}
1460	}	1544	}
1461		1545
1462	=item $player->ext_event ($type, %msg)	1546	=item $player->ext_msg ($type, @msg)
1463		1547
1464	Sends an ext event to the client.	1548	Sends an ext event to the client.
1465		1549
1466	=cut	1550	=cut
1467		1551
1468	sub ext_event($$%) {	1552	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1553	my ($self, $type, @msg) = @_;
1470		1554
1471	$self->ns->ext_event ($type, %msg);	1555	$self->ns->ext_msg ($type, @msg);
1472	}	1556	}
1473		1557
1474	=head3 cf::region	1558	=head3 cf::region
1475		1559
1476	=over 4	1560	=over 4
…		…
1489	my ($path) = @_;	1573	my ($path) = @_;
1490		1574
1491	my ($match, $specificity);	1575	my ($match, $specificity);
1492		1576
1493	for my $region (list) {	1577	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1578	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1579	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1580	if $region->specificity > $specificity;
1497	}	1581	}
1498	}	1582	}
1499		1583
…		…
1619	$self->init; # pass $1 etc.	1703	$self->init; # pass $1 etc.
1620	return $self;	1704	return $self;
1621	}	1705	}
1622	}	1706	}
1623		1707
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1708	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1709	()
1626	}	1710	}
1627		1711
1628	sub init {	1712	sub init {
1629	my ($self) = @_;	1713	my ($self) = @_;
…		…
1837	$self->set_darkness_map;	1921	$self->set_darkness_map;
1838	Coro::cede;	1922	Coro::cede;
1839	$self->activate;	1923	$self->activate;
1840	}	1924	}
1841		1925
		1926	$self->{last_save} = $cf::RUNTIME;
		1927	$self->last_access ($cf::RUNTIME);
		1928
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1929	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1930	}
1844		1931
1845	$self->post_load;	1932	$self->post_load;
1846	}	1933	}
…		…
1907		1994
1908	undef $MAP_PREFETCH{$path};	1995	undef $MAP_PREFETCH{$path};
1909	$MAP_PREFETCHER \|\|= cf::async {	1996	$MAP_PREFETCHER \|\|= cf::async {
1910	while (%MAP_PREFETCH) {	1997	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	1998	for my $path (keys %MAP_PREFETCH) {
1912	my $map = find $path	1999	if (my $map = find $path) {
1913	or next;
1914	$map->load;	2000	$map->load;
		2001	}
1915		2002
1916	delete $MAP_PREFETCH{$path};	2003	delete $MAP_PREFETCH{$path};
1917	}	2004	}
1918	}	2005	}
1919	undef $MAP_PREFETCHER;	2006	undef $MAP_PREFETCHER;
…		…
2146		2233
2147	} else {	2234	} else {
2148	my $pl = $self->contr;	2235	my $pl = $self->contr;
2149		2236
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2237	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2238	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2239	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2240
2159	} else {	2241	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2242	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2243	$self->message ($msg, $flags);
2162	}	2244	}
…		…
2256		2338
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2339	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2340	$self->enter_map ($map, $x, $y);
2259	}	2341	}
2260		2342
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2343	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2344
2263	Moves the player to the given map-path and coordinates by first freezing	2345	Moves the player to the given map-path and coordinates by first freezing
2264	her, loading and preparing them map, calling the provided $check callback	2346	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2347	that has to return the map if sucecssful, and then unfreezes the player on
2266	the new (success) or old (failed) map position.	2348	the new (success) or old (failed) map position. In either case, $done will
		2349	be called at the end of this process.
2267		2350
2268	=cut	2351	=cut
2269		2352
2270	our $GOTOGEN;	2353	our $GOTOGEN;
2271		2354
2272	sub cf::object::player::goto {	2355	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2356	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2357
2275	# do generation counting so two concurrent goto's will be executed in-order	2358	# do generation counting so two concurrent goto's will be executed in-order
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2359	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2360
2278	$self->enter_link;	2361	$self->enter_link;
…		…
2298		2381
2299	if ($gen == $self->{_goto_generation}) {	2382	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2383	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2384	$self->leave_link ($map, $x, $y);
2302	}	2385	}
		2386
		2387	$done->() if $done;
2303	})->prio (1);	2388	})->prio (1);
2304	}	2389	}
2305		2390
2306	=item $player_object->enter_exit ($exit_object)	2391	=item $player_object->enter_exit ($exit_object)
2307		2392
…		…
2416		2501
2417	utf8::encode $text;	2502	utf8::encode $text;
2418	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2503	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2419	}	2504	}
2420		2505
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2506	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2507
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2508	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2509	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2510	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2511	the message unless the client supports the msg packet.
2427		2512
2428	=cut	2513	=cut
2429		2514
2430	sub cf::client::send_msg {	2515	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2516	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2517
2433	$msg = $self->pl->expand_cfpod ($msg);	2518	$msg = $self->pl->expand_cfpod ($msg);
2434		2519
		2520	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2521
		2522	if (ref $channel) {
		2523	# send meta info to client, if not yet sent
		2524	unless (exists $self->{channel}{$channel->{id}}) {
		2525	$self->{channel}{$channel->{id}} = $channel;
		2526	$self->ext_msg (channel_info => $channel);
		2527	}
		2528
		2529	$channel = $channel->{id};
		2530	}
		2531
2435	return unless @extra \|\| length $msg;	2532	return unless @extra \|\| length $msg;
2436		2533
2437	if ($self->can_msg) {	2534	if ($self->can_msg) {
		2535	# default colour, mask it out
		2536	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2537	if $color & cf::NDI_DEF;
		2538
2438	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2539	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2540	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439	} else {	2541	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	2542	if ($color >= 0) {
		2543	# replace some tags by gcfclient-compatible ones
		2544	for ($msg) {
		2545	1 while
		2546	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2547	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2548	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2549	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2550	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2551	}
		2552
		2553	$color &= cf::NDI_COLOR_MASK;
		2554
		2555	utf8::encode $msg;
		2556
2451	if (0 && $msg =~ /\[/) {	2557	if (0 && $msg =~ /\[/) {
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2558	$self->send_packet ("drawextinfo $color 4 0 $msg")
2453	} else {	2559	} else {
2454	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2560	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2561	$self->send_packet ("drawinfo $color $msg")
2456	}	2562	}
2457	}	2563	}
2458	}	2564	}
2459	}	2565	}
2460		2566
2461	=item $client->ext_event ($type, %msg)	2567	=item $client->ext_msg ($type, @msg)
2462		2568
2463	Sends an ext event to the client.	2569	Sends an ext event to the client.
2464		2570
2465	=cut	2571	=cut
2466		2572
2467	sub cf::client::ext_event($$%) {	2573	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2574	my ($self, $type, @msg) = @_;
2469		2575
		2576	my $extcmd = $self->extcmd;
		2577
		2578	if ($extcmd == 2) {
		2579	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2580	} elsif ($extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2581	push @msg, msgtype => "event_$type";
2471	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2582	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2583	}
2472	}	2584	}
2473		2585
2474	=item $success = $client->query ($flags, "text", \&cb)	2586	=item $success = $client->query ($flags, "text", \&cb)
2475		2587
2476	Queues a query to the client, calling the given callback with	2588	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2643	my ($ns, $buf) = @_;
2532		2644
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2645	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2646
2535	if (ref $msg) {	2647	if (ref $msg) {
		2648	my ($type, $reply, @payload) =
		2649	"ARRAY" eq ref $msg
		2650	? @$msg
		2651	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2652
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2653	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2654	my @reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};	2655
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));	2656	$ns->ext_reply ($reply, @reply)
2540	}	2657	if $reply;
2541	}	2658	}
2542	} else {	2659	} else {
2543	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2660	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544	}	2661	}
2545		2662
…		…
2593	our $safe = new Safe "safe";	2710	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2711	our $safe_hole = new Safe::Hole;
2595		2712
2596	$SIG{FPE} = 'IGNORE';	2713	$SIG{FPE} = 'IGNORE';
2597		2714
2598	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2715	$safe->permit_only (Opcode::opset qw(
		2716	:base_core :base_mem :base_orig :base_math
		2717	grepstart grepwhile mapstart mapwhile
		2718	sort time
		2719	));
2599		2720
2600	# here we export the classes and methods available to script code	2721	# here we export the classes and methods available to script code
2601		2722
2602	=pod	2723	=pod
2603		2724
…		…
2618		2739
2619	=cut	2740	=cut
2620		2741
2621	for (	2742	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2743	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623	insert remove)],	2744	insert remove inv)],
2624	["cf::object::player" => qw(player)],	2745	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	2746	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	2747	["cf::map" => qw(trigger)],
2627	) {	2748	) {
2628	no strict 'refs';	2749	no strict 'refs';
…		…
2760	# TODO: for gcfclient pleasure, we should give resources	2881	# TODO: for gcfclient pleasure, we should give resources
2761	# that gcfclient doesn't grok a >10000 face index.	2882	# that gcfclient doesn't grok a >10000 face index.
2762	my $res = $facedata->{resource};	2883	my $res = $facedata->{resource};
2763	my $enc = JSON::XS->new->utf8->canonical;	2884	my $enc = JSON::XS->new->utf8->canonical;
2764		2885
		2886	my $soundconf = delete $res->{"res/sound.conf"};
		2887
2765	while (my ($name, $info) = each %$res) {	2888	while (my ($name, $info) = each %$res) {
2766	my $meta = $enc->encode ({	2889	my $meta = $enc->encode ({
2767	name => $name,	2890	name => $name,
2768	type => $info->{type},	2891	%{ $info->{meta} \|\| {} },
2769	copyright => $info->{copyright},
2770	});	2892	});
2771	my $data = pack "(w/a)", $meta, $info->{data};
2772	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774	use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
2775		2893
2776	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	2894	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
2777	cf::face::set_type $idx, 1;	2895
		2896	if ($info->{type} & 1) {
		2897	# prepend meta info
		2898
		2899	my $data = pack "(w/a)", $meta, $info->{data};
		2900	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2901
2778	cf::face::set_data $idx, 0, $data, $chk;	2902	cf::face::set_data $idx, 0, $data, $chk;
		2903	} else {
		2904	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
		2905	}
2779		2906
2780	# TODO	2907	cf::face::set_type $idx, $info->{type};
		2908
2781	cf::cede_to_tick;	2909	cf::cede_to_tick;
2782	}	2910	}
		2911
		2912	if ($soundconf) {
		2913	$soundconf = $enc->decode (delete $soundconf->{data});
		2914
		2915	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2916	my $sound = $soundconf->{compat}[$_]
		2917	or next;
		2918
		2919	my $face = cf::face::find "sound/$sound->[1]";
		2920	cf::sound::set $sound->[0] => $face;
		2921	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2922	}
		2923
		2924	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2925	my $face = cf::face::find "sound/$v";
		2926	cf::sound::set $k => $face;
		2927	}
		2928	}
2783	}	2929	}
2784		2930
2785	1	2931	1
2786	}	2932	}
		2933
		2934	register_exticmd fx_want => sub {
		2935	my ($ns, $want) = @_;
		2936
		2937	while (my ($k, $v) = each %$want) {
		2938	$ns->fx_want ($k, $v);
		2939	}
		2940	};
2787		2941
2788	sub reload_regions {	2942	sub reload_regions {
2789	load_resource_file "$MAPDIR/regions"	2943	load_resource_file "$MAPDIR/regions"
2790	or die "unable to load regions file\n";	2944	or die "unable to load regions file\n";
		2945
		2946	for (cf::region::list) {
		2947	$_->{match} = qr/$_->{match}/
		2948	if exists $_->{match};
		2949	}
2791	}	2950	}
2792		2951
2793	sub reload_facedata {	2952	sub reload_facedata {
2794	load_facedata "$DATADIR/facedata"	2953	load_facedata "$DATADIR/facedata"
2795	or die "unable to load facedata\n";	2954	or die "unable to load facedata\n";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs. Revision 1.328 by root, Wed Aug 8 06:24:30 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.328 by root, Wed Aug 8 06:24:30 2007 UTC