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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.104 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC

…		…
8	use Storable;	8	use Storable;
9	use Opcode;	9	use Opcode;
10	use Safe;	10	use Safe;
11	use Safe::Hole;	11	use Safe::Hole;
12		12
13	use Coro 3.3;	13	use Coro 3.3 ();
14	use Coro::Event;	14	use Coro::Event;
15	use Coro::Timer;	15	use Coro::Timer;
16	use Coro::Signal;	16	use Coro::Signal;
17	use Coro::Semaphore;	17	use Coro::Semaphore;
		18	use Coro::AIO;
18		19
		20	use Digest::MD5;
		21	use Fcntl;
19	use IO::AIO 2.3;	22	use IO::AIO 2.31 ();
20	use YAML::Syck ();	23	use YAML::Syck ();
21	use Time::HiRes;	24	use Time::HiRes;
22		25
23	use Event; $Event::Eval = 1; # no idea why this is required, but it is	26	use Event; $Event::Eval = 1; # no idea why this is required, but it is
24		27
25	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	28	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
26	$YAML::Syck::ImplicitUnicode = 1;	29	$YAML::Syck::ImplicitUnicode = 1;
27		30
28	$Coro::main->prio (2); # run main coroutine ("the server") with very high priority	31	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
29		32
30	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31		34
32	our %COMMAND = ();	35	our %COMMAND = ();
33	our %COMMAND_TIME = ();	36	our %COMMAND_TIME = ();
…		…
44	our %CFG;	47	our %CFG;
45		48
46	our $UPTIME; $UPTIME \|\|= time;	49	our $UPTIME; $UPTIME \|\|= time;
47	our $RUNTIME;	50	our $RUNTIME;
48		51
		52	our %PLAYER; # all users
49	our %MAP; # all maps	53	our %MAP; # all maps
50	our $LINK_MAP; # the special {link} map	54	our $LINK_MAP; # the special {link} map
51	our $FREEZE;	55	our $RANDOM_MAPS = cf::localdir . "/random";
		56	our %EXT_CORO; # coroutines bound to extensions
52		57
53	binmode STDOUT;	58	binmode STDOUT;
54	binmode STDERR;	59	binmode STDERR;
55		60
56	# read virtual server time, if available	61	# read virtual server time, if available
…		…
62		67
63	mkdir cf::localdir;	68	mkdir cf::localdir;
64	mkdir cf::localdir . "/" . cf::playerdir;	69	mkdir cf::localdir . "/" . cf::playerdir;
65	mkdir cf::localdir . "/" . cf::tmpdir;	70	mkdir cf::localdir . "/" . cf::tmpdir;
66	mkdir cf::localdir . "/" . cf::uniquedir;	71	mkdir cf::localdir . "/" . cf::uniquedir;
		72	mkdir $RANDOM_MAPS;
67		73
68	our %EXT_CORO;	74	# a special map that is always available
		75	our $LINK_MAP;
		76	our $EMERGENCY_POSITION;
69		77
70	#############################################################################	78	#############################################################################
71		79
72	=head2 GLOBAL VARIABLES	80	=head2 GLOBAL VARIABLES
73		81
…		…
172	sub to_json($) {	180	sub to_json($) {
173	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	181	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
174	JSON::Syck::Dump $_[0]	182	JSON::Syck::Dump $_[0]
175	}	183	}
176		184
		185	=item cf::lock_wait $string
		186
		187	Wait until the given lock is available. See cf::lock_acquire.
		188
		189	=item my $lock = cf::lock_acquire $string
		190
		191	Wait until the given lock is available and then acquires it and returns
		192	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
		193	for example when the coroutine gets canceled), the lock is automatically
		194	returned.
		195
		196	Lock names should begin with a unique identifier (for example, cf::map::find
		197	uses map_find and cf::map::load uses map_load).
		198
		199	=cut
		200
		201	our %LOCK;
		202
		203	sub lock_wait($) {
		204	my ($key) = @_;
		205
		206	# wait for lock, if any
		207	while ($LOCK{$key}) {
		208	push @{ $LOCK{$key} }, $Coro::current;
		209	Coro::schedule;
		210	}
		211	}
		212
		213	sub lock_acquire($) {
		214	my ($key) = @_;
		215
		216	# wait, to be sure we are not locked
		217	lock_wait $key;
		218
		219	$LOCK{$key} = [];
		220
		221	Coro::guard {
		222	# wake up all waiters, to be on the safe side
		223	$_->ready for @{ delete $LOCK{$key} };
		224	}
		225	}
		226
		227	sub freeze_mainloop {
		228	return unless $TICK_WATCHER->is_active;
		229
		230	my $guard = Coro::guard { $TICK_WATCHER->start };
		231	$TICK_WATCHER->stop;
		232	$guard
		233	}
		234
		235	=item cf::async { BLOCK }
		236
		237	Currently the same as Coro::async_pool, meaning you cannot use
		238	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		239	thing you are allowed to do is call C<prio> on it.
		240
		241	=cut
		242
		243	BEGIN { *async = \&Coro::async_pool }
		244
		245	=item cf::sync_job { BLOCK }
		246
		247	The design of crossfire+ requires that the main coro ($Coro::main) is
		248	always able to handle events or runnable, as crossfire+ is only partly
		249	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
		250
		251	If it must be done, put the blocking parts into C<sync_job>. This will run
		252	the given BLOCK in another coroutine while waiting for the result. The
		253	server will be frozen during this time, so the block should either finish
		254	fast or be very important.
		255
		256	=cut
		257
		258	sub sync_job(&) {
		259	my ($job) = @_;
		260
		261	if ($Coro::current == $Coro::main) {
		262	# this is the main coro, too bad, we have to block
		263	# till the operation succeeds, freezing the server :/
		264
		265	# TODO: use suspend/resume instead
		266	# (but this is cancel-safe)
		267	my $freeze_guard = freeze_mainloop;
		268
		269	my $busy = 1;
		270	my @res;
		271
		272	(async {
		273	@res = eval { $job->() };
		274	warn $@ if $@;
		275	undef $busy;
		276	})->prio (Coro::PRIO_MAX);
		277
		278	while ($busy) {
		279	Coro::cede or Event::one_event;
		280	}
		281
		282	wantarray ? @res : $res[0]
		283	} else {
		284	# we are in another coroutine, how wonderful, everything just works
		285
		286	$job->()
		287	}
		288	}
		289
177	=item $coro = cf::coro { BLOCK }	290	=item $coro = cf::async_ext { BLOCK }
178		291
179	Creates and returns a new coro. This coro is automcatially being canceled	292	Like async, but this coro is automcatially being canceled when the
180	when the extension calling this is being unloaded.	293	extension calling this is being unloaded.
181		294
182	=cut	295	=cut
183		296
184	sub coro(&) {	297	sub async_ext(&) {
185	my $cb = shift;	298	my $cb = shift;
186		299
187	my $coro; $coro = async {	300	my $coro = &Coro::async ($cb);
188	eval {
189	$cb->();
190	};
191	warn $@ if $@;
192	};
193		301
194	$coro->on_destroy (sub {	302	$coro->on_destroy (sub {
195	delete $EXT_CORO{$coro+0};	303	delete $EXT_CORO{$coro+0};
196	});	304	});
197	$EXT_CORO{$coro+0} = $coro;	305	$EXT_CORO{$coro+0} = $coro;
198		306
199	$coro	307	$coro
200	}	308	}
201		309
		310	sub write_runtime {
		311	my $runtime = cf::localdir . "/runtime";
		312
		313	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
		314	or return;
		315
		316	my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
		317	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		318	and return;
		319
		320	aio_fsync $fh
		321	and return;
		322
		323	close $fh
		324	or return;
		325
		326	aio_rename "$runtime~", $runtime
		327	and return;
		328
		329	1
		330	}
		331
202	=back	332	=back
203		333
204	=cut	334	=cut
		335
		336	#############################################################################
		337
		338	package cf::path;
		339
		340	sub new {
		341	my ($class, $path, $base) = @_;
		342
		343	$path = $path->as_string if ref $path;
		344
		345	my $self = bless { }, $class;
		346
		347	# {... are special paths that are not touched
		348	# ?xxx/... are special absolute paths
		349	# ?random/... random maps
		350	# /! non-realised random map exit
		351	# /... normal maps
		352	# ~/... per-player maps without a specific player (DO NOT USE)
		353	# ~user/... per-player map of a specific user
		354
		355	if ($path =~ /^{/) {
		356	# fine as it is
		357	} elsif ($path =~ s{^\?random/}{}) {
		358	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
		359	$self->{random} = cf::from_json $data;
		360	} else {
		361	if ($path =~ s{^~([^/]+)?}{}) {
		362	$self->{user_rel} = 1;
		363
		364	if (defined $1) {
		365	$self->{user} = $1;
		366	} elsif ($base =~ m{^~([^/]+)/}) {
		367	$self->{user} = $1;
		368	} else {
		369	warn "cannot resolve user-relative path without user <$path,$base>\n";
		370	}
		371	} elsif ($path =~ /^\//) {
		372	# already absolute
		373	} else {
		374	$base =~ s{[^/]+/?$}{};
		375	return $class->new ("$base/$path");
		376	}
		377
		378	for ($path) {
		379	redo if s{/\.?/}{/};
		380	redo if s{/[^/]+/\.\./}{/};
		381	}
		382	}
		383
		384	$self->{path} = $path;
		385
		386	$self
		387	}
		388
		389	# the name / primary key / in-game path
		390	sub as_string {
		391	my ($self) = @_;
		392
		393	$self->{user_rel} ? "~$self->{user}$self->{path}"
		394	: $self->{random} ? "?random/$self->{path}"
		395	: $self->{path}
		396	}
		397
		398	# the displayed name, this is a one way mapping
		399	sub visible_name {
		400	my ($self) = @_;
		401
		402	# if (my $rmp = $self->{random}) {
		403	# # todo: be more intelligent about this
		404	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
		405	# } else {
		406	$self->as_string
		407	# }
		408	}
		409
		410	# escape the /'s in the path
		411	sub _escaped_path {
		412	# ∕ is U+2215
		413	(my $path = $_[0]{path}) =~ s/\//∕/g;
		414	$path
		415	}
		416
		417	# the original (read-only) location
		418	sub load_path {
		419	my ($self) = @_;
		420
		421	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
		422	}
		423
		424	# the temporary/swap location
		425	sub save_path {
		426	my ($self) = @_;
		427
		428	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
		429	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
		430	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
		431	}
		432
		433	# the unique path, might be eq to save_path
		434	sub uniq_path {
		435	my ($self) = @_;
		436
		437	$self->{user_rel} \|\| $self->{random}
		438	? undef
		439	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
		440	}
		441
		442	# return random map parameters, or undef
		443	sub random_map_params {
		444	my ($self) = @_;
		445
		446	$self->{random}
		447	}
		448
		449	# this is somewhat ugly, but style maps do need special treatment
		450	sub is_style_map {
		451	$_[0]{path} =~ m{^/styles/}
		452	}
		453
		454	package cf;
205		455
206	#############################################################################	456	#############################################################################
207		457
208	=head2 ATTACHABLE OBJECTS	458	=head2 ATTACHABLE OBJECTS
209		459
…		…
563	);	813	);
564		814
565	sub object_freezer_save {	815	sub object_freezer_save {
566	my ($filename, $rdata, $objs) = @_;	816	my ($filename, $rdata, $objs) = @_;
567		817
		818	sync_job {
568	if (length $$rdata) {	819	if (length $$rdata) {
569	warn sprintf "saving %s (%d,%d)\n",	820	warn sprintf "saving %s (%d,%d)\n",
570	$filename, length $$rdata, scalar @$objs;	821	$filename, length $$rdata, scalar @$objs;
571		822
572	if (open my $fh, ">:raw", "$filename~") {	823	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
573	chmod SAVE_MODE, $fh;
574	syswrite $fh, $$rdata;
575	close $fh;
576
577	if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
578	chmod SAVE_MODE, $fh;	824	chmod SAVE_MODE, $fh;
579	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };	825	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
		826	aio_fsync $fh;
580	close $fh;	827	close $fh;
		828
		829	if (@$objs) {
		830	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
		831	chmod SAVE_MODE, $fh;
		832	my $data = Storable::nfreeze { version => 1, objs => $objs };
		833	aio_write $fh, 0, (length $data), $data, 0;
		834	aio_fsync $fh;
		835	close $fh;
581	rename "$filename.pst~", "$filename.pst";	836	aio_rename "$filename.pst~", "$filename.pst";
		837	}
		838	} else {
		839	aio_unlink "$filename.pst";
		840	}
		841
		842	aio_rename "$filename~", $filename;
582	} else {	843	} else {
583	unlink "$filename.pst";	844	warn "FATAL: $filename~: $!\n";
584	}	845	}
585
586	rename "$filename~", $filename;
587	} else {	846	} else {
588	warn "FATAL: $filename~: $!\n";
589	}
590	} else {
591	unlink $filename;	847	aio_unlink $filename;
592	unlink "$filename.pst";	848	aio_unlink "$filename.pst";
		849	}
593	}	850	}
594	}	851	}
595		852
596	sub object_freezer_as_string {	853	sub object_freezer_as_string {
597	my ($rdata, $objs) = @_;	854	my ($rdata, $objs) = @_;
…		…
602	}	859	}
603		860
604	sub object_thawer_load {	861	sub object_thawer_load {
605	my ($filename) = @_;	862	my ($filename) = @_;
606		863
607	local $/;	864	my ($data, $av);
608		865
609	my $av;	866	(aio_load $filename, $data) >= 0
		867	or return;
610		868
611	#TODO: use sysread etc.	869	unless (aio_stat "$filename.pst") {
612	if (open my $data, "<:raw:perlio", $filename) {	870	(aio_load "$filename.pst", $av) >= 0
613	$data = <$data>;	871	or return;
614	if (open my $pst, "<:raw:perlio", "$filename.pst") {
615	$av = eval { (Storable::thaw <$pst>)->{objs} };	872	$av = eval { (Storable::thaw $av)->{objs} };
616	}	873	}
		874
		875	warn sprintf "loading %s (%d)\n",
		876	$filename, length $data, scalar @{$av \|\| []};#d#
617	return ($data, $av);	877	return ($data, $av);
618	}
619
620	()
621	}	878	}
622		879
623	#############################################################################	880	#############################################################################
624	# command handling &c	881	# command handling &c
625		882
…		…
815		1072
816	=head2 CORE EXTENSIONS	1073	=head2 CORE EXTENSIONS
817		1074
818	Functions and methods that extend core crossfire objects.	1075	Functions and methods that extend core crossfire objects.
819		1076
		1077	=cut
		1078
		1079	package cf::player;
		1080
820	=head3 cf::player	1081	=head3 cf::player
821		1082
822	=over 4	1083	=over 4
823		1084
824	=item cf::player::exists $login	1085	=item cf::player::find $login
825		1086
826	Returns true when the given account exists.	1087	Returns the given player object, loading it if necessary (might block).
827		1088
828	=cut	1089	=cut
829		1090
830	sub cf::player::exists($) {	1091	sub path($) {
831	cf::player::find $_[0]	1092	sprintf "%s/%s/%s/%s.pl",
832	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1093	cf::localdir, cf::playerdir,
		1094	(ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
		1095	}
		1096
		1097	sub find_active($) {
		1098	$cf::PLAYER{$_[0]}
		1099	and $cf::PLAYER{$_[0]}->active
		1100	and $cf::PLAYER{$_[0]}
		1101	}
		1102
		1103	sub exists($) {
		1104	my ($login) = @_;
		1105
		1106	$cf::PLAYER{$login}
		1107	or cf::sync_job { !aio_stat $login }
		1108	}
		1109
		1110	sub find($) {
		1111	return $cf::PLAYER{$_[0]} \|\| do {
		1112	my $login = $_[0];
		1113
		1114	my $guard = cf::lock_acquire "user_find:$login";
		1115
		1116	$cf::PLAYER{$login} \|\|= (load_pl path $login or return);
		1117	};
		1118	}
		1119
		1120	sub save($) {
		1121	my ($pl) = @_;
		1122
		1123	return if $pl->{deny_save};
		1124
		1125	my $path = path $pl;
		1126	my $guard = cf::lock_acquire "user_save:$path";
		1127
		1128	return if $pl->{deny_save};
		1129	$pl->{last_save} = $cf::RUNTIME;
		1130
		1131	Coro::cede;
		1132	$pl->save_pl ($path);
		1133	Coro::cede;
		1134	}
		1135
		1136	sub new($) {
		1137	my ($login) = @_;
		1138
		1139	my $self = create;
		1140
		1141	$self->ob->name ($login);
		1142	$self->{deny_save} = 1;
		1143
		1144	$cf::PLAYER{$login} = $self;
		1145
		1146	$self
833	}	1147	}
834		1148
835	=item $player->ext_reply ($msgid, $msgtype, %msg)	1149	=item $player->ext_reply ($msgid, $msgtype, %msg)
836		1150
837	Sends an ext reply to the player.	1151	Sends an ext reply to the player.
838		1152
839	=cut	1153	=cut
840		1154
841	sub cf::player::ext_reply($$$%) {	1155	sub ext_reply($$$%) {
842	my ($self, $id, %msg) = @_;	1156	my ($self, $id, %msg) = @_;
843		1157
844	$msg{msgid} = $id;	1158	$msg{msgid} = $id;
845		1159
846	$self->send ("ext " . to_json \%msg);	1160	$self->send ("ext " . cf::to_json \%msg);
847	}	1161	}
		1162
		1163	package cf;
848		1164
849	=back	1165	=back
		1166
		1167
		1168	=head3 cf::map
		1169
		1170	=over 4
		1171
		1172	=cut
		1173
		1174	package cf::map;
		1175
		1176	use Fcntl;
		1177	use Coro::AIO;
		1178
		1179	our $MAX_RESET = 3600;
		1180	our $DEFAULT_RESET = 3000;
		1181
		1182	sub generate_random_map {
		1183	my ($path, $rmp) = @_;
		1184
		1185	# mit "rum" bekleckern, nicht
		1186	cf::map::_create_random_map
		1187	$path,
		1188	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
		1189	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
		1190	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
		1191	$rmp->{exit_on_final_map},
		1192	$rmp->{xsize}, $rmp->{ysize},
		1193	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
		1194	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
		1195	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
		1196	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
		1197	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
		1198	(cf::region::find $rmp->{region})
		1199	}
		1200
		1201	# and all this just because we cannot iterate over
		1202	# all maps in C++...
		1203	sub change_all_map_light {
		1204	my ($change) = @_;
		1205
		1206	$_->change_map_light ($change)
		1207	for grep $_->outdoor, values %cf::MAP;
		1208	}
		1209
		1210	sub try_load_header($) {
		1211	my ($path) = @_;
		1212
		1213	utf8::encode $path;
		1214	aio_open $path, O_RDONLY, 0
		1215	or return;
		1216
		1217	my $map = cf::map::new
		1218	or return;
		1219
		1220	# for better error messages only, will be overwritten
		1221	$map->path ($path);
		1222
		1223	$map->load_header ($path)
		1224	or return;
		1225
		1226	$map->{load_path} = $path;
		1227
		1228	$map
		1229	}
		1230
		1231	sub find;
		1232	sub find {
		1233	my ($path, $origin) = @_;
		1234
		1235	#warn "find<$path,$origin>\n";#d#
		1236
		1237	$path = new cf::path $path, $origin && $origin->path;
		1238	my $key = $path->as_string;
		1239
		1240	cf::lock_wait "map_find:$key";
		1241
		1242	$cf::MAP{$key} \|\| do {
		1243	my $guard = cf::lock_acquire "map_find:$key";
		1244
		1245	# do it the slow way
		1246	my $map = try_load_header $path->save_path;
		1247
		1248	Coro::cede;
		1249
		1250	if ($map) {
		1251	$map->last_access ((delete $map->{last_access})
		1252	\|\| $cf::RUNTIME); #d#
		1253	# safety
		1254	$map->{instantiate_time} = $cf::RUNTIME
		1255	if $map->{instantiate_time} > $cf::RUNTIME;
		1256	} else {
		1257	if (my $rmp = $path->random_map_params) {
		1258	$map = generate_random_map $key, $rmp;
		1259	} else {
		1260	$map = try_load_header $path->load_path;
		1261	}
		1262
		1263	$map or return;
		1264
		1265	$map->{load_original} = 1;
		1266	$map->{instantiate_time} = $cf::RUNTIME;
		1267	$map->last_access ($cf::RUNTIME);
		1268	$map->instantiate;
		1269
		1270	# per-player maps become, after loading, normal maps
		1271	$map->per_player (0) if $path->{user_rel};
		1272	}
		1273
		1274	$map->path ($key);
		1275	$map->{path} = $path;
		1276	$map->{last_save} = $cf::RUNTIME;
		1277
		1278	Coro::cede;
		1279
		1280	if ($map->should_reset) {
		1281	$map->reset;
		1282	undef $guard;
		1283	$map = find $path
		1284	or return;
		1285	}
		1286
		1287	$cf::MAP{$key} = $map
		1288	}
		1289	}
		1290
		1291	sub load {
		1292	my ($self) = @_;
		1293
		1294	my $path = $self->{path};
		1295	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1296
		1297	return if $self->in_memory != cf::MAP_SWAPPED;
		1298
		1299	$self->in_memory (cf::MAP_LOADING);
		1300
		1301	$self->alloc;
		1302	$self->load_objects ($self->{load_path}, 1)
		1303	or return;
		1304
		1305	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1306	if delete $self->{load_original};
		1307
		1308	if (my $uniq = $path->uniq_path) {
		1309	utf8::encode $uniq;
		1310	if (aio_open $uniq, O_RDONLY, 0) {
		1311	$self->clear_unique_items;
		1312	$self->load_objects ($uniq, 0);
		1313	}
		1314	}
		1315
		1316	Coro::cede;
		1317
		1318	# now do the right thing for maps
		1319	$self->link_multipart_objects;
		1320
		1321	if ($self->{path}->is_style_map) {
		1322	$self->{deny_save} = 1;
		1323	$self->{deny_reset} = 1;
		1324	} else {
		1325	$self->fix_auto_apply;
		1326	$self->decay_objects;
		1327	$self->update_buttons;
		1328	$self->set_darkness_map;
		1329	$self->difficulty ($self->estimate_difficulty)
		1330	unless $self->difficulty;
		1331	$self->activate;
		1332	}
		1333
		1334	Coro::cede;
		1335
		1336	$self->in_memory (cf::MAP_IN_MEMORY);
		1337	}
		1338
		1339	sub find_sync {
		1340	my ($path, $origin) = @_;
		1341
		1342	cf::sync_job { cf::map::find $path, $origin }
		1343	}
		1344
		1345	sub do_load_sync {
		1346	my ($map) = @_;
		1347
		1348	cf::sync_job { $map->load };
		1349	}
		1350
		1351	sub save {
		1352	my ($self) = @_;
		1353
		1354	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1355
		1356	$self->{last_save} = $cf::RUNTIME;
		1357
		1358	return unless $self->dirty;
		1359
		1360	my $save = $self->{path}->save_path; utf8::encode $save;
		1361	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
		1362
		1363	$self->{load_path} = $save;
		1364
		1365	return if $self->{deny_save};
		1366
		1367	local $self->{last_access} = $self->last_access;#d#
		1368
		1369	cf::async {
		1370	$_->contr->save for $self->players;
		1371	};
		1372
		1373	if ($uniq) {
		1374	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
		1375	$self->save_objects ($uniq, cf::IO_UNIQUES);
		1376	} else {
		1377	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
		1378	}
		1379	}
		1380
		1381	sub swap_out {
		1382	my ($self) = @_;
		1383
		1384	# save first because save cedes
		1385	$self->save;
		1386
		1387	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1388
		1389	return if $self->players;
		1390	return if $self->in_memory != cf::MAP_IN_MEMORY;
		1391	return if $self->{deny_save};
		1392
		1393	$self->clear;
		1394	$self->in_memory (cf::MAP_SWAPPED);
		1395	}
		1396
		1397	sub reset_at {
		1398	my ($self) = @_;
		1399
		1400	# TODO: safety, remove and allow resettable per-player maps
		1401	return 1e99 if $self->{path}{user_rel};
		1402	return 1e99 if $self->{deny_reset};
		1403
		1404	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		1405	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
		1406
		1407	$time + $to
		1408	}
		1409
		1410	sub should_reset {
		1411	my ($self) = @_;
		1412
		1413	$self->reset_at <= $cf::RUNTIME
		1414	}
		1415
		1416	sub unlink_save {
		1417	my ($self) = @_;
		1418
		1419	utf8::encode (my $save = $self->{path}->save_path);
		1420	aioreq_pri 3; IO::AIO::aio_unlink $save;
		1421	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
		1422	}
		1423
		1424	sub rename {
		1425	my ($self, $new_path) = @_;
		1426
		1427	$self->unlink_save;
		1428
		1429	delete $cf::MAP{$self->path};
		1430	$self->{path} = new cf::path $new_path;
		1431	$self->path ($self->{path}->as_string);
		1432	$cf::MAP{$self->path} = $self;
		1433
		1434	$self->save;
		1435	}
		1436
		1437	sub reset {
		1438	my ($self) = @_;
		1439
		1440	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1441
		1442	return if $self->players;
		1443	return if $self->{path}{user_rel};#d#
		1444
		1445	warn "resetting map ", $self->path;#d#
		1446
		1447	delete $cf::MAP{$self->path};
		1448
		1449	$_->clear_links_to ($self) for values %cf::MAP;
		1450
		1451	$self->unlink_save;
		1452	$self->destroy;
		1453	}
		1454
		1455	my $nuke_counter = "aaaa";
		1456
		1457	sub nuke {
		1458	my ($self) = @_;
		1459
		1460	$self->{deny_save} = 1;
		1461	$self->reset_timeout (1);
		1462	$self->rename ("{nuke}/" . ($nuke_counter++));
		1463	$self->reset; # polite request, might not happen
		1464	}
		1465
		1466	sub customise_for {
		1467	my ($map, $ob) = @_;
		1468
		1469	if ($map->per_player) {
		1470	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
		1471	}
		1472
		1473	$map
		1474	}
		1475
		1476	sub emergency_save {
		1477	my $freeze_guard = cf::freeze_mainloop;
		1478
		1479	warn "enter emergency map save\n";
		1480
		1481	cf::sync_job {
		1482	warn "begin emergency map save\n";
		1483	$_->save for values %cf::MAP;
		1484	};
		1485
		1486	warn "end emergency map save\n";
		1487	}
		1488
		1489	package cf;
		1490
		1491	=back
		1492
850		1493
851	=head3 cf::object::player	1494	=head3 cf::object::player
852		1495
853	=over 4	1496	=over 4
854		1497
…		…
890	(ref $cf::CFG{"may_$access"}	1533	(ref $cf::CFG{"may_$access"}
891	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	1534	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
892	: $cf::CFG{"may_$access"})	1535	: $cf::CFG{"may_$access"})
893	}	1536	}
894		1537
		1538	=item $player_object->enter_link
		1539
		1540	Freezes the player and moves him/her to a special map (C<{link}>).
		1541
		1542	The player should be reaosnably safe there for short amounts of time. You
		1543	I<MUST> call C<leave_link> as soon as possible, though.
		1544
		1545	=item $player_object->leave_link ($map, $x, $y)
		1546
		1547	Moves the player out of the specila link map onto the given map. If the
		1548	map is not valid (or omitted), the player will be moved back to the
		1549	location he/she was before the call to C<enter_link>, or, if that fails,
		1550	to the emergency map position.
		1551
		1552	Might block.
		1553
		1554	=cut
		1555
		1556	sub cf::object::player::enter_link {
		1557	my ($self) = @_;
		1558
		1559	$self->deactivate_recursive;
		1560
		1561	return if $self->map == $LINK_MAP;
		1562
		1563	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
		1564	if $self->map;
		1565
		1566	$self->enter_map ($LINK_MAP, 20, 20);
		1567	}
		1568
		1569	sub cf::object::player::leave_link {
		1570	my ($self, $map, $x, $y) = @_;
		1571
		1572	my $link_pos = delete $self->{_link_pos};
		1573
		1574	unless ($map) {
		1575	# restore original map position
		1576	($map, $x, $y) = @{ $link_pos \|\| [] };
		1577	$map = cf::map::find $map;
		1578
		1579	unless ($map) {
		1580	($map, $x, $y) = @$EMERGENCY_POSITION;
		1581	$map = cf::map::find $map
		1582	or die "FATAL: cannot load emergency map\n";
		1583	}
		1584	}
		1585
		1586	($x, $y) = (-1, -1)
		1587	unless (defined $x) && (defined $y);
		1588
		1589	# use -1 or undef as default coordinates, not 0, 0
		1590	($x, $y) = ($map->enter_x, $map->enter_y)
		1591	if $x <=0 && $y <= 0;
		1592
		1593	$map->load;
		1594
		1595	return unless $self->contr->active;
		1596	$self->activate_recursive;
		1597	$self->enter_map ($map, $x, $y);
		1598	}
		1599
		1600	cf::player->attach (
		1601	on_logout => sub {
		1602	my ($pl) = @_;
		1603
		1604	# abort map switching before logout
		1605	if ($pl->ob->{_link_pos}) {
		1606	cf::sync_job {
		1607	$pl->ob->leave_link
		1608	};
		1609	}
		1610	},
		1611	on_login => sub {
		1612	my ($pl) = @_;
		1613
		1614	# try to abort aborted map switching on player login :)
		1615	# should happen only on crashes
		1616	if ($pl->ob->{_link_pos}) {
		1617	$pl->ob->enter_link;
		1618	(async {
		1619	# we need this sleep as the login has a concurrent enter_exit running
		1620	# and this sleep increases chances of the player not ending up in scorn
		1621	$pl->ob->reply (undef,
		1622	"There was an internal problem at your last logout, "
		1623	. "the server will try to bring you to your intended destination in a second.",
		1624	cf::NDI_RED);
		1625	Coro::Timer::sleep 1;
		1626	$pl->ob->leave_link;
		1627	})->prio (2);
		1628	}
		1629	},
		1630	);
		1631
		1632	=item $player_object->goto ($path, $x, $y)
		1633
		1634	=cut
		1635
		1636	sub cf::object::player::goto {
		1637	my ($self, $path, $x, $y) = @_;
		1638
		1639	$self->enter_link;
		1640
		1641	(async {
		1642	$path = new cf::path $path;
		1643
		1644	my $map = cf::map::find $path->as_string;
		1645	$map = $map->customise_for ($self) if $map;
		1646
		1647	# warn "entering ", $map->path, " at ($x, $y)\n"
		1648	# if $map;
		1649
		1650	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1651
		1652	$self->leave_link ($map, $x, $y);
		1653	})->prio (1);
		1654	}
		1655
		1656	=item $player_object->enter_exit ($exit_object)
		1657
		1658	=cut
		1659
		1660	sub parse_random_map_params {
		1661	my ($spec) = @_;
		1662
		1663	my $rmp = { # defaults
		1664	xsize => 10,
		1665	ysize => 10,
		1666	};
		1667
		1668	for (split /\n/, $spec) {
		1669	my ($k, $v) = split /\s+/, $_, 2;
		1670
		1671	$rmp->{lc $k} = $v if (length $k) && (length $v);
		1672	}
		1673
		1674	$rmp
		1675	}
		1676
		1677	sub prepare_random_map {
		1678	my ($exit) = @_;
		1679
		1680	# all this does is basically replace the /! path by
		1681	# a new random map path (?random/...) with a seed
		1682	# that depends on the exit object
		1683
		1684	my $rmp = parse_random_map_params $exit->msg;
		1685
		1686	if ($exit->map) {
		1687	$rmp->{region} = $exit->map->region_name;
		1688	$rmp->{origin_map} = $exit->map->path;
		1689	$rmp->{origin_x} = $exit->x;
		1690	$rmp->{origin_y} = $exit->y;
		1691	}
		1692
		1693	$rmp->{random_seed} \|\|= $exit->random_seed;
		1694
		1695	my $data = cf::to_json $rmp;
		1696	my $md5 = Digest::MD5::md5_hex $data;
		1697
		1698	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY \| O_CREAT, 0666) {
		1699	aio_write $fh, 0, (length $data), $data, 0;
		1700
		1701	$exit->slaying ("?random/$md5");
		1702	$exit->msg (undef);
		1703	}
		1704	}
		1705
		1706	sub cf::object::player::enter_exit {
		1707	my ($self, $exit) = @_;
		1708
		1709	return unless $self->type == cf::PLAYER;
		1710
		1711	$self->enter_link;
		1712
		1713	(async {
		1714	$self->deactivate_recursive; # just to be sure
		1715	unless (eval {
		1716	prepare_random_map $exit
		1717	if $exit->slaying eq "/!";
		1718
		1719	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
		1720	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
		1721
		1722	1;
		1723	}) {
		1724	$self->message ("Something went wrong deep within the crossfire server. "
		1725	. "I'll try to bring you back to the map you were before. "
		1726	. "Please report this to the dungeon master",
		1727	cf::NDI_UNIQUE \| cf::NDI_RED);
		1728
		1729	warn "ERROR in enter_exit: $@";
		1730	$self->leave_link;
		1731	}
		1732	})->prio (1);
		1733	}
		1734
895	=head3 cf::client	1735	=head3 cf::client
896		1736
897	=over 4	1737	=over 4
898		1738
899	=item $client->send_drawinfo ($text, $flags)	1739	=item $client->send_drawinfo ($text, $flags)
…		…
942	on_reply => sub {	1782	on_reply => sub {
943	my ($ns, $msg) = @_;	1783	my ($ns, $msg) = @_;
944		1784
945	# this weird shuffling is so that direct followup queries	1785	# this weird shuffling is so that direct followup queries
946	# get handled first	1786	# get handled first
947	my $queue = delete $ns->{query_queue};	1787	my $queue = delete $ns->{query_queue}
		1788	or return; # be conservative, not sure how that can happen, but we saw a crash here
948		1789
949	(shift @$queue)->[1]->($msg);	1790	(shift @$queue)->[1]->($msg);
950		1791
951	push @{ $ns->{query_queue} }, @$queue;	1792	push @{ $ns->{query_queue} }, @$queue;
952		1793
…		…
958	}	1799	}
959	}	1800	}
960	},	1801	},
961	);	1802	);
962		1803
963	=item $client->coro (\&cb)	1804	=item $client->async (\&cb)
964		1805
965	Create a new coroutine, running the specified callback. The coroutine will	1806	Create a new coroutine, running the specified callback. The coroutine will
966	be automatically cancelled when the client gets destroyed (e.g. on logout,	1807	be automatically cancelled when the client gets destroyed (e.g. on logout,
967	or loss of connection).	1808	or loss of connection).
968		1809
969	=cut	1810	=cut
970		1811
971	sub cf::client::coro {	1812	sub cf::client::async {
972	my ($self, $cb) = @_;	1813	my ($self, $cb) = @_;
973		1814
974	my $coro; $coro = async {	1815	my $coro = &Coro::async ($cb);
975	eval {
976	$cb->();
977	};
978	warn $@ if $@;
979	};
980		1816
981	$coro->on_destroy (sub {	1817	$coro->on_destroy (sub {
982	delete $self->{_coro}{$coro+0};	1818	delete $self->{_coro}{$coro+0};
983	});	1819	});
984		1820
…		…
1156		1992
1157	{	1993	{
1158	my $path = cf::localdir . "/database.pst";	1994	my $path = cf::localdir . "/database.pst";
1159		1995
1160	sub db_load() {	1996	sub db_load() {
1161	warn "loading database $path\n";#d# remove later
1162	$DB = stat $path ? Storable::retrieve $path : { };	1997	$DB = stat $path ? Storable::retrieve $path : { };
1163	}	1998	}
1164		1999
1165	my $pid;	2000	my $pid;
1166		2001
1167	sub db_save() {	2002	sub db_save() {
1168	warn "saving database $path\n";#d# remove later
1169	waitpid $pid, 0 if $pid;	2003	waitpid $pid, 0 if $pid;
1170	if (0 == ($pid = fork)) {	2004	if (0 == ($pid = fork)) {
1171	$DB->{_meta}{version} = 1;	2005	$DB->{_meta}{version} = 1;
1172	Storable::nstore $DB, "$path~";	2006	Storable::nstore $DB, "$path~";
1173	rename "$path~", $path;	2007	rename "$path~", $path;
…		…
1221	open my $fh, "<:utf8", cf::confdir . "/config"	2055	open my $fh, "<:utf8", cf::confdir . "/config"
1222	or return;	2056	or return;
1223		2057
1224	local $/;	2058	local $/;
1225	*CFG = YAML::Syck::Load <$fh>;	2059	*CFG = YAML::Syck::Load <$fh>;
		2060
		2061	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2062
		2063	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2064	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2065
		2066	if (exists $CFG{mlockall}) {
		2067	eval {
		2068	$CFG{mlockall} ? &mlockall : &munlockall
		2069	and die "WARNING: m(un)lockall failed: $!\n";
		2070	};
		2071	warn $@ if $@;
		2072	}
1226	}	2073	}
1227		2074
1228	sub main {	2075	sub main {
		2076	# we must not ever block the main coroutine
		2077	local $Coro::idle = sub {
		2078	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2079	async { Event::one_event };
		2080	};
		2081
1229	cfg_load;	2082	cfg_load;
1230	db_load;	2083	db_load;
1231	load_extensions;	2084	load_extensions;
1232	Event::loop;	2085	Event::loop;
1233	}	2086	}
1234		2087
1235	#############################################################################	2088	#############################################################################
1236	# initialisation	2089	# initialisation
1237		2090
1238	sub _perl_reload() {	2091	sub reload() {
		2092	# can/must only be called in main
		2093	if ($Coro::current != $Coro::main) {
		2094	warn "can only reload from main coroutine\n";
		2095	return;
		2096	}
		2097
1239	warn "reloading...";	2098	warn "reloading...";
1240		2099
		2100	my $guard = freeze_mainloop;
		2101	cf::emergency_save;
		2102
1241	eval {	2103	eval {
1242	local $FREEZE = 1;	2104	# if anything goes wrong in here, we should simply crash as we already saved
1243
1244	cf::emergency_save;
1245		2105
1246	# cancel all watchers	2106	# cancel all watchers
1247	for (Event::all_watchers) {	2107	for (Event::all_watchers) {
1248	$_->cancel if $_->data & WF_AUTOCANCEL;	2108	$_->cancel if $_->data & WF_AUTOCANCEL;
1249	}	2109	}
…		…
1308		2168
1309	# reattach attachments to objects	2169	# reattach attachments to objects
1310	warn "reattach";	2170	warn "reattach";
1311	_global_reattach;	2171	_global_reattach;
1312	};	2172	};
1313	warn $@ if $@;
1314		2173
1315	warn "reloaded";	2174	if ($@) {
		2175	warn $@;
		2176	warn "error while reloading, exiting.";
		2177	exit 1;
		2178	}
		2179
		2180	warn "reloaded successfully";
1316	};	2181	};
1317		2182
1318	sub perl_reload() {	2183	#############################################################################
1319	_perl_reload;	2184
		2185	unless ($LINK_MAP) {
		2186	$LINK_MAP = cf::map::new;
		2187
		2188	$LINK_MAP->width (41);
		2189	$LINK_MAP->height (41);
		2190	$LINK_MAP->alloc;
		2191	$LINK_MAP->path ("{link}");
		2192	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
		2193	$LINK_MAP->in_memory (MAP_IN_MEMORY);
		2194
		2195	# dirty hack because... archetypes are not yet loaded
		2196	Event->timer (
		2197	after => 10,
		2198	cb => sub {
		2199	$_[0]->w->cancel;
		2200
		2201	# provide some exits "home"
		2202	my $exit = cf::object::new "exit";
		2203
		2204	$exit->slaying ($EMERGENCY_POSITION->[0]);
		2205	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
		2206	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
		2207
		2208	$LINK_MAP->insert ($exit->clone, 19, 19);
		2209	$LINK_MAP->insert ($exit->clone, 19, 20);
		2210	$LINK_MAP->insert ($exit->clone, 19, 21);
		2211	$LINK_MAP->insert ($exit->clone, 20, 19);
		2212	$LINK_MAP->insert ($exit->clone, 20, 21);
		2213	$LINK_MAP->insert ($exit->clone, 21, 19);
		2214	$LINK_MAP->insert ($exit->clone, 21, 20);
		2215	$LINK_MAP->insert ($exit->clone, 21, 21);
		2216
		2217	$exit->destroy;
		2218	});
		2219
		2220	$LINK_MAP->{deny_save} = 1;
		2221	$LINK_MAP->{deny_reset} = 1;
		2222
		2223	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1320	}	2224	}
1321		2225
1322	register "<global>", __PACKAGE__;	2226	register "<global>", __PACKAGE__;
1323		2227
1324	register_command "perl-reload" => sub {	2228	register_command "reload" => sub {
1325	my ($who, $arg) = @_;	2229	my ($who, $arg) = @_;
1326		2230
1327	if ($who->flag (FLAG_WIZ)) {	2231	if ($who->flag (FLAG_WIZ)) {
		2232	$who->message ("start of reload.");
		2233	reload;
1328	$who->message ("reloading...");	2234	$who->message ("end of reload.");
1329	_perl_reload;
1330	}	2235	}
1331	};	2236	};
1332		2237
1333	unshift @INC, $LIBDIR;	2238	unshift @INC, $LIBDIR;
1334		2239
…		…
1336	reentrant => 0,	2241	reentrant => 0,
1337	prio => 0,	2242	prio => 0,
1338	at => $NEXT_TICK \|\| $TICK,	2243	at => $NEXT_TICK \|\| $TICK,
1339	data => WF_AUTOCANCEL,	2244	data => WF_AUTOCANCEL,
1340	cb => sub {	2245	cb => sub {
1341	unless ($FREEZE) {
1342	cf::server_tick; # one server iteration	2246	cf::server_tick; # one server iteration
1343	$RUNTIME += $TICK;	2247	$RUNTIME += $TICK;
1344	}
1345
1346	$NEXT_TICK += $TICK;	2248	$NEXT_TICK += $TICK;
1347		2249
1348	# if we are delayed by four ticks or more, skip them all	2250	# if we are delayed by four ticks or more, skip them all
1349	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2251	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1350		2252
…		…
1353	},	2255	},
1354	);	2256	);
1355		2257
1356	IO::AIO::max_poll_time $TICK * 0.2;	2258	IO::AIO::max_poll_time $TICK * 0.2;
1357		2259
		2260	Event->io (
1358	Event->io (fd => IO::AIO::poll_fileno,	2261	fd => IO::AIO::poll_fileno,
1359	poll => 'r',	2262	poll => 'r',
1360	prio => 5,	2263	prio => 5,
1361	data => WF_AUTOCANCEL,	2264	data => WF_AUTOCANCEL,
1362	cb => \&IO::AIO::poll_cb);	2265	cb => \&IO::AIO::poll_cb,
		2266	);
1363		2267
1364	# we must not ever block the main coroutine	2268	Event->timer (
1365	$Coro::idle = sub {	2269	data => WF_AUTOCANCEL,
1366	#Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#	2270	after => 0,
1367	warn "FATAL: Coro::idle was called, major BUG\n";	2271	interval => 10,
		2272	cb => sub {
1368	(Coro::unblock_sub {	2273	(Coro::unblock_sub {
1369	Event::one_event;	2274	write_runtime
		2275	or warn "ERROR: unable to write runtime file: $!";
1370	})->();	2276	})->();
1371	};	2277	},
		2278	);
		2279
		2280	END { cf::emergency_save }
1372		2281
1373	1	2282	1
1374		2283

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.104 by root, Sat Dec 30 16:56:16 2006 UTC vs. Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.104 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC