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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.37 by root, Thu Aug 24 14:05:22 2006 UTC vs.
Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC

…		…
11	use Event;	11	use Event;
12	$Event::Eval = 1; # no idea why this is required, but it is	12	$Event::Eval = 1; # no idea why this is required, but it is
13		13
14	use strict;	14	use strict;
15		15
		16	_reload_1;
		17
16	our %COMMAND;	18	our %COMMAND = ();
17	our @EVENT;	19	our @EVENT;
18	our %PROP_TYPE;	20	our %PROP_TYPE;
19	our %PROP_IDX;	21	our %PROP_IDX;
20	our $LIBDIR = maps_directory "perl";	22	our $LIBDIR = maps_directory "perl";
21		23
22	our $TICK = MAX_TIME * 1e-6;	24	our $TICK = MAX_TIME * 1e-6;
23	our $TICK_WATCHER;	25	our $TICK_WATCHER;
24	our $NEXT_TICK;	26	our $NEXT_TICK;
25		27
26	BEGIN {	28	BEGIN {
27	@EVENT = map lc, @EVENT;
28
29	*CORE::GLOBAL::warn = sub {	29	*CORE::GLOBAL::warn = sub {
30	my $msg = join "", @_;	30	my $msg = join "", @_;
31	$msg .= "\n"	31	$msg .= "\n"
32	unless $msg =~ /\n$/;	32	unless $msg =~ /\n$/;
33		33
…		…
68	prop_gen PLAYER_PROP => "cf::object::player";	68	prop_gen PLAYER_PROP => "cf::object::player";
69		69
70	prop_gen MAP_PROP => "cf::map";	70	prop_gen MAP_PROP => "cf::map";
71	prop_gen ARCH_PROP => "cf::arch";	71	prop_gen ARCH_PROP => "cf::arch";
72		72
73	# guessed hierarchies
74
75	@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	73	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
76	@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
77		74
78	# we bless all objects into derived classes to force a method lookup	75	# we bless all objects into (empty) derived classes to force a method lookup
79	# within the Safe compartment.	76	# within the Safe compartment.
80	for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {	77	for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
81	no strict 'refs';	78	no strict 'refs';
82	@{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	79	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
83	}	80	}
84		81
85	$Event::DIED = sub {	82	$Event::DIED = sub {
86	warn "error in event callback: @_";	83	warn "error in event callback: @_";
87	};	84	};
…		…
90	my @exts;	87	my @exts;
91	my @hook;	88	my @hook;
92	my %command;	89	my %command;
93	my %extcmd;	90	my %extcmd;
94		91
		92	#############################################################################
		93	# utility functions
		94
		95	use JSON::Syck (); # TODO# replace by JSON::PC once working
		96
		97	sub from_json($) {
		98	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
		99	JSON::Syck::Load $_[0]
		100	}
		101
		102	sub to_json($) {
		103	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
		104	JSON::Syck::Dump $_[0]
		105	}
		106
		107	#############################################################################
		108	# "new" plug-in system
		109
		110	=item $object->attach ($attachment, key => $value...)
		111
		112	=item $object->detach ($attachment)
		113
		114	Attach/detach a pre-registered attachment to an object.
		115
		116	=item $player->attach ($attachment, key => $value...)
		117
		118	=item $player->detach ($attachment)
		119
		120	Attach/detach a pre-registered attachment to a player.
		121
		122	=item $map->attach ($attachment, key => $value...)
		123
		124	=item $map->detach ($attachment)
		125
		126	Attach/detach a pre-registered attachment to a map.
		127
		128	=item cf::attach_global ...
		129
		130	Attach handlers for global events.
		131
		132	This and all following C<attach_*>-functions expect any number of the
		133	following handler/hook descriptions:
		134
		135	=over 4
		136
		137	=item prio => $number
		138
		139	Set the priority for all following handlers/hooks (unless overwritten
		140	by another C<prio> setting). Lower priority handlers get executed
		141	earlier. The default priority is C<0>, and many built-in handlers are
		142	registered at priority C<-1000>, so lower priorities should not be used
		143	unless you know what you are doing.
		144
		145	=item on_I<event> => \&cb
		146
		147	Call the given code reference whenever the named event happens (event is
		148	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
		149	handlers are recognised generally depends on the type of object these
		150	handlers attach to).
		151
		152	See F<include/eventinc.h> for the full list of events supported, and their
		153	class.
		154
		155	=item package => package::
		156
		157	Look for sub functions of the name C<< on_I<event> >> in the given
		158	package and register them. Only handlers for eevents supported by the
		159	object/class are recognised.
		160
		161	=back
		162
		163	=item cf::attach_to_type $object_type, $subtype, ...
		164
		165	Attach handlers for a specific object type (e.g. TRANSPORT) and
		166	subtype. If C<$subtype> is zero or undef, matches all objects of the given
		167	type.
		168
		169	=item cf::attach_to_objects ...
		170
		171	Attach handlers to all objects. Do not use this except for debugging or
		172	very rare events, as handlers are (obviously) called for I<all> objects in
		173	the game.
		174
		175	=item cf::attach_to_players ...
		176
		177	Attach handlers to all players.
		178
		179	=item cf::attach_to_maps ...
		180
		181	Attach handlers to all maps.
		182
		183	=item cf:register_attachment $name, ...
		184
		185	Register an attachment by name through which objects can refer to this
		186	attachment.
		187
		188	=item cf:register_map_attachment $name, ...
		189
		190	Register an attachment by name through which maps can refer to this
		191	attachment.
		192
		193	=cut
		194
		195	# the following variables are defined in .xs and must not be re-created
		196	our @CB_GLOBAL = (); # registry for all global events
		197	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
		198	our @CB_PLAYER = ();
		199	our @CB_TYPE = (); # registry for type (cf-object class) based events
		200	our @CB_MAP = ();
		201
		202	my %attachment;
		203
		204	sub _attach_cb($\%$$$) {
		205	my ($registry, $undo, $event, $prio, $cb) = @_;
		206
		207	use sort 'stable';
		208
		209	$cb = [$prio, $cb];
		210
		211	@{$registry->[$event]} = sort
		212	{ $a->[0] cmp $b->[0] }
		213	@{$registry->[$event] \|\| []}, $cb;
		214
		215	push @{$undo->{cb}}, [$event, $cb];
		216	}
		217
		218	# attach handles attaching event callbacks
		219	# the only thing the caller has to do is pass the correct
		220	# registry (== where the callback attaches to).
		221	sub _attach(\@$@) {
		222	my ($registry, $klass, @arg) = @_;
		223
		224	my $prio = 0;
		225
		226	my %undo = (
		227	registry => $registry,
		228	cb => [],
		229	);
		230
		231	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
		232
		233	while (@arg) {
		234	my $type = shift @arg;
		235
		236	if ($type eq "prio") {
		237	$prio = shift @arg;
		238
		239	} elsif ($type eq "package") {
		240	my $pkg = shift @arg;
		241
		242	while (my ($name, $id) = each %cb_id) {
		243	if (my $cb = $pkg->can ($name)) {
		244	_attach_cb $registry, %undo, $id, $prio, $cb;
		245	}
		246	}
		247
		248	} elsif (exists $cb_id{$type}) {
		249	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
		250
		251	} elsif (ref $type) {
		252	warn "attaching objects not supported, ignoring.\n";
		253
		254	} else {
		255	shift @arg;
		256	warn "attach argument '$type' not supported, ignoring.\n";
		257	}
		258	}
		259
		260	\%undo
		261	}
		262
		263	sub _attach_attachment {
		264	my ($obj, $name, %arg) = @_;
		265
		266	my $res;
		267
		268	if (my $attach = $attachment{$name}) {
		269	my $registry = $obj->registry;
		270
		271	for (@$attach) {
		272	my ($klass, @attach) = @$_;
		273	$res = _attach @$registry, $klass, @attach;
		274	}
		275
		276	$obj->{$name} = \%arg;
		277	} else {
		278	warn "object uses attachment '$name' that is not available, postponing.\n";
		279	}
		280
		281	$obj->{_attachment}{$name} = undef;
		282
		283	$res->{attachment} = $name;
		284	$res
		285	}
		286
		287	*cf::object::attach =
		288	*cf::player::attach =
		289	*cf::map::attach = sub {
		290	my ($obj, $name, %arg) = @_;
		291
		292	_attach_attachment $obj, $name, %arg;
		293	}
		294
		295	# all those should be optimised
		296	*cf::object::detach =
		297	*cf::player::detach =
		298	*cf::map::detach = sub {
		299	my ($obj, $name) = @_;
		300
		301	delete $obj->{_attachment}{$name};
		302	reattach $obj;
		303	};
		304
		305	sub attach_global {
		306	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
		307	}
		308
		309	sub attach_to_type {
		310	my $type = shift;
		311	my $subtype = shift;
		312
		313	_attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
		314	}
		315
		316	sub attach_to_objects {
		317	_attach @CB_OBJECT, KLASS_OBJECT, @_
		318	}
		319
		320	sub attach_to_players {
		321	_attach @CB_PLAYER, KLASS_PLAYER, @_
		322	}
		323
		324	sub attach_to_maps {
		325	_attach @CB_MAP, KLASS_MAP, @_
		326	}
		327
		328	sub register_attachment {
		329	my $name = shift;
		330
		331	$attachment{$name} = [[KLASS_OBJECT, @_]];
		332	}
		333
		334	sub register_map_attachment {
		335	my $name = shift;
		336
		337	$attachment{$name} = [[KLASS_MAP, @_]];
		338	}
		339
		340	our $override;
		341	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
		342
		343	sub override {
		344	$override = 1;
		345	@invoke_results = ();
		346	}
		347
		348	sub do_invoke {
		349	my $event = shift;
		350	my $callbacks = shift;
		351
		352	@invoke_results = ();
		353
		354	local $override;
		355
		356	for (@$callbacks) {
		357	eval { &{$_->[1]} };
		358
		359	if ($@) {
		360	warn "$@";
		361	warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
		362	override;
		363	}
		364
		365	return 1 if $override;
		366	}
		367
		368	0
		369	}
		370
		371	#############################################################################
		372	# object support
		373
		374	sub instantiate {
		375	my ($obj, $data) = @_;
		376
		377	$data = from_json $data;
		378
		379	for (@$data) {
		380	my ($name, $args) = @$_;
		381
		382	$obj->attach ($name, %{$args \|\| {} });
		383	}
		384	}
		385
		386	# basically do the same as instantiate, without calling instantiate
		387	sub reattach {
		388	my ($obj) = @_;
		389	my $registry = $obj->registry;
		390
		391	@$registry = ();
		392
		393	delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} \|\| {} };
		394
		395	for my $name (keys %{ $obj->{_attachment} \|\| {} }) {
		396	if (my $attach = $attachment{$name}) {
		397	for (@$attach) {
		398	my ($klass, @attach) = @$_;
		399	_attach @$registry, $klass, @attach;
		400	}
		401	} else {
		402	warn "object uses attachment '$name' that is not available, postponing.\n";
		403	}
		404	}
		405	}
		406
		407	sub object_freezer_save {
		408	my ($filename, $objs) = @_;
		409
		410	if (@$objs) {
		411	open my $fh, ">:raw", "$filename.pst~";
		412	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
		413	close $fh;
		414	chmod SAVE_MODE, "$filename.pst~";
		415	rename "$filename.pst~", "$filename.pst";
		416	} else {
		417	unlink "$filename.pst";
		418	}
		419
		420	chmod SAVE_MODE, "$filename~";
		421	rename "$filename~", $filename;
		422	}
		423
		424	sub object_thawer_load {
		425	my ($filename) = @_;
		426
		427	open my $fh, "<:raw:perlio", "$filename.pst"
		428	or return;
		429
		430	eval { local $/; (Storable::thaw <$fh>)->{objs} }
		431	}
		432
		433	attach_to_objects
		434	prio => -1000000,
		435	on_clone => sub {
		436	my ($src, $dst) = @_;
		437
		438	@{$dst->registry} = @{$src->registry};
		439
		440	%$dst = %$src;
		441
		442	%{$dst->{_attachment}} = %{$src->{_attachment}}
		443	if exists $src->{_attachment};
		444	},
		445	;
		446
		447	#############################################################################
		448	# old plug-in events
		449
95	sub inject_event {	450	sub inject_event {
96	my $extension = shift;	451	my $extension = shift;
97	my $event_code = shift;	452	my $event_code = shift;
98		453
99	my $cb = $hook[$event_code]{$extension}	454	my $cb = $hook[$event_code]{$extension}
…		…
141	}	496	}
142		497
143	sub register {	498	sub register {
144	my ($base, $pkg) = @_;	499	my ($base, $pkg) = @_;
145		500
146	for my $idx (0 .. $#EVENT) {	501	#TODO
147	if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
148	#warn "registering $EVENT[$idx] hook to '$pkg'\n";
149	$hook[$idx]{$base} = $ref;
150	}
151	}
152	}	502	}
153		503
154	sub load_extension {	504	sub load_extension {
155	my ($path) = @_;	505	my ($path) = @_;
156		506
157	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	507	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
158	my $base = $1;	508	my $base = $1;
159	my $pkg = $1;	509	my $pkg = $1;
160	$pkg =~ s/[^[:word:]]/_/g;	510	$pkg =~ s/[^[:word:]]/_/g;
161	$pkg = "cf::ext::$pkg";	511	$pkg = "ext::$pkg";
162		512
163	warn "loading '$path' into '$pkg'\n";	513	warn "loading '$path' into '$pkg'\n";
164		514
165	open my $fh, "<:utf8", $path	515	open my $fh, "<:utf8", $path
166	or die "$path: $!";	516	or die "$path: $!";
…		…
187	my ($pkg) = @_;	537	my ($pkg) = @_;
188		538
189	warn "removing extension $pkg\n";	539	warn "removing extension $pkg\n";
190		540
191	# remove hooks	541	# remove hooks
		542	#TODO
192	for my $idx (0 .. $#EVENT) {	543	# for my $idx (0 .. $#PLUGIN_EVENT) {
193	delete $hook[$idx]{$pkg};	544	# delete $hook[$idx]{$pkg};
194	}	545	# }
195		546
196	# remove commands	547	# remove commands
197	for my $name (keys %command) {	548	for my $name (keys %command) {
198	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	549	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
199		550
…		…
209	# remove extcmds	560	# remove extcmds
210	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	561	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
211	delete $extcmd{$name};	562	delete $extcmd{$name};
212	}	563	}
213		564
214	if (my $cb = $pkg->can ("on_unload")) {	565	if (my $cb = $pkg->can ("unload")) {
215	eval {	566	eval {
216	$cb->($pkg);	567	$cb->($pkg);
217	1	568	1
218	} or warn "$pkg unloaded, but with errors: $@";	569	} or warn "$pkg unloaded, but with errors: $@";
219	}	570	}
…		…
263	}	614	}
264		615
265	Symbol::delete_package $k;	616	Symbol::delete_package $k;
266	}	617	}
267		618
268	# 4. get rid of ext::, as good as possible	619	# 4. get rid of safe::, as good as possible
269	Symbol::delete_package "ext::$_"	620	Symbol::delete_package "safe::$_"
270	for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);	621	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
271		622
272	# 5. remove register_script_function callbacks	623	# 5. remove register_script_function callbacks
273	# TODO	624	# TODO
274		625
275	# 6. unload cf.pm "a bit"	626	# 6. unload cf.pm "a bit"
276	delete $INC{"cf.pm"};	627	delete $INC{"cf.pm"};
277		628
278	# don't, removes xs symbols, too	629	# don't, removes xs symbols, too,
		630	# and global variables created in xs
279	#Symbol::delete_package __PACKAGE__;	631	#Symbol::delete_package __PACKAGE__;
280		632
281	# 7. reload cf.pm	633	# 7. reload cf.pm
282	$msg->("reloading cf.pm");	634	$msg->("reloading cf.pm");
283	require cf;	635	require cf;
…		…
304	};	656	};
305	}	657	}
306	};	658	};
307		659
308	#############################################################################	660	#############################################################################
309	# utility functions
310
311	use JSON::Syck (); # TODO# replace by JSON::PC once working
312
313	sub from_json($) {
314	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
315	JSON::Syck::Load $_[0]
316	}
317
318	sub to_json($) {
319	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
320	JSON::Syck::Dump $_[0]
321	}
322
323	#############################################################################
324	# extcmd framework, basically convert ext <msg>	661	# extcmd framework, basically convert ext <msg>
325	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	662	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
326		663
327	sub on_extcmd {	664	attach_to_players
		665	on_extcmd => sub {
328	my ($pl, $buf) = @_;	666	my ($pl, $buf) = @_;
329		667
330	my $msg = eval { from_json $buf };	668	my $msg = eval { from_json $buf };
331		669
332	if (ref $msg) {	670	if (ref $msg) {
333	if (my $cb = $extcmd{$msg->{msgtype}}) {	671	if (my $cb = $extcmd{$msg->{msgtype}}) {
334	if (my %reply = $cb->[0]->($pl, $msg)) {	672	if (my %reply = $cb->[0]->($pl, $msg)) {
335	$pl->ext_reply ($msg->{msgid}, %reply);	673	$pl->ext_reply ($msg->{msgid}, %reply);
		674	}
		675	}
		676	} else {
		677	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
		678	}
		679
		680	cf::override;
		681	},
		682	;
		683
		684	#############################################################################
		685	# load/save/clean perl data associated with a map
		686
		687	*cf::mapsupport::on_clean = sub {
		688	my ($map) = @_;
		689
		690	my $path = $map->tmpname;
		691	defined $path or return;
		692
		693	unlink "$path.pst";
		694	};
		695
		696	# old style persistent data, TODO: remove #d#
		697	*cf::mapsupport::on_swapin =
		698	*cf::mapsupport::on_load = sub {
		699	my ($map) = @_;
		700
		701	my $path = $map->tmpname;
		702	$path = $map->path unless defined $path;
		703
		704	open my $fh, "<:raw", "$path.cfperl"
		705	or return; # no perl data
		706
		707	my $data = Storable::thaw do { local $/; <$fh> };
		708
		709	$data->{version} <= 1
		710	or return; # too new
		711
		712	$map->_set_obs ($data->{obs});
		713	$map->invoke (EVENT_MAP_UPGRADE);
		714	};
		715
		716	attach_to_maps prio => -10000, package => cf::mapsupport::;
		717
		718	#############################################################################
		719	# load/save perl data associated with player->ob objects
		720
		721	sub all_objects(@) {
		722	@_, map all_objects ($_->inv), @_
		723	}
		724
		725	attach_to_players
		726	on_load => sub {
		727	my ($pl, $path) = @_;
		728
		729	for my $o (all_objects $pl->ob) {
		730	if (my $value = $o->get_ob_key_value ("_perl_data")) {
		731	$o->set_ob_key_value ("_perl_data");
		732
		733	%$o = %{ Storable::thaw pack "H*", $value };
336	}	734	}
337	}	735	}
338	} else {
339	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
340	}	736	},
341		737	;
342	1
343	}
344
345	#############################################################################
346	# load/save/clean perl data associated with a map
347
348	*on_mapclean = sub {
349	my ($map) = @_;
350
351	my $path = $map->tmpname;
352	defined $path or return;
353
354	unlink "$path.cfperl";
355	};
356
357	*on_mapin =
358	*on_mapload = sub {
359	my ($map) = @_;
360
361	my $path = $map->tmpname;
362	$path = $map->path unless defined $path;
363
364	open my $fh, "<:raw", "$path.cfperl"
365	or return; # no perl data
366
367	my $data = Storable::thaw do { local $/; <$fh> };
368
369	$data->{version} <= 1
370	or return; # too new
371
372	$map->_set_obs ($data->{obs});
373	};
374
375	*on_mapout = sub {
376	my ($map) = @_;
377
378	my $path = $map->tmpname;
379	$path = $map->path unless defined $path;
380
381	my $obs = $map->_get_obs;
382
383	if (defined $obs) {
384	open my $fh, ">:raw", "$path.cfperl"
385	or die "$path.cfperl: $!";
386
387	stat $path;
388
389	print $fh Storable::nfreeze {
390	size => (stat _)[7],
391	time => (stat _)[9],
392	version => 1,
393	obs => $obs,
394	};
395
396	chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible g
397	} else {
398	unlink "$path.cfperl";
399	}
400	};
401
402	#############################################################################
403	# load/save perl data associated with player->ob objects
404
405	sub all_objects(@) {
406	@_, map all_objects ($_->inv), @_
407	}
408
409	*on_player_load = sub {
410	my ($ob, $path) = @_;
411
412	for my $o (all_objects $ob) {
413	if (my $value = $o->get_ob_key_value ("_perl_data")) {
414	$o->set_ob_key_value ("_perl_data");
415
416	%$o = %{ Storable::thaw pack "H*", $value };
417	}
418	}
419	};
420
421	*on_player_save = sub {
422	my ($ob, $path) = @_;
423
424	$_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
425	for grep %$_, all_objects $ob;
426	};
427		738
428	#############################################################################	739	#############################################################################
429	# core extensions - in perl	740	# core extensions - in perl
430		741
431	=item cf::player::exists $login	742	=item cf::player::exists $login
…		…
477	}	788	}
478		789
479	#############################################################################	790	#############################################################################
480	# map scripting support	791	# map scripting support
481		792
482	our $safe = new Safe "ext";	793	our $safe = new Safe "safe";
483	our $safe_hole = new Safe::Hole;	794	our $safe_hole = new Safe::Hole;
484		795
485	$SIG{FPE} = 'IGNORE';	796	$SIG{FPE} = 'IGNORE';
486		797
487	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	798	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
…		…
493	["cf::object::player" => qw(player)],	804	["cf::object::player" => qw(player)],
494	["cf::player" => qw(peaceful)],	805	["cf::player" => qw(peaceful)],
495	) {	806	) {
496	no strict 'refs';	807	no strict 'refs';
497	my ($pkg, @funs) = @$_;	808	my ($pkg, @funs) = @$_;
498	*{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	809	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
499	for @funs;	810	for @funs;
500	}	811	}
501		812
502	sub safe_eval($;@) {	813	sub safe_eval($;@) {
503	my ($code, %vars) = @_;	814	my ($code, %vars) = @_;
…		…
505	my $qcode = $code;	816	my $qcode = $code;
506	$qcode =~ s/"/‟/g; # not allowed in #line filenames	817	$qcode =~ s/"/‟/g; # not allowed in #line filenames
507	$qcode =~ s/\n/\\n/g;	818	$qcode =~ s/\n/\\n/g;
508		819
509	local $_;	820	local $_;
510	local @ext::cf::_safe_eval_args = values %vars;	821	local @safe::cf::_safe_eval_args = values %vars;
511		822
512	$code =	823	my $eval =
513	"do {\n"	824	"do {\n"
514	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	825	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
515	. "#line 0 \"{$qcode}\"\n"	826	. "#line 0 \"{$qcode}\"\n"
516	. $code	827	. $code
517	. "\n}"	828	. "\n}"
518	;	829	;
519		830
520	sub_generation_inc;	831	sub_generation_inc;
521	my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);	832	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
522	sub_generation_inc;	833	sub_generation_inc;
		834
		835	if ($@) {
		836	warn "$@";
		837	warn "while executing safe code '$code'\n";
		838	warn "with arguments " . (join " ", %vars) . "\n";
		839	}
523		840
524	wantarray ? @res : $res[0]	841	wantarray ? @res : $res[0]
525	}	842	}
526		843
527	sub register_script_function {	844	sub register_script_function {
528	my ($fun, $cb) = @_;	845	my ($fun, $cb) = @_;
529		846
530	no strict 'refs';	847	no strict 'refs';
531	*{"ext::$fun"} = $safe_hole->wrap ($cb);	848	*{"safe::$fun"} = $safe_hole->wrap ($cb);
532	}	849	}
533		850
534	#############################################################################	851	#############################################################################
535	# the server's main()	852	# the server's main()
536		853
537	sub run {	854	sub main {
538	Event::loop;	855	Event::loop;
539	}	856	}
540		857
541	#############################################################################	858	#############################################################################
542	# initialisation	859	# initialisation
…		…
562	$TICK_WATCHER->at ($NEXT_TICK);	879	$TICK_WATCHER->at ($NEXT_TICK);
563	$TICK_WATCHER->start;	880	$TICK_WATCHER->start;
564	},	881	},
565	);	882	);
566		883
		884	_reload_2;
		885
567	1	886	1
568		887

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.37 by root, Thu Aug 24 14:05:22 2006 UTC vs. Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.37 by root, Thu Aug 24 14:05:22 2006 UTC vs.
Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC