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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.107 by root, Sun Dec 31 18:10:40 2006 UTC vs.
Revision 1.150 by root, Mon Jan 8 19:25:53 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	use Coro::AIO;
19		19
		20	use Digest::MD5;
20	use Fcntl;	21	use Fcntl;
21	use IO::AIO 2.31 ();	22	use IO::AIO 2.32 ();
22	use YAML::Syck ();	23	use YAML::Syck ();
23	use Time::HiRes;	24	use Time::HiRes;
24		25
25	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
26		27
27	# 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?
28	$YAML::Syck::ImplicitUnicode = 1;	29	$YAML::Syck::ImplicitUnicode = 1;
29		30
30	$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
31		32
32	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
33		34
34	our %COMMAND = ();	35	our %COMMAND = ();
35	our %COMMAND_TIME = ();	36	our %COMMAND_TIME = ();
…		…
46	our %CFG;	47	our %CFG;
47		48
48	our $UPTIME; $UPTIME \|\|= time;	49	our $UPTIME; $UPTIME \|\|= time;
49	our $RUNTIME;	50	our $RUNTIME;
50		51
		52	our %PLAYER; # all users
51	our %MAP; # all maps	53	our %MAP; # all maps
52	our $LINK_MAP; # the special {link} map	54	our $LINK_MAP; # the special {link} map
53	our $FREEZE;	55	our $RANDOM_MAPS = cf::localdir . "/random";
		56	our %EXT_CORO; # coroutines bound to extensions
54		57
55	binmode STDOUT;	58	binmode STDOUT;
56	binmode STDERR;	59	binmode STDERR;
57		60
58	# read virtual server time, if available	61	# read virtual server time, if available
…		…
64		67
65	mkdir cf::localdir;	68	mkdir cf::localdir;
66	mkdir cf::localdir . "/" . cf::playerdir;	69	mkdir cf::localdir . "/" . cf::playerdir;
67	mkdir cf::localdir . "/" . cf::tmpdir;	70	mkdir cf::localdir . "/" . cf::tmpdir;
68	mkdir cf::localdir . "/" . cf::uniquedir;	71	mkdir cf::localdir . "/" . cf::uniquedir;
		72	mkdir $RANDOM_MAPS;
69		73
70	our %EXT_CORO;	74	# a special map that is always available
		75	our $LINK_MAP;
		76	our $EMERGENCY_POSITION;
71		77
72	#############################################################################	78	#############################################################################
73		79
74	=head2 GLOBAL VARIABLES	80	=head2 GLOBAL VARIABLES
75		81
…		…
112	utf8::encode $msg;	118	utf8::encode $msg;
113		119
114	$msg .= "\n"	120	$msg .= "\n"
115	unless $msg =~ /\n$/;	121	unless $msg =~ /\n$/;
116		122
117	LOG llevError, "cfperl: $msg";	123	LOG llevError, $msg;
118	};	124	};
119	}	125	}
120		126
121	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	127	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
122	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	128	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
174	sub to_json($) {	180	sub to_json($) {
175	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	181	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
176	JSON::Syck::Dump $_[0]	182	JSON::Syck::Dump $_[0]
177	}	183	}
178		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
179	=item cf::sync_job { BLOCK }	245	=item cf::sync_job { BLOCK }
180		246
181	The design of crossfire+ requires that the main coro ($Coro::main) is	247	The design of crossfire+ requires that the main coro ($Coro::main) is
182	always able to handle events or runnable, as crossfire+ is only partly	248	always able to handle events or runnable, as crossfire+ is only partly
183	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	249	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
…		…
190	=cut	256	=cut
191		257
192	sub sync_job(&) {	258	sub sync_job(&) {
193	my ($job) = @_;	259	my ($job) = @_;
194		260
195	my $busy = 1;
196	my @res;
197
198	# TODO: use suspend/resume instead
199	local $FREEZE = 1;
200
201	my $coro = Coro::async {
202	@res = eval { $job->() };
203	warn $@ if $@;
204	undef $busy;
205	};
206
207	if ($Coro::current == $Coro::main) {	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;
208	$coro->prio (Coro::PRIO_MAX);	276	})->prio (Coro::PRIO_MAX);
		277
209	while ($busy) {	278	while ($busy) {
210	Coro::cede_notself;	279	Coro::cede or Event::one_event;
211	Event::one_event unless Coro::nready;
212	}	280	}
		281
		282	wantarray ? @res : $res[0]
213	} else {	283	} else {
214	$coro->join;	284	# we are in another coroutine, how wonderful, everything just works
		285
		286	$job->()
215	}	287	}
216
217	wantarray ? @res : $res[0]
218	}	288	}
219		289
220	=item $coro = cf::coro { BLOCK }	290	=item $coro = cf::async_ext { BLOCK }
221		291
222	Creates and returns a new coro. This coro is automcatially being canceled	292	Like async, but this coro is automcatially being canceled when the
223	when the extension calling this is being unloaded.	293	extension calling this is being unloaded.
224		294
225	=cut	295	=cut
226		296
227	sub coro(&) {	297	sub async_ext(&) {
228	my $cb = shift;	298	my $cb = shift;
229		299
230	my $coro; $coro = async {	300	my $coro = &Coro::async ($cb);
231	eval {
232	$cb->();
233	};
234	warn $@ if $@;
235	};
236		301
237	$coro->on_destroy (sub {	302	$coro->on_destroy (sub {
238	delete $EXT_CORO{$coro+0};	303	delete $EXT_CORO{$coro+0};
239	});	304	});
240	$EXT_CORO{$coro+0} = $coro;	305	$EXT_CORO{$coro+0} = $coro;
241		306
242	$coro	307	$coro
243	}	308	}
244		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
245	=back	332	=back
246		333
247	=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;
248		455
249	#############################################################################	456	#############################################################################
250		457
251	=head2 ATTACHABLE OBJECTS	458	=head2 ATTACHABLE OBJECTS
252		459
…		…
660	or return;	867	or return;
661		868
662	unless (aio_stat "$filename.pst") {	869	unless (aio_stat "$filename.pst") {
663	(aio_load "$filename.pst", $av) >= 0	870	(aio_load "$filename.pst", $av) >= 0
664	or return;	871	or return;
665	$av = eval { (Storable::thaw <$av>)->{objs} };	872	$av = eval { (Storable::thaw $av)->{objs} };
666	}	873	}
667		874
		875	warn sprintf "loading %s (%d)\n",
		876	$filename, length $data, scalar @{$av \|\| []};#d#
668	return ($data, $av);	877	return ($data, $av);
669	}	878	}
670		879
671	#############################################################################	880	#############################################################################
672	# command handling &c	881	# command handling &c
…		…
863		1072
864	=head2 CORE EXTENSIONS	1073	=head2 CORE EXTENSIONS
865		1074
866	Functions and methods that extend core crossfire objects.	1075	Functions and methods that extend core crossfire objects.
867		1076
		1077	=cut
		1078
		1079	package cf::player;
		1080
868	=head3 cf::player	1081	=head3 cf::player
869		1082
870	=over 4	1083	=over 4
871		1084
872	=item cf::player::exists $login	1085	=item cf::player::find $login
873		1086
874	Returns true when the given account exists.	1087	Returns the given player object, loading it if necessary (might block).
875		1088
876	=cut	1089	=cut
877		1090
878	sub cf::player::exists($) {	1091	sub playerdir($) {
879	cf::player::find $_[0]	1092	cf::localdir
880	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1093	. "/"
		1094	. cf::playerdir
		1095	. "/"
		1096	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1097	}
		1098
		1099	sub path($) {
		1100	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1101
		1102	(playerdir $login) . "/$login.pl"
		1103	}
		1104
		1105	sub find_active($) {
		1106	$cf::PLAYER{$_[0]}
		1107	and $cf::PLAYER{$_[0]}->active
		1108	and $cf::PLAYER{$_[0]}
		1109	}
		1110
		1111	sub exists($) {
		1112	my ($login) = @_;
		1113
		1114	$cf::PLAYER{$login}
		1115	or cf::sync_job { !aio_stat $login }
		1116	}
		1117
		1118	sub find($) {
		1119	return $cf::PLAYER{$_[0]} \|\| do {
		1120	my $login = $_[0];
		1121
		1122	my $guard = cf::lock_acquire "user_find:$login";
		1123
		1124	$cf::PLAYER{$login} \|\|= (load_pl path $login or return);
		1125	};
		1126	}
		1127
		1128	sub save($) {
		1129	my ($pl) = @_;
		1130
		1131	return if $pl->{deny_save};
		1132
		1133	my $path = path $pl;
		1134	my $guard = cf::lock_acquire "user_save:$path";
		1135
		1136	return if $pl->{deny_save};
		1137
		1138	Coro::AIO::aio_mkdir playerdir $pl, 0770;
		1139	$pl->{last_save} = $cf::RUNTIME;
		1140
		1141	$pl->save_pl ($path);
		1142	Coro::cede;
		1143	}
		1144
		1145	sub new($) {
		1146	my ($login) = @_;
		1147
		1148	my $self = create;
		1149
		1150	$self->ob->name ($login);
		1151	$self->{deny_save} = 1;
		1152
		1153	$cf::PLAYER{$login} = $self;
		1154
		1155	$self
		1156	}
		1157
		1158	sub quit_character {
		1159	my ($pl) = @_;
		1160
		1161	$pl->{deny_save} = 1;
		1162	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1163
		1164	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1165	$pl->deactivate;
		1166	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1167	$pl->ns->destroy if $pl->ns;
		1168
		1169	my $path = playerdir $pl;
		1170	my $temp = "$path~$cf::RUNTIME~deleting~";
		1171	Coro::AIO::aio_rename $path, $temp;
		1172	delete $cf::PLAYER{$pl->ob->name};
		1173	$pl->destroy;
		1174	IO::AIO::aio_rmtree $temp;
881	}	1175	}
882		1176
883	=item $player->ext_reply ($msgid, $msgtype, %msg)	1177	=item $player->ext_reply ($msgid, $msgtype, %msg)
884		1178
885	Sends an ext reply to the player.	1179	Sends an ext reply to the player.
886		1180
887	=cut	1181	=cut
888		1182
889	sub cf::player::ext_reply($$$%) {	1183	sub ext_reply($$$%) {
890	my ($self, $id, %msg) = @_;	1184	my ($self, $id, %msg) = @_;
891		1185
892	$msg{msgid} = $id;	1186	$msg{msgid} = $id;
893		1187
894	$self->send ("ext " . to_json \%msg);	1188	$self->send ("ext " . cf::to_json \%msg);
895	}	1189	}
		1190
		1191	package cf;
896		1192
897	=back	1193	=back
		1194
		1195
		1196	=head3 cf::map
		1197
		1198	=over 4
		1199
		1200	=cut
		1201
		1202	package cf::map;
		1203
		1204	use Fcntl;
		1205	use Coro::AIO;
		1206
		1207	our $MAX_RESET = 3600;
		1208	our $DEFAULT_RESET = 3000;
		1209
		1210	sub generate_random_map {
		1211	my ($path, $rmp) = @_;
		1212
		1213	# mit "rum" bekleckern, nicht
		1214	cf::map::_create_random_map
		1215	$path,
		1216	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
		1217	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
		1218	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
		1219	$rmp->{exit_on_final_map},
		1220	$rmp->{xsize}, $rmp->{ysize},
		1221	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
		1222	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
		1223	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
		1224	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
		1225	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
		1226	(cf::region::find $rmp->{region})
		1227	}
		1228
		1229	# and all this just because we cannot iterate over
		1230	# all maps in C++...
		1231	sub change_all_map_light {
		1232	my ($change) = @_;
		1233
		1234	$_->change_map_light ($change)
		1235	for grep $_->outdoor, values %cf::MAP;
		1236	}
		1237
		1238	sub try_load_header($) {
		1239	my ($path) = @_;
		1240
		1241	utf8::encode $path;
		1242	aio_open $path, O_RDONLY, 0
		1243	or return;
		1244
		1245	my $map = cf::map::new
		1246	or return;
		1247
		1248	# for better error messages only, will be overwritten
		1249	$map->path ($path);
		1250
		1251	$map->load_header ($path)
		1252	or return;
		1253
		1254	$map->{load_path} = $path;
		1255
		1256	$map
		1257	}
		1258
		1259	sub find;
		1260	sub find {
		1261	my ($path, $origin) = @_;
		1262
		1263	#warn "find<$path,$origin>\n";#d#
		1264
		1265	$path = new cf::path $path, $origin && $origin->path;
		1266	my $key = $path->as_string;
		1267
		1268	cf::lock_wait "map_find:$key";
		1269
		1270	$cf::MAP{$key} \|\| do {
		1271	my $guard = cf::lock_acquire "map_find:$key";
		1272
		1273	# do it the slow way
		1274	my $map = try_load_header $path->save_path;
		1275
		1276	Coro::cede;
		1277
		1278	if ($map) {
		1279	$map->last_access ((delete $map->{last_access})
		1280	\|\| $cf::RUNTIME); #d#
		1281	# safety
		1282	$map->{instantiate_time} = $cf::RUNTIME
		1283	if $map->{instantiate_time} > $cf::RUNTIME;
		1284	} else {
		1285	if (my $rmp = $path->random_map_params) {
		1286	$map = generate_random_map $key, $rmp;
		1287	} else {
		1288	$map = try_load_header $path->load_path;
		1289	}
		1290
		1291	$map or return;
		1292
		1293	$map->{load_original} = 1;
		1294	$map->{instantiate_time} = $cf::RUNTIME;
		1295	$map->last_access ($cf::RUNTIME);
		1296	$map->instantiate;
		1297
		1298	# per-player maps become, after loading, normal maps
		1299	$map->per_player (0) if $path->{user_rel};
		1300	}
		1301
		1302	$map->path ($key);
		1303	$map->{path} = $path;
		1304	$map->{last_save} = $cf::RUNTIME;
		1305
		1306	Coro::cede;
		1307
		1308	if ($map->should_reset) {
		1309	$map->reset;
		1310	undef $guard;
		1311	$map = find $path
		1312	or return;
		1313	}
		1314
		1315	$cf::MAP{$key} = $map
		1316	}
		1317	}
		1318
		1319	sub load {
		1320	my ($self) = @_;
		1321
		1322	my $path = $self->{path};
		1323	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1324
		1325	return if $self->in_memory != cf::MAP_SWAPPED;
		1326
		1327	$self->in_memory (cf::MAP_LOADING);
		1328
		1329	$self->alloc;
		1330	$self->load_objects ($self->{load_path}, 1)
		1331	or return;
		1332
		1333	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1334	if delete $self->{load_original};
		1335
		1336	if (my $uniq = $path->uniq_path) {
		1337	utf8::encode $uniq;
		1338	if (aio_open $uniq, O_RDONLY, 0) {
		1339	$self->clear_unique_items;
		1340	$self->load_objects ($uniq, 0);
		1341	}
		1342	}
		1343
		1344	Coro::cede;
		1345
		1346	# now do the right thing for maps
		1347	$self->link_multipart_objects;
		1348
		1349	if ($self->{path}->is_style_map) {
		1350	$self->{deny_save} = 1;
		1351	$self->{deny_reset} = 1;
		1352	} else {
		1353	$self->fix_auto_apply;
		1354	$self->decay_objects;
		1355	$self->update_buttons;
		1356	$self->set_darkness_map;
		1357	$self->difficulty ($self->estimate_difficulty)
		1358	unless $self->difficulty;
		1359	$self->activate;
		1360	}
		1361
		1362	Coro::cede;
		1363
		1364	$self->in_memory (cf::MAP_IN_MEMORY);
		1365	}
		1366
		1367	sub find_sync {
		1368	my ($path, $origin) = @_;
		1369
		1370	cf::sync_job { cf::map::find $path, $origin }
		1371	}
		1372
		1373	sub do_load_sync {
		1374	my ($map) = @_;
		1375
		1376	cf::sync_job { $map->load };
		1377	}
		1378
		1379	sub save {
		1380	my ($self) = @_;
		1381
		1382	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1383
		1384	$self->{last_save} = $cf::RUNTIME;
		1385
		1386	return unless $self->dirty;
		1387
		1388	my $save = $self->{path}->save_path; utf8::encode $save;
		1389	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
		1390
		1391	$self->{load_path} = $save;
		1392
		1393	return if $self->{deny_save};
		1394
		1395	local $self->{last_access} = $self->last_access;#d#
		1396
		1397	cf::async {
		1398	$_->contr->save for $self->players;
		1399	};
		1400
		1401	if ($uniq) {
		1402	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
		1403	$self->save_objects ($uniq, cf::IO_UNIQUES);
		1404	} else {
		1405	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
		1406	}
		1407	}
		1408
		1409	sub swap_out {
		1410	my ($self) = @_;
		1411
		1412	# save first because save cedes
		1413	$self->save;
		1414
		1415	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1416
		1417	return if $self->players;
		1418	return if $self->in_memory != cf::MAP_IN_MEMORY;
		1419	return if $self->{deny_save};
		1420
		1421	$self->clear;
		1422	$self->in_memory (cf::MAP_SWAPPED);
		1423	}
		1424
		1425	sub reset_at {
		1426	my ($self) = @_;
		1427
		1428	# TODO: safety, remove and allow resettable per-player maps
		1429	return 1e99 if $self->{path}{user_rel};
		1430	return 1e99 if $self->{deny_reset};
		1431
		1432	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		1433	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
		1434
		1435	$time + $to
		1436	}
		1437
		1438	sub should_reset {
		1439	my ($self) = @_;
		1440
		1441	$self->reset_at <= $cf::RUNTIME
		1442	}
		1443
		1444	sub unlink_save {
		1445	my ($self) = @_;
		1446
		1447	utf8::encode (my $save = $self->{path}->save_path);
		1448	aioreq_pri 3; IO::AIO::aio_unlink $save;
		1449	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
		1450	}
		1451
		1452	sub rename {
		1453	my ($self, $new_path) = @_;
		1454
		1455	$self->unlink_save;
		1456
		1457	delete $cf::MAP{$self->path};
		1458	$self->{path} = new cf::path $new_path;
		1459	$self->path ($self->{path}->as_string);
		1460	$cf::MAP{$self->path} = $self;
		1461
		1462	$self->save;
		1463	}
		1464
		1465	sub reset {
		1466	my ($self) = @_;
		1467
		1468	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1469
		1470	return if $self->players;
		1471	return if $self->{path}{user_rel};#d#
		1472
		1473	warn "resetting map ", $self->path;#d#
		1474
		1475	delete $cf::MAP{$self->path};
		1476
		1477	$_->clear_links_to ($self) for values %cf::MAP;
		1478
		1479	$self->unlink_save;
		1480	$self->destroy;
		1481	}
		1482
		1483	my $nuke_counter = "aaaa";
		1484
		1485	sub nuke {
		1486	my ($self) = @_;
		1487
		1488	$self->{deny_save} = 1;
		1489	$self->reset_timeout (1);
		1490	$self->rename ("{nuke}/" . ($nuke_counter++));
		1491	$self->reset; # polite request, might not happen
		1492	}
		1493
		1494	sub customise_for {
		1495	my ($map, $ob) = @_;
		1496
		1497	if ($map->per_player) {
		1498	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
		1499	}
		1500
		1501	$map
		1502	}
		1503
		1504	sub emergency_save {
		1505	my $freeze_guard = cf::freeze_mainloop;
		1506
		1507	warn "enter emergency perl save\n";
		1508
		1509	cf::sync_job {
		1510	warn "begin emergency player save\n";
		1511	$_->save for values %cf::PLAYER;
		1512	warn "end emergency player save\n";
		1513
		1514	warn "begin emergency map save\n";
		1515	$_->save for values %cf::MAP;
		1516	warn "end emergency map save\n";
		1517	};
		1518
		1519	warn "leave emergency perl save\n";
		1520	}
		1521
		1522	package cf;
		1523
		1524	=back
		1525
898		1526
899	=head3 cf::object::player	1527	=head3 cf::object::player
900		1528
901	=over 4	1529	=over 4
902		1530
…		…
938	(ref $cf::CFG{"may_$access"}	1566	(ref $cf::CFG{"may_$access"}
939	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	1567	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
940	: $cf::CFG{"may_$access"})	1568	: $cf::CFG{"may_$access"})
941	}	1569	}
942		1570
		1571	=item $player_object->enter_link
		1572
		1573	Freezes the player and moves him/her to a special map (C<{link}>).
		1574
		1575	The player should be reaosnably safe there for short amounts of time. You
		1576	I<MUST> call C<leave_link> as soon as possible, though.
		1577
		1578	=item $player_object->leave_link ($map, $x, $y)
		1579
		1580	Moves the player out of the specila link map onto the given map. If the
		1581	map is not valid (or omitted), the player will be moved back to the
		1582	location he/she was before the call to C<enter_link>, or, if that fails,
		1583	to the emergency map position.
		1584
		1585	Might block.
		1586
		1587	=cut
		1588
		1589	sub cf::object::player::enter_link {
		1590	my ($self) = @_;
		1591
		1592	$self->deactivate_recursive;
		1593
		1594	return if $self->map == $LINK_MAP;
		1595
		1596	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
		1597	if $self->map;
		1598
		1599	$self->enter_map ($LINK_MAP, 20, 20);
		1600	}
		1601
		1602	sub cf::object::player::leave_link {
		1603	my ($self, $map, $x, $y) = @_;
		1604
		1605	my $link_pos = delete $self->{_link_pos};
		1606
		1607	unless ($map) {
		1608	# restore original map position
		1609	($map, $x, $y) = @{ $link_pos \|\| [] };
		1610	$map = cf::map::find $map;
		1611
		1612	unless ($map) {
		1613	($map, $x, $y) = @$EMERGENCY_POSITION;
		1614	$map = cf::map::find $map
		1615	or die "FATAL: cannot load emergency map\n";
		1616	}
		1617	}
		1618
		1619	($x, $y) = (-1, -1)
		1620	unless (defined $x) && (defined $y);
		1621
		1622	# use -1 or undef as default coordinates, not 0, 0
		1623	($x, $y) = ($map->enter_x, $map->enter_y)
		1624	if $x <=0 && $y <= 0;
		1625
		1626	$map->load;
		1627
		1628	return unless $self->contr->active;
		1629	$self->activate_recursive;
		1630	$self->enter_map ($map, $x, $y);
		1631	}
		1632
		1633	cf::player->attach (
		1634	on_logout => sub {
		1635	my ($pl) = @_;
		1636
		1637	# abort map switching before logout
		1638	if ($pl->ob->{_link_pos}) {
		1639	cf::sync_job {
		1640	$pl->ob->leave_link
		1641	};
		1642	}
		1643	},
		1644	on_login => sub {
		1645	my ($pl) = @_;
		1646
		1647	# try to abort aborted map switching on player login :)
		1648	# should happen only on crashes
		1649	if ($pl->ob->{_link_pos}) {
		1650	$pl->ob->enter_link;
		1651	(async {
		1652	# we need this sleep as the login has a concurrent enter_exit running
		1653	# and this sleep increases chances of the player not ending up in scorn
		1654	$pl->ob->reply (undef,
		1655	"There was an internal problem at your last logout, "
		1656	. "the server will try to bring you to your intended destination in a second.",
		1657	cf::NDI_RED);
		1658	Coro::Timer::sleep 1;
		1659	$pl->ob->leave_link;
		1660	})->prio (2);
		1661	}
		1662	},
		1663	);
		1664
		1665	=item $player_object->goto ($path, $x, $y)
		1666
		1667	=cut
		1668
		1669	sub cf::object::player::goto {
		1670	my ($self, $path, $x, $y) = @_;
		1671
		1672	$self->enter_link;
		1673
		1674	(async {
		1675	$path = new cf::path $path;
		1676
		1677	my $map = cf::map::find $path->as_string;
		1678	$map = $map->customise_for ($self) if $map;
		1679
		1680	# warn "entering ", $map->path, " at ($x, $y)\n"
		1681	# if $map;
		1682
		1683	$map or $map->cluck ("oy");#d#
		1684	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1685
		1686	$self->leave_link ($map, $x, $y);
		1687	})->prio (1);
		1688	}
		1689
		1690	=item $player_object->enter_exit ($exit_object)
		1691
		1692	=cut
		1693
		1694	sub parse_random_map_params {
		1695	my ($spec) = @_;
		1696
		1697	my $rmp = { # defaults
		1698	xsize => 10,
		1699	ysize => 10,
		1700	};
		1701
		1702	for (split /\n/, $spec) {
		1703	my ($k, $v) = split /\s+/, $_, 2;
		1704
		1705	$rmp->{lc $k} = $v if (length $k) && (length $v);
		1706	}
		1707
		1708	$rmp
		1709	}
		1710
		1711	sub prepare_random_map {
		1712	my ($exit) = @_;
		1713
		1714	# all this does is basically replace the /! path by
		1715	# a new random map path (?random/...) with a seed
		1716	# that depends on the exit object
		1717
		1718	my $rmp = parse_random_map_params $exit->msg;
		1719
		1720	if ($exit->map) {
		1721	$rmp->{region} = $exit->map->region_name;
		1722	$rmp->{origin_map} = $exit->map->path;
		1723	$rmp->{origin_x} = $exit->x;
		1724	$rmp->{origin_y} = $exit->y;
		1725	}
		1726
		1727	$rmp->{random_seed} \|\|= $exit->random_seed;
		1728
		1729	my $data = cf::to_json $rmp;
		1730	my $md5 = Digest::MD5::md5_hex $data;
		1731
		1732	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY \| O_CREAT, 0666) {
		1733	aio_write $fh, 0, (length $data), $data, 0;
		1734
		1735	$exit->slaying ("?random/$md5");
		1736	$exit->msg (undef);
		1737	}
		1738	}
		1739
		1740	sub cf::object::player::enter_exit {
		1741	my ($self, $exit) = @_;
		1742
		1743	return unless $self->type == cf::PLAYER;
		1744
		1745	$self->enter_link;
		1746
		1747	(async {
		1748	$self->deactivate_recursive; # just to be sure
		1749	unless (eval {
		1750	prepare_random_map $exit
		1751	if $exit->slaying eq "/!";
		1752
		1753	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
		1754	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
		1755
		1756	1;
		1757	}) {
		1758	$self->message ("Something went wrong deep within the crossfire server. "
		1759	. "I'll try to bring you back to the map you were before. "
		1760	. "Please report this to the dungeon master",
		1761	cf::NDI_UNIQUE \| cf::NDI_RED);
		1762
		1763	warn "ERROR in enter_exit: $@";
		1764	$self->leave_link;
		1765	}
		1766	})->prio (1);
		1767	}
		1768
943	=head3 cf::client	1769	=head3 cf::client
944		1770
945	=over 4	1771	=over 4
946		1772
947	=item $client->send_drawinfo ($text, $flags)	1773	=item $client->send_drawinfo ($text, $flags)
…		…
990	on_reply => sub {	1816	on_reply => sub {
991	my ($ns, $msg) = @_;	1817	my ($ns, $msg) = @_;
992		1818
993	# this weird shuffling is so that direct followup queries	1819	# this weird shuffling is so that direct followup queries
994	# get handled first	1820	# get handled first
995	my $queue = delete $ns->{query_queue};	1821	my $queue = delete $ns->{query_queue}
		1822	or return; # be conservative, not sure how that can happen, but we saw a crash here
996		1823
997	(shift @$queue)->[1]->($msg);	1824	(shift @$queue)->[1]->($msg);
998		1825
999	push @{ $ns->{query_queue} }, @$queue;	1826	push @{ $ns->{query_queue} }, @$queue;
1000		1827
…		…
1006	}	1833	}
1007	}	1834	}
1008	},	1835	},
1009	);	1836	);
1010		1837
1011	=item $client->coro (\&cb)	1838	=item $client->async (\&cb)
1012		1839
1013	Create a new coroutine, running the specified callback. The coroutine will	1840	Create a new coroutine, running the specified callback. The coroutine will
1014	be automatically cancelled when the client gets destroyed (e.g. on logout,	1841	be automatically cancelled when the client gets destroyed (e.g. on logout,
1015	or loss of connection).	1842	or loss of connection).
1016		1843
1017	=cut	1844	=cut
1018		1845
1019	sub cf::client::coro {	1846	sub cf::client::async {
1020	my ($self, $cb) = @_;	1847	my ($self, $cb) = @_;
1021		1848
1022	my $coro; $coro = async {	1849	my $coro = &Coro::async ($cb);
1023	eval {
1024	$cb->();
1025	};
1026	warn $@ if $@;
1027	};
1028		1850
1029	$coro->on_destroy (sub {	1851	$coro->on_destroy (sub {
1030	delete $self->{_coro}{$coro+0};	1852	delete $self->{_coro}{$coro+0};
1031	});	1853	});
1032		1854
…		…
1204		2026
1205	{	2027	{
1206	my $path = cf::localdir . "/database.pst";	2028	my $path = cf::localdir . "/database.pst";
1207		2029
1208	sub db_load() {	2030	sub db_load() {
1209	warn "loading database $path\n";#d# remove later
1210	$DB = stat $path ? Storable::retrieve $path : { };	2031	$DB = stat $path ? Storable::retrieve $path : { };
1211	}	2032	}
1212		2033
1213	my $pid;	2034	my $pid;
1214		2035
1215	sub db_save() {	2036	sub db_save() {
1216	warn "saving database $path\n";#d# remove later
1217	waitpid $pid, 0 if $pid;	2037	waitpid $pid, 0 if $pid;
1218	if (0 == ($pid = fork)) {	2038	if (0 == ($pid = fork)) {
1219	$DB->{_meta}{version} = 1;	2039	$DB->{_meta}{version} = 1;
1220	Storable::nstore $DB, "$path~";	2040	Storable::nstore $DB, "$path~";
1221	rename "$path~", $path;	2041	rename "$path~", $path;
…		…
1269	open my $fh, "<:utf8", cf::confdir . "/config"	2089	open my $fh, "<:utf8", cf::confdir . "/config"
1270	or return;	2090	or return;
1271		2091
1272	local $/;	2092	local $/;
1273	*CFG = YAML::Syck::Load <$fh>;	2093	*CFG = YAML::Syck::Load <$fh>;
		2094
		2095	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2096
		2097	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2098	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2099
		2100	if (exists $CFG{mlockall}) {
		2101	eval {
		2102	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2103	and die "WARNING: m(un)lockall failed: $!\n";
		2104	};
		2105	warn $@ if $@;
		2106	}
1274	}	2107	}
1275		2108
1276	sub main {	2109	sub main {
		2110	# we must not ever block the main coroutine
		2111	local $Coro::idle = sub {
		2112	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2113	async { Event::one_event };
		2114	};
		2115
1277	cfg_load;	2116	cfg_load;
1278	db_load;	2117	db_load;
1279	load_extensions;	2118	load_extensions;
1280	Event::loop;	2119	Event::loop;
1281	}	2120	}
1282		2121
1283	#############################################################################	2122	#############################################################################
1284	# initialisation	2123	# initialisation
1285		2124
1286	sub perl_reload() {	2125	sub reload() {
1287	# can/must only be called in main	2126	# can/must only be called in main
1288	if ($Coro::current != $Coro::main) {	2127	if ($Coro::current != $Coro::main) {
1289	warn "can only reload from main coroutine\n";	2128	warn "can only reload from main coroutine\n";
1290	return;	2129	return;
1291	}	2130	}
1292		2131
1293	warn "reloading...";	2132	warn "reloading...";
1294		2133
1295	local $FREEZE = 1;	2134	my $guard = freeze_mainloop;
1296	cf::emergency_save;	2135	cf::emergency_save;
1297		2136
1298	eval {	2137	eval {
1299	# if anything goes wrong in here, we should simply crash as we already saved	2138	# if anything goes wrong in here, we should simply crash as we already saved
1300		2139
…		…
1362	cf::load_extensions;	2201	cf::load_extensions;
1363		2202
1364	# reattach attachments to objects	2203	# reattach attachments to objects
1365	warn "reattach";	2204	warn "reattach";
1366	_global_reattach;	2205	_global_reattach;
		2206	reattach $_ for values %MAP;
1367	};	2207	};
1368		2208
1369	if ($@) {	2209	if ($@) {
1370	warn $@;	2210	warn $@;
1371	warn "error while reloading, exiting.";	2211	warn "error while reloading, exiting.";
…		…
1373	}	2213	}
1374		2214
1375	warn "reloaded successfully";	2215	warn "reloaded successfully";
1376	};	2216	};
1377		2217
		2218	#############################################################################
		2219
		2220	unless ($LINK_MAP) {
		2221	$LINK_MAP = cf::map::new;
		2222
		2223	$LINK_MAP->width (41);
		2224	$LINK_MAP->height (41);
		2225	$LINK_MAP->alloc;
		2226	$LINK_MAP->path ("{link}");
		2227	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
		2228	$LINK_MAP->in_memory (MAP_IN_MEMORY);
		2229
		2230	# dirty hack because... archetypes are not yet loaded
		2231	Event->timer (
		2232	after => 10,
		2233	cb => sub {
		2234	$_[0]->w->cancel;
		2235
		2236	# provide some exits "home"
		2237	my $exit = cf::object::new "exit";
		2238
		2239	$exit->slaying ($EMERGENCY_POSITION->[0]);
		2240	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
		2241	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
		2242
		2243	$LINK_MAP->insert ($exit->clone, 19, 19);
		2244	$LINK_MAP->insert ($exit->clone, 19, 20);
		2245	$LINK_MAP->insert ($exit->clone, 19, 21);
		2246	$LINK_MAP->insert ($exit->clone, 20, 19);
		2247	$LINK_MAP->insert ($exit->clone, 20, 21);
		2248	$LINK_MAP->insert ($exit->clone, 21, 19);
		2249	$LINK_MAP->insert ($exit->clone, 21, 20);
		2250	$LINK_MAP->insert ($exit->clone, 21, 21);
		2251
		2252	$exit->destroy;
		2253	});
		2254
		2255	$LINK_MAP->{deny_save} = 1;
		2256	$LINK_MAP->{deny_reset} = 1;
		2257
		2258	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
		2259	}
		2260
1378	register "<global>", __PACKAGE__;	2261	register "<global>", __PACKAGE__;
1379		2262
1380	register_command "perl-reload" => sub {	2263	register_command "reload" => sub {
1381	my ($who, $arg) = @_;	2264	my ($who, $arg) = @_;
1382		2265
1383	if ($who->flag (FLAG_WIZ)) {	2266	if ($who->flag (FLAG_WIZ)) {
1384	$who->message ("start of reload.");	2267	$who->message ("start of reload.");
1385	perl_reload;	2268	reload;
1386	$who->message ("end of reload.");	2269	$who->message ("end of reload.");
1387	}	2270	}
1388	};	2271	};
1389		2272
1390	unshift @INC, $LIBDIR;	2273	unshift @INC, $LIBDIR;
…		…
1393	reentrant => 0,	2276	reentrant => 0,
1394	prio => 0,	2277	prio => 0,
1395	at => $NEXT_TICK \|\| $TICK,	2278	at => $NEXT_TICK \|\| $TICK,
1396	data => WF_AUTOCANCEL,	2279	data => WF_AUTOCANCEL,
1397	cb => sub {	2280	cb => sub {
1398	unless ($FREEZE) {
1399	cf::server_tick; # one server iteration	2281	cf::server_tick; # one server iteration
1400	$RUNTIME += $TICK;	2282	$RUNTIME += $TICK;
1401	}
1402
1403	$NEXT_TICK += $TICK;	2283	$NEXT_TICK += $TICK;
1404		2284
1405	# if we are delayed by four ticks or more, skip them all	2285	# if we are delayed by four ticks or more, skip them all
1406	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2286	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1407		2287
…		…
1410	},	2290	},
1411	);	2291	);
1412		2292
1413	IO::AIO::max_poll_time $TICK * 0.2;	2293	IO::AIO::max_poll_time $TICK * 0.2;
1414		2294
		2295	Event->io (
1415	Event->io (fd => IO::AIO::poll_fileno,	2296	fd => IO::AIO::poll_fileno,
1416	poll => 'r',	2297	poll => 'r',
1417	prio => 5,	2298	prio => 5,
1418	data => WF_AUTOCANCEL,	2299	data => WF_AUTOCANCEL,
1419	cb => \&IO::AIO::poll_cb);	2300	cb => \&IO::AIO::poll_cb,
		2301	);
1420		2302
1421	# we must not ever block the main coroutine	2303	Event->timer (
1422	$Coro::idle = sub {	2304	data => WF_AUTOCANCEL,
1423	#Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#	2305	after => 0,
1424	warn "FATAL: Coro::idle was called, major BUG\n";	2306	interval => 10,
		2307	cb => sub {
1425	(Coro::unblock_sub {	2308	(Coro::unblock_sub {
1426	Event::one_event;	2309	write_runtime
		2310	or warn "ERROR: unable to write runtime file: $!";
1427	})->();	2311	})->();
1428	};	2312	},
		2313	);
		2314
		2315	END { cf::emergency_save }
1429		2316
1430	1	2317	1
1431		2318

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.107 by root, Sun Dec 31 18:10:40 2006 UTC vs. Revision 1.150 by root, Mon Jan 8 19:25:53 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.107 by root, Sun Dec 31 18:10:40 2006 UTC vs.
Revision 1.150 by root, Mon Jan 8 19:25:53 2007 UTC