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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.156 by root, Tue Jan 9 22:07:08 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

…		…
33		33
34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35		35
36	our %COMMAND = ();	36	our %COMMAND = ();
37	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
		38
		39	our @EXTS = (); # list of extension package names
38	our %EXTCMD = ();	40	our %EXTCMD = ();
		41	our %EXT_CORO = (); # coroutines bound to extensions
		42	our %EXT_MAP = (); # pluggable maps
39		43
40	our @EVENT;	44	our @EVENT;
41	our $LIBDIR = datadir . "/ext";	45	our $LIBDIR = datadir . "/ext";
42		46
43	our $TICK = MAX_TIME * 1e-6;	47	our $TICK = MAX_TIME * 1e-6;
…		…
50	our $UPTIME; $UPTIME \|\|= time;	54	our $UPTIME; $UPTIME \|\|= time;
51	our $RUNTIME;	55	our $RUNTIME;
52		56
53	our %PLAYER; # all users	57	our %PLAYER; # all users
54	our %MAP; # all maps	58	our %MAP; # all maps
55	our $LINK_MAP; # the special {link} map	59	our $LINK_MAP; # the special {link} map, which is always available
56	our $RANDOM_MAPS = cf::localdir . "/random";	60	our $RANDOM_MAPS = cf::localdir . "/random";
57	our %EXT_CORO; # coroutines bound to extensions
58		61
59	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;	62	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
60	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;	63	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
		64
		65	# used to convert map paths into valid unix filenames by replacing / by ∕
		66	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61		67
62	binmode STDOUT;	68	binmode STDOUT;
63	binmode STDERR;	69	binmode STDERR;
64		70
65	# read virtual server time, if available	71	# read virtual server time, if available
…		…
73	mkdir cf::localdir . "/" . cf::playerdir;	79	mkdir cf::localdir . "/" . cf::playerdir;
74	mkdir cf::localdir . "/" . cf::tmpdir;	80	mkdir cf::localdir . "/" . cf::tmpdir;
75	mkdir cf::localdir . "/" . cf::uniquedir;	81	mkdir cf::localdir . "/" . cf::uniquedir;
76	mkdir $RANDOM_MAPS;	82	mkdir $RANDOM_MAPS;
77		83
78	# a special map that is always available
79	our $LINK_MAP;
80	our $EMERGENCY_POSITION;	84	our $EMERGENCY_POSITION;
81		85
82	#############################################################################	86	#############################################################################
83		87
84	=head2 GLOBAL VARIABLES	88	=head2 GLOBAL VARIABLES
…		…
156	}	160	}
157		161
158	$Event::DIED = sub {	162	$Event::DIED = sub {
159	warn "error in event callback: @_";	163	warn "error in event callback: @_";
160	};	164	};
161
162	my %ext_pkg;
163	my @exts;
164	my @hook;
165		165
166	=head2 UTILITY FUNCTIONS	166	=head2 UTILITY FUNCTIONS
167		167
168	=over 4	168	=over 4
169		169
…		…
319	}	319	}
320	}	320	}
321		321
322	=item $coro = cf::async_ext { BLOCK }	322	=item $coro = cf::async_ext { BLOCK }
323		323
324	Like async, but this coro is automcatially being canceled when the	324	Like async, but this coro is automatically being canceled when the
325	extension calling this is being unloaded.	325	extension calling this is being unloaded.
326		326
327	=cut	327	=cut
328		328
329	sub async_ext(&) {	329	sub async_ext(&) {
…		…
338		338
339	$coro	339	$coro
340	}	340	}
341		341
342	sub write_runtime {	342	sub write_runtime {
		343	return unless $TICK_WATCHER->is_active;
		344
343	my $runtime = cf::localdir . "/runtime";	345	my $runtime = cf::localdir . "/runtime";
344		346
345	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	347	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
346	or return;	348	or return;
347		349
…		…
362	}	364	}
363		365
364	=back	366	=back
365		367
366	=cut	368	=cut
367
368	#############################################################################
369
370	package cf::path;
371
372	# used to convert map paths into valid unix filenames by repalcing / by ∕
373	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
375	sub new {
376	my ($class, $path, $base) = @_;
377
378	$path = $path->as_string if ref $path;
379
380	my $self = bless { }, $class;
381
382	# {... are special paths that are not touched
383	# ?xxx/... are special absolute paths
384	# ?random/... random maps
385	# /! non-realised random map exit
386	# /... normal maps
387	# ~/... per-player maps without a specific player (DO NOT USE)
388	# ~user/... per-player map of a specific user
389
390	if ($path =~ /^{/) {
391	# fine as it is
392	} elsif ($path =~ s{^\?random/}{}) {
393	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
394	$self->{random} = cf::from_json $data;
395	} else {
396	if ($path =~ s{^~([^/]+)?}{}) {
397	$self->{user_rel} = 1;
398
399	if (defined $1) {
400	$self->{user} = $1;
401	} elsif ($base =~ m{^~([^/]+)/}) {
402	$self->{user} = $1;
403	} else {
404	warn "cannot resolve user-relative path without user <$path,$base>\n";
405	}
406	} elsif ($path =~ /^\//) {
407	# already absolute
408	} else {
409	$base =~ s{[^/]+/?$}{};
410	return $class->new ("$base/$path");
411	}
412
413	for ($path) {
414	redo if s{/\.?/}{/};
415	redo if s{/[^/]+/\.\./}{/};
416	}
417	}
418
419	$self->{path} = $path;
420
421	$self
422	}
423
424	# the name / primary key / in-game path
425	sub as_string {
426	my ($self) = @_;
427
428	$self->{user_rel} ? "~$self->{user}$self->{path}"
429	: $self->{random} ? "?random/$self->{path}"
430	: $self->{path}
431	}
432
433	# the displayed name, this is a one way mapping
434	sub visible_name {
435	my ($self) = @_;
436
437	# if (my $rmp = $self->{random}) {
438	# # todo: be more intelligent about this
439	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440	# } else {
441	$self->as_string
442	# }
443	}
444
445	# escape the /'s in the path
446	sub _escaped_path {
447	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
448	$path
449	}
450
451	# the original (read-only) location
452	sub load_path {
453	my ($self) = @_;
454
455	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
456	}
457
458	# the temporary/swap location
459	sub save_path {
460	my ($self) = @_;
461
462	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
463	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
464	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
465	}
466
467	# the unique path, might be eq to save_path
468	sub uniq_path {
469	my ($self) = @_;
470
471	$self->{user_rel} \|\| $self->{random}
472	? undef
473	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
474	}
475
476	# return random map parameters, or undef
477	sub random_map_params {
478	my ($self) = @_;
479
480	$self->{random}
481	}
482
483	# this is somewhat ugly, but style maps do need special treatment
484	sub is_style_map {
485	$_[0]{path} =~ m{^/styles/}
486	}
487
488	package cf;
489		369
490	#############################################################################	370	#############################################################################
491		371
492	=head2 ATTACHABLE OBJECTS	372	=head2 ATTACHABLE OBJECTS
493		373
…		…
940	=cut	820	=cut
941		821
942	sub register_extcmd {	822	sub register_extcmd {
943	my ($name, $cb) = @_;	823	my ($name, $cb) = @_;
944		824
945	my $caller = caller;
946	#warn "registering extcmd '$name' to '$caller'";
947
948	$EXTCMD{$name} = [$cb, $caller];	825	$EXTCMD{$name} = $cb;
949	}	826	}
950		827
951	cf::player->attach (	828	cf::player->attach (
952	on_command => sub {	829	on_command => sub {
953	my ($pl, $name, $params) = @_;	830	my ($pl, $name, $params) = @_;
…		…
966		843
967	my $msg = eval { from_json $buf };	844	my $msg = eval { from_json $buf };
968		845
969	if (ref $msg) {	846	if (ref $msg) {
970	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	847	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971	if (my %reply = $cb->[0]->($pl, $msg)) {	848	if (my %reply = $cb->($pl, $msg)) {
972	$pl->ext_reply ($msg->{msgid}, %reply);	849	$pl->ext_reply ($msg->{msgid}, %reply);
973	}	850	}
974	}	851	}
975	} else {	852	} else {
976	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	853	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
978		855
979	cf::override;	856	cf::override;
980	},	857	},
981	);	858	);
982		859
983	sub register {
984	my ($base, $pkg) = @_;
985
986	#TODO
987	}
988
989	sub load_extension {	860	sub load_extension {
990	my ($path) = @_;	861	my ($path) = @_;
991		862
992	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	863	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
993	my $base = $1;	864	my $base = $1;
994	my $pkg = $1;	865	my $pkg = $1;
995	$pkg =~ s/[^[:word:]]/_/g;	866	$pkg =~ s/[^[:word:]]/_/g;
996	$pkg = "ext::$pkg";	867	$pkg = "ext::$pkg";
997		868
998	warn "loading '$path' into '$pkg'\n";	869	warn "... loading '$path' into '$pkg'\n";
999		870
1000	open my $fh, "<:utf8", $path	871	open my $fh, "<:utf8", $path
1001	or die "$path: $!";	872	or die "$path: $!";
1002		873
1003	my $source =	874	my $source =
1004	"package $pkg; use strict; use utf8;\n"	875	"package $pkg; use strict; use utf8;\n"
1005	. "#line 1 \"$path\"\n{\n"	876	. "#line 1 \"$path\"\n{\n"
1006	. (do { local $/; <$fh> })	877	. (do { local $/; <$fh> })
1007	. "\n};\n1";	878	. "\n};\n1";
1008		879
1009	eval $source	880	unless (eval $source) {
1010	or die $@ ? "$path: $@\n"	881	my $msg = $@ ? "$path: $@\n"
1011	: "extension disabled.\n";	882	: "extension disabled.\n";
1012		883	if ($source =~ /^#!.perl.#.*MANDATORY/m) { # ugly match
1013	push @exts, $pkg;	884	warn $@;
1014	$ext_pkg{$base} = $pkg;	885	warn "mandatory extension failed to load, exiting.\n";
1015		886	exit 1;
1016	# no strict 'refs';	887	}
1017	# @{"$pkg\::ISA"} = ext::;	888	die $@;
1018
1019	register $base, $pkg;
1020	}
1021
1022	sub unload_extension {
1023	my ($pkg) = @_;
1024
1025	warn "removing extension $pkg\n";
1026
1027	# remove hooks
1028	#TODO
1029	# for my $idx (0 .. $#PLUGIN_EVENT) {
1030	# delete $hook[$idx]{$pkg};
1031	# }	889	}
1032		890
1033	# remove commands	891	push @EXTS, $pkg;
1034	for my $name (keys %COMMAND) {
1035	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1036
1037	if (@cb) {
1038	$COMMAND{$name} = \@cb;
1039	} else {
1040	delete $COMMAND{$name};
1041	}
1042	}
1043
1044	# remove extcmds
1045	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1046	delete $EXTCMD{$name};
1047	}
1048
1049	if (my $cb = $pkg->can ("unload")) {
1050	eval {
1051	$cb->($pkg);
1052	1
1053	} or warn "$pkg unloaded, but with errors: $@";
1054	}
1055
1056	Symbol::delete_package $pkg;
1057	}	892	}
1058		893
1059	sub load_extensions {	894	sub load_extensions {
1060	for my $ext (<$LIBDIR/*.ext>) {	895	for my $ext (<$LIBDIR/*.ext>) {
1061	next unless -r $ext;	896	next unless -r $ext;
…		…
1065	} or warn "$ext not loaded: $@";	900	} or warn "$ext not loaded: $@";
1066	}	901	}
1067	}	902	}
1068		903
1069	#############################################################################	904	#############################################################################
1070	# load/save/clean perl data associated with a map
1071
1072	*cf::mapsupport::on_clean = sub {
1073	my ($map) = @_;
1074
1075	my $path = $map->tmpname;
1076	defined $path or return;
1077
1078	unlink "$path.pst";
1079	};
1080
1081	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1082
1083	#############################################################################
1084		905
1085	=head2 CORE EXTENSIONS	906	=head2 CORE EXTENSIONS
1086		907
1087	Functions and methods that extend core crossfire objects.	908	Functions and methods that extend core crossfire objects.
1088		909
…		…
1224	\@logins	1045	\@logins
1225	}	1046	}
1226		1047
1227	=item $player->maps	1048	=item $player->maps
1228		1049
1229	Returns an arrayref of cf::path's of all maps that are private for this	1050	Returns an arrayref of map paths that are private for this
1230	player. May block.	1051	player. May block.
1231		1052
1232	=cut	1053	=cut
1233		1054
1234	sub maps($) {	1055	sub maps($) {
…		…
1240	my @paths;	1061	my @paths;
1241		1062
1242	for (@$files) {	1063	for (@$files) {
1243	utf8::decode $_;	1064	utf8::decode $_;
1244	next if /\.(?:pl\|pst)$/;	1065	next if /\.(?:pl\|pst)$/;
1245	next unless /^$PATH_SEP/;	1066	next unless /^$PATH_SEP/o;
1246		1067
1247	s/$PATH_SEP/\//g;	1068	s/\.map$//;
1248	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;	1069	push @paths, "~" . $pl->ob->name . "/" . $_;
1249	}	1070	}
1250		1071
1251	\@paths	1072	\@paths
1252	}	1073	}
1253		1074
…		…
1279	package cf::map;	1100	package cf::map;
1280		1101
1281	use Fcntl;	1102	use Fcntl;
1282	use Coro::AIO;	1103	use Coro::AIO;
1283		1104
		1105	use overload
		1106	'""' => \&as_string;
		1107
1284	our $MAX_RESET = 3600;	1108	our $MAX_RESET = 3600;
1285	our $DEFAULT_RESET = 3000;	1109	our $DEFAULT_RESET = 3000;
1286		1110
1287	sub generate_random_map {	1111	sub generate_random_map {
1288	my ($path, $rmp) = @_;	1112	my ($self, $rmp) = @_;
1289		1113
1290	# mit "rum" bekleckern, nicht	1114	# mit "rum" bekleckern, nicht
1291	cf::map::_create_random_map	1115	$self->_create_random_map (
1292	$path,
1293	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1116	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1117	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1118	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296	$rmp->{exit_on_final_map},	1119	$rmp->{exit_on_final_map},
1297	$rmp->{xsize}, $rmp->{ysize},	1120	$rmp->{xsize}, $rmp->{ysize},
1298	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1121	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1122	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1123	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1124	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1125	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303	(cf::region::find $rmp->{region})	1126	(cf::region::find $rmp->{region}), $rmp->{custom}
		1127	)
		1128	}
		1129
		1130	sub register {
		1131	my (undef, $regex) = @_;
		1132	my $pkg = caller;
		1133
		1134	no strict;
		1135	push @{"$pkg\::ISA"}, __PACKAGE__;
		1136
		1137	$EXT_MAP{$pkg} = qr<$regex>;
		1138	}
		1139
		1140	# also paths starting with '/'
		1141	$EXT_MAP{"cf::map"} = qr{^(?=/)};
		1142
		1143	sub normalise {
		1144	my ($path, $base) = @_;
		1145
		1146	# map plan:
		1147	#
		1148	# /! non-realised random map exit (special hack!)
		1149	# {... are special paths that are not being touched
		1150	# ?xxx/... are special absolute paths
		1151	# ?random/... random maps
		1152	# /... normal maps
		1153	# ~user/... per-player map of a specific user
		1154
		1155	$path =~ s/$PATH_SEP/\//go;
		1156
		1157	# treat it as relative path if it starts with
		1158	# something that looks reasonable
		1159	if ($path =~ m{^(?:\./\|\.\./\|\w)}) {
		1160	$base or Carp::carp "normalise called with relative path and no base: '$path'";
		1161
		1162	$base =~ s{[^/]+/?$}{};
		1163	$path = "$base/$path";
		1164	}
		1165
		1166	for ($path) {
		1167	redo if s{//}{/};
		1168	redo if s{/\.?/}{/};
		1169	redo if s{/[^/]+/\.\./}{/};
		1170	}
		1171
		1172	$path
		1173	}
		1174
		1175	sub new_from_path {
		1176	my (undef, $path, $base) = @_;
		1177
		1178	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
		1179
		1180	$path = normalise $path, $base;
		1181
		1182	for my $pkg (keys %EXT_MAP) {
		1183	if ($path =~ $EXT_MAP{$pkg}) {
		1184	my $self = bless cf::map::new, $pkg;
		1185	$self->{path} = $path; $self->path ($path);
		1186	$self->init; # pass $1 etc.
		1187	return $self;
		1188	}
		1189	}
		1190
		1191	Carp::carp "unable to resolve path '$path'.";
		1192	()
		1193	}
		1194
		1195	sub init {
		1196	my ($self) = @_;
		1197
		1198	$self
		1199	}
		1200
		1201	sub as_string {
		1202	my ($self) = @_;
		1203
		1204	"$self->{path}"
		1205	}
		1206
		1207	# the displayed name, this is a one way mapping
		1208	sub visible_name {
		1209	&as_string
		1210	}
		1211
		1212	# the original (read-only) location
		1213	sub load_path {
		1214	my ($self) = @_;
		1215
		1216	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
		1217	}
		1218
		1219	# the temporary/swap location
		1220	sub save_path {
		1221	my ($self) = @_;
		1222
		1223	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1224	sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
		1225	}
		1226
		1227	# the unique path, undef == no special unique path
		1228	sub uniq_path {
		1229	my ($self) = @_;
		1230
		1231	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1232	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1304	}	1233	}
1305		1234
1306	# and all this just because we cannot iterate over	1235	# and all this just because we cannot iterate over
1307	# all maps in C++...	1236	# all maps in C++...
1308	sub change_all_map_light {	1237	sub change_all_map_light {
…		…
1310		1239
1311	$_->change_map_light ($change)	1240	$_->change_map_light ($change)
1312	for grep $_->outdoor, values %cf::MAP;	1241	for grep $_->outdoor, values %cf::MAP;
1313	}	1242	}
1314		1243
		1244	sub unlink_save {
		1245	my ($self) = @_;
		1246
		1247	utf8::encode (my $save = $self->save_path);
		1248	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
		1249	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
		1250	}
		1251
1315	sub try_load_header($) {	1252	sub load_header_from($) {
1316	my ($path) = @_;	1253	my ($self, $path) = @_;
1317		1254
1318	utf8::encode $path;	1255	utf8::encode $path;
1319	aio_open $path, O_RDONLY, 0	1256	aio_open $path, O_RDONLY, 0
1320	or return;	1257	or return;
1321		1258
1322	my $map = cf::map::new	1259	$self->_load_header ($path)
1323	or return;	1260	or return;
1324		1261
1325	# for better error messages only, will be overwritten	1262	$self->{load_path} = $path;
1326	$map->path ($path);
1327		1263
1328	$map->load_header ($path)	1264	1
		1265	}
		1266
		1267	sub load_orig {
		1268	my ($self) = @_;
		1269
		1270	$self->load_header_from ($self->load_path)
		1271	}
		1272
		1273	sub load_temp {
		1274	my ($self) = @_;
		1275
		1276	$self->load_header_from ($self->save_path)
		1277	}
		1278
		1279	sub load_header {
		1280	my ($self) = @_;
		1281
		1282	if ($self->load_temp) {
		1283	$self->last_access ((delete $self->{last_access})
		1284	\|\| $cf::RUNTIME); #d#
		1285	# safety
		1286	$self->{instantiate_time} = $cf::RUNTIME
		1287	if $self->{instantiate_time} > $cf::RUNTIME;
		1288	} else {
		1289	$self->load_orig
1329	or return;	1290	or return;
1330		1291
1331	$map->{load_path} = $path;	1292	$self->{load_original} = 1;
		1293	$self->{instantiate_time} = $cf::RUNTIME;
		1294	$self->last_access ($cf::RUNTIME);
		1295	$self->instantiate;
		1296	}
1332		1297
1333	$map	1298	1
1334	}	1299	}
1335		1300
1336	sub find;	1301	sub find;
1337	sub find {	1302	sub find {
1338	my ($path, $origin) = @_;	1303	my ($path, $origin) = @_;
1339		1304
1340	#warn "find<$path,$origin>\n";#d#
1341
1342	$path = new cf::path $path, $origin && $origin->path;	1305	$path = normalise $path, $origin && $origin->path;
1343	my $key = $path->as_string;
1344		1306
1345	cf::lock_wait "map_find:$key";	1307	cf::lock_wait "map_find:$path";
1346		1308
1347	$cf::MAP{$key} \|\| do {	1309	$cf::MAP{$path} \|\| do {
1348	my $guard = cf::lock_acquire "map_find:$key";	1310	my $guard = cf::lock_acquire "map_find:$path";
1349		1311	my $map = new_from_path cf::map $path
1350	# do it the slow way
1351	my $map = try_load_header $path->save_path;
1352
1353	Coro::cede;
1354
1355	if ($map) {
1356	$map->last_access ((delete $map->{last_access})
1357	\|\| $cf::RUNTIME); #d#
1358	# safety
1359	$map->{instantiate_time} = $cf::RUNTIME
1360	if $map->{instantiate_time} > $cf::RUNTIME;
1361	} else {
1362	if (my $rmp = $path->random_map_params) {
1363	$map = generate_random_map $key, $rmp;
1364	} else {
1365	$map = try_load_header $path->load_path;
1366	}
1367
1368	$map or return;	1312	or return;
1369		1313
1370	$map->{load_original} = 1;
1371	$map->{instantiate_time} = $cf::RUNTIME;
1372	$map->last_access ($cf::RUNTIME);
1373	$map->instantiate;
1374
1375	# per-player maps become, after loading, normal maps
1376	$map->per_player (0) if $path->{user_rel};
1377	}
1378
1379	$map->path ($key);
1380	$map->{path} = $path;
1381	$map->{last_save} = $cf::RUNTIME;	1314	$map->{last_save} = $cf::RUNTIME;
1382		1315
1383	Coro::cede;	1316	$map->load_header
		1317	or return;
1384		1318
1385	if ($map->should_reset) {	1319	if ($map->should_reset) {
1386	$map->reset;	1320	$map->reset;
1387	undef $guard;	1321	undef $guard;
1388	$map = find $path	1322	$map = find $path
1389	or return;	1323	or return;
1390	}	1324	}
1391		1325
1392	$cf::MAP{$key} = $map	1326	$cf::MAP{$path} = $map
1393	}	1327	}
1394	}	1328	}
1395		1329
1396	sub load {	1330	sub load {
1397	my ($self) = @_;	1331	my ($self) = @_;
1398		1332
1399	my $path = $self->{path};	1333	my $path = $self->{path};
1400	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1334	my $guard = cf::lock_acquire "map_load:$path";
1401		1335
1402	return if $self->in_memory != cf::MAP_SWAPPED;	1336	return if $self->in_memory != cf::MAP_SWAPPED;
1403		1337
1404	$self->in_memory (cf::MAP_LOADING);	1338	$self->in_memory (cf::MAP_LOADING);
1405		1339
1406	$self->alloc;	1340	$self->alloc;
1407	$self->load_objects ($self->{load_path}, 1)	1341	$self->_load_objects ($self->{load_path}, 1)
1408	or return;	1342	or return;
1409		1343
1410	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1344	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411	if delete $self->{load_original};	1345	if delete $self->{load_original};
1412		1346
1413	if (my $uniq = $path->uniq_path) {	1347	if (my $uniq = $self->uniq_path) {
1414	utf8::encode $uniq;	1348	utf8::encode $uniq;
1415	if (aio_open $uniq, O_RDONLY, 0) {	1349	if (aio_open $uniq, O_RDONLY, 0) {
1416	$self->clear_unique_items;	1350	$self->clear_unique_items;
1417	$self->load_objects ($uniq, 0);	1351	$self->_load_objects ($uniq, 0);
1418	}	1352	}
1419	}	1353	}
1420		1354
1421	Coro::cede;	1355	Coro::cede;
1422		1356
1423	# now do the right thing for maps	1357	# now do the right thing for maps
1424	$self->link_multipart_objects;	1358	$self->link_multipart_objects;
1425		1359
1426	if ($self->{path}->is_style_map) {	1360	unless ($self->{deny_activate}) {
1427	$self->{deny_save} = 1;	1361	$self->decay_objects;
1428	$self->{deny_reset} = 1;
1429	} else {
1430	$self->fix_auto_apply;	1362	$self->fix_auto_apply;
1431	$self->decay_objects;
1432	$self->update_buttons;	1363	$self->update_buttons;
		1364	Coro::cede;
1433	$self->set_darkness_map;	1365	$self->set_darkness_map;
1434	$self->difficulty ($self->estimate_difficulty)	1366	$self->difficulty ($self->estimate_difficulty)
1435	unless $self->difficulty;	1367	unless $self->difficulty;
		1368	Coro::cede;
1436	$self->activate;	1369	$self->activate;
1437	}	1370	}
1438		1371
1439	Coro::cede;
1440
1441	$self->in_memory (cf::MAP_IN_MEMORY);	1372	$self->in_memory (cf::MAP_IN_MEMORY);
		1373	}
		1374
		1375	sub customise_for {
		1376	my ($self, $ob) = @_;
		1377
		1378	return find "~" . $ob->name . "/" . $self->{path}
		1379	if $self->per_player;
		1380
		1381	$self
		1382	}
		1383
		1384	# find and load all maps in the 3x3 area around a map
		1385	sub load_diag {
		1386	my ($map) = @_;
		1387
		1388	my @diag; # diagonal neighbours
		1389
		1390	for (0 .. 3) {
		1391	my $neigh = $map->tile_path ($_)
		1392	or next;
		1393	$neigh = find $neigh, $map
		1394	or next;
		1395	$neigh->load;
		1396
		1397	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1398	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1399	}
		1400
		1401	for (@diag) {
		1402	my $neigh = find @$_
		1403	or next;
		1404	$neigh->load;
		1405	}
1442	}	1406	}
1443		1407
1444	sub find_sync {	1408	sub find_sync {
1445	my ($path, $origin) = @_;	1409	my ($path, $origin) = @_;
1446		1410
1447	cf::sync_job { cf::map::find $path, $origin }	1411	cf::sync_job { find $path, $origin }
1448	}	1412	}
1449		1413
1450	sub do_load_sync {	1414	sub do_load_sync {
1451	my ($map) = @_;	1415	my ($map) = @_;
1452		1416
1453	cf::sync_job { $map->load };	1417	cf::sync_job { $map->load };
1454	}	1418	}
1455		1419
		1420	our %MAP_PREFETCH;
		1421	our $MAP_PREFETCHER = Coro::async {
		1422	while () {
		1423	for my $path (keys %MAP_PREFETCH) {
		1424	my $map = find $path
		1425	or next;
		1426	$map->load;
		1427
		1428	delete $MAP_PREFETCH{$path};
		1429	}
		1430	Coro::schedule;
		1431	}
		1432	};
		1433
		1434	sub find_async {
		1435	my ($path, $origin) = @_;
		1436
		1437	$path = normalise $path, $origin && $origin->{path};
		1438
		1439	if (my $map = $cf::MAP{$path}) {
		1440	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1441	}
		1442
		1443	$MAP_PREFETCH{$path} = 0;
		1444	$MAP_PREFETCHER->ready;
		1445
		1446	()
		1447	}
		1448
1456	sub save {	1449	sub save {
1457	my ($self) = @_;	1450	my ($self) = @_;
1458		1451
1459	my $lock = cf::lock_acquire "map_data:" . $self->path;	1452	my $lock = cf::lock_acquire "map_data:" . $self->path;
1460		1453
1461	$self->{last_save} = $cf::RUNTIME;	1454	$self->{last_save} = $cf::RUNTIME;
1462		1455
1463	return unless $self->dirty;	1456	return unless $self->dirty;
1464		1457
1465	my $save = $self->{path}->save_path; utf8::encode $save;	1458	my $save = $self->save_path; utf8::encode $save;
1466	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1459	my $uniq = $self->uniq_path; utf8::encode $uniq;
1467		1460
1468	$self->{load_path} = $save;	1461	$self->{load_path} = $save;
1469		1462
1470	return if $self->{deny_save};	1463	return if $self->{deny_save};
1471		1464
…		…
1474	cf::async {	1467	cf::async {
1475	$_->contr->save for $self->players;	1468	$_->contr->save for $self->players;
1476	};	1469	};
1477		1470
1478	if ($uniq) {	1471	if ($uniq) {
1479	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1472	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1480	$self->save_objects ($uniq, cf::IO_UNIQUES);	1473	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1481	} else {	1474	} else {
1482	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);	1475	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
1483	}	1476	}
1484	}	1477	}
1485		1478
1486	sub swap_out {	1479	sub swap_out {
1487	my ($self) = @_;	1480	my ($self) = @_;
…		…
1501		1494
1502	sub reset_at {	1495	sub reset_at {
1503	my ($self) = @_;	1496	my ($self) = @_;
1504		1497
1505	# TODO: safety, remove and allow resettable per-player maps	1498	# TODO: safety, remove and allow resettable per-player maps
1506	return 1e99 if $self->{path}{user_rel};	1499	return 1e99 if $self->isa ("ext::map_per_player");
1507	return 1e99 if $self->{deny_reset};	1500	return 1e99 if $self->{deny_reset};
1508		1501
1509	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1502	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;	1503	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1511		1504
…		…
1516	my ($self) = @_;	1509	my ($self) = @_;
1517		1510
1518	$self->reset_at <= $cf::RUNTIME	1511	$self->reset_at <= $cf::RUNTIME
1519	}	1512	}
1520		1513
1521	sub unlink_save {
1522	my ($self) = @_;
1523
1524	utf8::encode (my $save = $self->{path}->save_path);
1525	aioreq_pri 3; IO::AIO::aio_unlink $save;
1526	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1527	}
1528
1529	sub rename {	1514	sub rename {
1530	my ($self, $new_path) = @_;	1515	my ($self, $new_path) = @_;
1531		1516
		1517	normalise $new_path;
		1518
1532	$self->unlink_save;	1519	$self->unlink_save;
1533		1520
1534	delete $cf::MAP{$self->path};	1521	delete $cf::MAP{$self->path};
1535	$self->{path} = new cf::path $new_path;	1522	$self->{path} = $new_path; $self->path ($self->{path});
1536	$self->path ($self->{path}->as_string);
1537	$cf::MAP{$self->path} = $self;	1523	$cf::MAP{$self->path} = $self;
1538		1524
1539	$self->save;	1525	$self->save;
1540	}	1526	}
1541		1527
1542	sub reset {	1528	sub reset {
1543	my ($self) = @_;	1529	my ($self) = @_;
1544		1530
1545	my $lock = cf::lock_acquire "map_data:" . $self->path;	1531	my $lock = cf::lock_acquire "map_data:$self->{path}";
1546		1532
1547	return if $self->players;	1533	return if $self->players;
1548	return if $self->{path}{user_rel};#d#	1534	return if $self->isa ("ext::map_per_player");#d#
1549		1535
1550	warn "resetting map ", $self->path;#d#	1536	warn "resetting map ", $self->path;#d#
1551		1537
1552	delete $cf::MAP{$self->path};	1538	delete $cf::MAP{$self->path};
		1539
		1540	$self->in_memory (cf::MAP_SWAPPED);
		1541	$self->clear;
1553		1542
1554	$_->clear_links_to ($self) for values %cf::MAP;	1543	$_->clear_links_to ($self) for values %cf::MAP;
1555		1544
1556	$self->unlink_save;	1545	$self->unlink_save;
1557	$self->destroy;	1546	$self->destroy;
…		…
1566	$self->reset_timeout (1);	1555	$self->reset_timeout (1);
1567	$self->rename ("{nuke}/" . ($nuke_counter++));	1556	$self->rename ("{nuke}/" . ($nuke_counter++));
1568	$self->reset; # polite request, might not happen	1557	$self->reset; # polite request, might not happen
1569	}	1558	}
1570		1559
1571	sub customise_for {	1560	=item cf::map::unique_maps
1572	my ($map, $ob) = @_;
1573		1561
1574	if ($map->per_player) {	1562	Returns an arrayref of paths of all shared maps that have
1575	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};	1563	instantiated unique items. May block.
1576	}
1577		1564
1578	$map	1565	=cut
		1566
		1567	sub unique_maps() {
		1568	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1569	or return;
		1570
		1571	my @paths;
		1572
		1573	for (@$files) {
		1574	utf8::decode $_;
		1575	next if /\.pst$/;
		1576	next unless /^$PATH_SEP/o;
		1577
		1578	s/\.map$//;
		1579	push @paths, $_;
		1580	}
		1581
		1582	\@paths
1579	}	1583	}
1580		1584
1581	package cf;	1585	package cf;
1582		1586
1583	=back	1587	=back
…		…
1655		1659
1656	=item $player_object->enter_link	1660	=item $player_object->enter_link
1657		1661
1658	Freezes the player and moves him/her to a special map (C<{link}>).	1662	Freezes the player and moves him/her to a special map (C<{link}>).
1659		1663
1660	The player should be reaosnably safe there for short amounts of time. You	1664	The player should be reasonably safe there for short amounts of time. You
1661	I<MUST> call C<leave_link> as soon as possible, though.	1665	I<MUST> call C<leave_link> as soon as possible, though.
1662		1666
		1667	Will never block.
		1668
1663	=item $player_object->leave_link ($map, $x, $y)	1669	=item $player_object->leave_link ($map, $x, $y)
1664		1670
1665	Moves the player out of the specila link map onto the given map. If the	1671	Moves the player out of the special C<{link}> map onto the specified
1666	map is not valid (or omitted), the player will be moved back to the	1672	map. If the map is not valid (or omitted), the player will be moved back
1667	location he/she was before the call to C<enter_link>, or, if that fails,	1673	to the location he/she was before the call to C<enter_link>, or, if that
1668	to the emergency map position.	1674	fails, to the emergency map position.
1669		1675
1670	Might block.	1676	Might block.
1671		1677
1672	=cut	1678	=cut
		1679
		1680	sub link_map {
		1681	unless ($LINK_MAP) {
		1682	$LINK_MAP = cf::map::find "{link}"
		1683	or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
		1684	$LINK_MAP->load;
		1685	}
		1686
		1687	$LINK_MAP
		1688	}
1673		1689
1674	sub cf::object::player::enter_link {	1690	sub cf::object::player::enter_link {
1675	my ($self) = @_;	1691	my ($self) = @_;
1676		1692
1677	$self->deactivate_recursive;	1693	$self->deactivate_recursive;
1678		1694
1679	return if $self->map == $LINK_MAP;	1695	return if UNIVERSAL::isa $self->map, "ext::map_link";
1680		1696
1681	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1697	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1682	if $self->map;	1698	if $self->map;
1683		1699
1684	$self->enter_map ($LINK_MAP, 20, 20);	1700	$self->enter_map ($LINK_MAP \|\| link_map, 20, 20);
1685	}	1701	}
1686		1702
1687	sub cf::object::player::leave_link {	1703	sub cf::object::player::leave_link {
1688	my ($self, $map, $x, $y) = @_;	1704	my ($self, $map, $x, $y) = @_;
1689		1705
…		…
1707	# use -1 or undef as default coordinates, not 0, 0	1723	# use -1 or undef as default coordinates, not 0, 0
1708	($x, $y) = ($map->enter_x, $map->enter_y)	1724	($x, $y) = ($map->enter_x, $map->enter_y)
1709	if $x <=0 && $y <= 0;	1725	if $x <=0 && $y <= 0;
1710		1726
1711	$map->load;	1727	$map->load;
		1728	$map->load_diag;
1712		1729
1713	return unless $self->contr->active;	1730	return unless $self->contr->active;
1714	$self->activate_recursive;	1731	$self->activate_recursive;
1715	$self->enter_map ($map, $x, $y);	1732	$self->enter_map ($map, $x, $y);
1716	}	1733	}
…		…
1752	=cut	1769	=cut
1753		1770
1754	sub cf::object::player::goto {	1771	sub cf::object::player::goto {
1755	my ($self, $path, $x, $y) = @_;	1772	my ($self, $path, $x, $y) = @_;
1756		1773
1757	$path = new cf::path $path;
1758	$path ne "/" or Carp::cluck ("oy");#d#
1759
1760	$self->enter_link;	1774	$self->enter_link;
1761		1775
1762	(async {	1776	(async {
1763	my $map = cf::map::find $path->as_string;	1777	my $map = cf::map::find $path;
1764	$map = $map->customise_for ($self) if $map;	1778	$map = $map->customise_for ($self) if $map;
1765		1779
1766	# warn "entering ", $map->path, " at ($x, $y)\n"	1780	# warn "entering ", $map->path, " at ($x, $y)\n"
1767	# if $map;	1781	# if $map;
1768		1782
…		…
1833	$self->deactivate_recursive; # just to be sure	1847	$self->deactivate_recursive; # just to be sure
1834	unless (eval {	1848	unless (eval {
1835	prepare_random_map $exit	1849	prepare_random_map $exit
1836	if $exit->slaying eq "/!";	1850	if $exit->slaying eq "/!";
1837		1851
1838	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1852	my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1839	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);	1853	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840		1854
1841	1;	1855	1;
1842	}) {	1856	}) {
1843	$self->message ("Something went wrong deep within the crossfire server. "	1857	$self->message ("Something went wrong deep within the crossfire server. "
1844	. "I'll try to bring you back to the map you were before. "	1858	. "I'll try to bring you back to the map you were before. "
1845	. "Please report this to the dungeon master",	1859	. "Please report this to the dungeon master!",
1846	cf::NDI_UNIQUE \| cf::NDI_RED);	1860	cf::NDI_UNIQUE \| cf::NDI_RED);
1847		1861
1848	warn "ERROR in enter_exit: $@";	1862	warn "ERROR in enter_exit: $@";
1849	$self->leave_link;	1863	$self->leave_link;
1850	}	1864	}
…		…
2226	warn "enter emergency perl save\n";	2240	warn "enter emergency perl save\n";
2227		2241
2228	cf::sync_job {	2242	cf::sync_job {
2229	# use a peculiar iteration method to avoid tripping on perl	2243	# use a peculiar iteration method to avoid tripping on perl
2230	# refcount bugs in for. also avoids problems with players	2244	# refcount bugs in for. also avoids problems with players
2231	# and maps saved/Destroyed asynchronously.	2245	# and maps saved/destroyed asynchronously.
2232	warn "begin emergency player save\n";	2246	warn "begin emergency player save\n";
2233	for my $login (keys %cf::PLAYER) {	2247	for my $login (keys %cf::PLAYER) {
2234	my $pl = $cf::PLAYER{$login} or next;	2248	my $pl = $cf::PLAYER{$login} or next;
2235	$pl->valid or next;	2249	$pl->valid or next;
2236	$pl->save;	2250	$pl->save;
…		…
2256	return;	2270	return;
2257	}	2271	}
2258		2272
2259	warn "reloading...";	2273	warn "reloading...";
2260		2274
		2275	warn "freezing server";
2261	my $guard = freeze_mainloop;	2276	my $guard = freeze_mainloop;
2262	cf::emergency_save;	2277	cf::emergency_save;
2263		2278
		2279	warn "sync database to disk";
		2280	cf::db_sync;
		2281	IO::AIO::flush;
		2282
2264	eval {	2283	eval {
2265	# if anything goes wrong in here, we should simply crash as we already saved	2284	# if anything goes wrong in here, we should simply crash as we already saved
2266		2285
2267	# cancel all watchers	2286	warn "cancel all watchers";
2268	for (Event::all_watchers) {	2287	for (Event::all_watchers) {
2269	$_->cancel if $_->data & WF_AUTOCANCEL;	2288	$_->cancel if $_->data & WF_AUTOCANCEL;
2270	}	2289	}
2271		2290
2272	# cancel all extension coros	2291	warn "cancel all extension coros";
2273	$_->cancel for values %EXT_CORO;	2292	$_->cancel for values %EXT_CORO;
2274	%EXT_CORO = ();	2293	%EXT_CORO = ();
2275		2294
		2295	warn "remove commands";
		2296	%COMMAND = ();
		2297
		2298	warn "remove ext commands";
		2299	%EXTCMD = ();
		2300
2276	# unload all extensions	2301	warn "unload/nuke all extensions";
2277	for (@exts) {	2302	for my $pkg (@EXTS) {
2278	warn "unloading <$_>";	2303	warn "... unloading $pkg";
2279	unload_extension $_;	2304
		2305	if (my $cb = $pkg->can ("unload")) {
		2306	eval {
		2307	$cb->($pkg);
		2308	1
		2309	} or warn "$pkg unloaded, but with errors: $@";
2280	}	2310	}
2281		2311
		2312	warn "... nuking $pkg";
		2313	Symbol::delete_package $pkg;
		2314	}
		2315
2282	# unload all modules loaded from $LIBDIR	2316	warn "unload all perl modules loaded from $LIBDIR";
2283	while (my ($k, $v) = each %INC) {	2317	while (my ($k, $v) = each %INC) {
2284	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2318	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2285		2319
2286	warn "removing <$k>";	2320	warn "removing <$k>";
2287	delete $INC{$k};	2321	delete $INC{$k};
…		…
2294	}	2328	}
2295		2329
2296	Symbol::delete_package $k;	2330	Symbol::delete_package $k;
2297	}	2331	}
2298		2332
2299	# sync database to disk
2300	cf::db_sync;
2301	IO::AIO::flush;
2302
2303	# get rid of safe::, as good as possible	2333	warn "get rid of safe::, as good as possible";
2304	Symbol::delete_package "safe::$_"	2334	Symbol::delete_package "safe::$_"
2305	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2335	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2306		2336
2307	# remove register_script_function callbacks
2308	# TODO
2309
2310	# unload cf.pm "a bit"	2337	warn "unload cf.pm \"a bit\"";
2311	delete $INC{"cf.pm"};	2338	delete $INC{"cf.pm"};
2312		2339
2313	# don't, removes xs symbols, too,	2340	# don't, removes xs symbols, too,
2314	# and global variables created in xs	2341	# and global variables created in xs
2315	#Symbol::delete_package __PACKAGE__;	2342	#Symbol::delete_package __PACKAGE__;
2316		2343
2317	# reload cf.pm
2318	warn "reloading cf.pm";	2344	warn "reloading cf.pm";
2319	require cf;	2345	require cf;
2320	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2346	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2321		2347
2322	# load config and database again	2348	warn "load config and database again";
2323	cf::cfg_load;	2349	cf::cfg_load;
2324	cf::db_load;	2350	cf::db_load;
2325		2351
2326	# load extensions
2327	warn "load extensions";	2352	warn "load extensions";
2328	cf::load_extensions;	2353	cf::load_extensions;
2329		2354
2330	# reattach attachments to objects	2355	warn "reattach attachments to objects/players";
2331	warn "reattach";
2332	_global_reattach;	2356	_global_reattach;
		2357	warn "reattach attachments to maps";
2333	reattach $_ for values %MAP;	2358	reattach $_ for values %MAP;
2334	};	2359	};
2335		2360
2336	if ($@) {	2361	if ($@) {
2337	warn $@;	2362	warn $@;
2338	warn "error while reloading, exiting.";	2363	warn "error while reloading, exiting.";
2339	exit 1;	2364	exit 1;
2340	}	2365	}
2341		2366
2342	warn "reloaded successfully";	2367	warn "reloaded";
2343	};	2368	};
2344
2345	#############################################################################
2346
2347	unless ($LINK_MAP) {
2348	$LINK_MAP = cf::map::new;
2349
2350	$LINK_MAP->width (41);
2351	$LINK_MAP->height (41);
2352	$LINK_MAP->alloc;
2353	$LINK_MAP->path ("{link}");
2354	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2355	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2356
2357	# dirty hack because... archetypes are not yet loaded
2358	Event->timer (
2359	after => 10,
2360	cb => sub {
2361	$_[0]->w->cancel;
2362
2363	# provide some exits "home"
2364	my $exit = cf::object::new "exit";
2365
2366	$exit->slaying ($EMERGENCY_POSITION->[0]);
2367	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2368	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2369
2370	$LINK_MAP->insert ($exit->clone, 19, 19);
2371	$LINK_MAP->insert ($exit->clone, 19, 20);
2372	$LINK_MAP->insert ($exit->clone, 19, 21);
2373	$LINK_MAP->insert ($exit->clone, 20, 19);
2374	$LINK_MAP->insert ($exit->clone, 20, 21);
2375	$LINK_MAP->insert ($exit->clone, 21, 19);
2376	$LINK_MAP->insert ($exit->clone, 21, 20);
2377	$LINK_MAP->insert ($exit->clone, 21, 21);
2378
2379	$exit->destroy;
2380	});
2381
2382	$LINK_MAP->{deny_save} = 1;
2383	$LINK_MAP->{deny_reset} = 1;
2384
2385	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2386	}
2387
2388	register "<global>", __PACKAGE__;
2389		2369
2390	register_command "reload" => sub {	2370	register_command "reload" => sub {
2391	my ($who, $arg) = @_;	2371	my ($who, $arg) = @_;
2392		2372
2393	if ($who->flag (FLAG_WIZ)) {	2373	if ($who->flag (FLAG_WIZ)) {
…		…
2403	reentrant => 0,	2383	reentrant => 0,
2404	prio => 0,	2384	prio => 0,
2405	at => $NEXT_TICK \|\| $TICK,	2385	at => $NEXT_TICK \|\| $TICK,
2406	data => WF_AUTOCANCEL,	2386	data => WF_AUTOCANCEL,
2407	cb => sub {	2387	cb => sub {
		2388	$NOW = Event::time;
		2389
2408	cf::server_tick; # one server iteration	2390	cf::server_tick; # one server iteration
2409	$RUNTIME += $TICK;	2391	$RUNTIME += $TICK;
2410	$NEXT_TICK += $TICK;	2392	$NEXT_TICK += $TICK;
2411		2393
2412	$WAIT_FOR_TICK->broadcast;	2394	$WAIT_FOR_TICK->broadcast;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.156 by root, Tue Jan 9 22:07:08 2007 UTC vs. Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.156 by root, Tue Jan 9 22:07:08 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC