[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.147 by root, Mon Jan 8 12:23:33 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	IO::AIO::aio_mkdir playerdir $pl, 0770;
		1139	$pl->{last_save} = $cf::RUNTIME;
		1140
		1141	Coro::cede;
		1142	$pl->save_pl ($path);
		1143	Coro::cede;
		1144	}
		1145
		1146	sub new($) {
		1147	my ($login) = @_;
		1148
		1149	my $self = create;
		1150
		1151	$self->ob->name ($login);
		1152	$self->{deny_save} = 1;
		1153
		1154	$cf::PLAYER{$login} = $self;
		1155
		1156	$self
		1157	}
		1158
		1159	sub quit_character {
		1160	my ($pl) = @_;
		1161
		1162	$pl->{deny_save} = 1;
		1163	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1164
		1165	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1166	$pl->deactivate;
		1167	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1168	$pl->ns->destroy if $pl->ns;
		1169
		1170	my $path = playerdir $pl;
		1171	my $temp = "$path~$cf::RUNTIME~deleting~";
		1172	IO::AIO::aio_rename $path, $temp, sub {
		1173	delete $cf::PLAYER{$pl->ob->name};
		1174	$pl->destroy;
		1175
		1176	IO::AIO::aio_rmtree $temp;
		1177	};
881	}	1178	}
882		1179
883	=item $player->ext_reply ($msgid, $msgtype, %msg)	1180	=item $player->ext_reply ($msgid, $msgtype, %msg)
884		1181
885	Sends an ext reply to the player.	1182	Sends an ext reply to the player.
886		1183
887	=cut	1184	=cut
888		1185
889	sub cf::player::ext_reply($$$%) {	1186	sub ext_reply($$$%) {
890	my ($self, $id, %msg) = @_;	1187	my ($self, $id, %msg) = @_;
891		1188
892	$msg{msgid} = $id;	1189	$msg{msgid} = $id;
893		1190
894	$self->send ("ext " . to_json \%msg);	1191	$self->send ("ext " . cf::to_json \%msg);
895	}	1192	}
		1193
		1194	package cf;
896		1195
897	=back	1196	=back
		1197
		1198
		1199	=head3 cf::map
		1200
		1201	=over 4
		1202
		1203	=cut
		1204
		1205	package cf::map;
		1206
		1207	use Fcntl;
		1208	use Coro::AIO;
		1209
		1210	our $MAX_RESET = 3600;
		1211	our $DEFAULT_RESET = 3000;
		1212
		1213	sub generate_random_map {
		1214	my ($path, $rmp) = @_;
		1215
		1216	# mit "rum" bekleckern, nicht
		1217	cf::map::_create_random_map
		1218	$path,
		1219	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
		1220	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
		1221	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
		1222	$rmp->{exit_on_final_map},
		1223	$rmp->{xsize}, $rmp->{ysize},
		1224	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
		1225	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
		1226	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
		1227	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
		1228	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
		1229	(cf::region::find $rmp->{region})
		1230	}
		1231
		1232	# and all this just because we cannot iterate over
		1233	# all maps in C++...
		1234	sub change_all_map_light {
		1235	my ($change) = @_;
		1236
		1237	$_->change_map_light ($change)
		1238	for grep $_->outdoor, values %cf::MAP;
		1239	}
		1240
		1241	sub try_load_header($) {
		1242	my ($path) = @_;
		1243
		1244	utf8::encode $path;
		1245	aio_open $path, O_RDONLY, 0
		1246	or return;
		1247
		1248	my $map = cf::map::new
		1249	or return;
		1250
		1251	# for better error messages only, will be overwritten
		1252	$map->path ($path);
		1253
		1254	$map->load_header ($path)
		1255	or return;
		1256
		1257	$map->{load_path} = $path;
		1258
		1259	$map
		1260	}
		1261
		1262	sub find;
		1263	sub find {
		1264	my ($path, $origin) = @_;
		1265
		1266	#warn "find<$path,$origin>\n";#d#
		1267
		1268	$path = new cf::path $path, $origin && $origin->path;
		1269	my $key = $path->as_string;
		1270
		1271	cf::lock_wait "map_find:$key";
		1272
		1273	$cf::MAP{$key} \|\| do {
		1274	my $guard = cf::lock_acquire "map_find:$key";
		1275
		1276	# do it the slow way
		1277	my $map = try_load_header $path->save_path;
		1278
		1279	Coro::cede;
		1280
		1281	if ($map) {
		1282	$map->last_access ((delete $map->{last_access})
		1283	\|\| $cf::RUNTIME); #d#
		1284	# safety
		1285	$map->{instantiate_time} = $cf::RUNTIME
		1286	if $map->{instantiate_time} > $cf::RUNTIME;
		1287	} else {
		1288	if (my $rmp = $path->random_map_params) {
		1289	$map = generate_random_map $key, $rmp;
		1290	} else {
		1291	$map = try_load_header $path->load_path;
		1292	}
		1293
		1294	$map or return;
		1295
		1296	$map->{load_original} = 1;
		1297	$map->{instantiate_time} = $cf::RUNTIME;
		1298	$map->last_access ($cf::RUNTIME);
		1299	$map->instantiate;
		1300
		1301	# per-player maps become, after loading, normal maps
		1302	$map->per_player (0) if $path->{user_rel};
		1303	}
		1304
		1305	$map->path ($key);
		1306	$map->{path} = $path;
		1307	$map->{last_save} = $cf::RUNTIME;
		1308
		1309	Coro::cede;
		1310
		1311	if ($map->should_reset) {
		1312	$map->reset;
		1313	undef $guard;
		1314	$map = find $path
		1315	or return;
		1316	}
		1317
		1318	$cf::MAP{$key} = $map
		1319	}
		1320	}
		1321
		1322	sub load {
		1323	my ($self) = @_;
		1324
		1325	my $path = $self->{path};
		1326	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1327
		1328	return if $self->in_memory != cf::MAP_SWAPPED;
		1329
		1330	$self->in_memory (cf::MAP_LOADING);
		1331
		1332	$self->alloc;
		1333	$self->load_objects ($self->{load_path}, 1)
		1334	or return;
		1335
		1336	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1337	if delete $self->{load_original};
		1338
		1339	if (my $uniq = $path->uniq_path) {
		1340	utf8::encode $uniq;
		1341	if (aio_open $uniq, O_RDONLY, 0) {
		1342	$self->clear_unique_items;
		1343	$self->load_objects ($uniq, 0);
		1344	}
		1345	}
		1346
		1347	Coro::cede;
		1348
		1349	# now do the right thing for maps
		1350	$self->link_multipart_objects;
		1351
		1352	if ($self->{path}->is_style_map) {
		1353	$self->{deny_save} = 1;
		1354	$self->{deny_reset} = 1;
		1355	} else {
		1356	$self->fix_auto_apply;
		1357	$self->decay_objects;
		1358	$self->update_buttons;
		1359	$self->set_darkness_map;
		1360	$self->difficulty ($self->estimate_difficulty)
		1361	unless $self->difficulty;
		1362	$self->activate;
		1363	}
		1364
		1365	Coro::cede;
		1366
		1367	$self->in_memory (cf::MAP_IN_MEMORY);
		1368	}
		1369
		1370	sub find_sync {
		1371	my ($path, $origin) = @_;
		1372
		1373	cf::sync_job { cf::map::find $path, $origin }
		1374	}
		1375
		1376	sub do_load_sync {
		1377	my ($map) = @_;
		1378
		1379	cf::sync_job { $map->load };
		1380	}
		1381
		1382	sub save {
		1383	my ($self) = @_;
		1384
		1385	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1386
		1387	$self->{last_save} = $cf::RUNTIME;
		1388
		1389	return unless $self->dirty;
		1390
		1391	my $save = $self->{path}->save_path; utf8::encode $save;
		1392	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
		1393
		1394	$self->{load_path} = $save;
		1395
		1396	return if $self->{deny_save};
		1397
		1398	local $self->{last_access} = $self->last_access;#d#
		1399
		1400	cf::async {
		1401	$_->contr->save for $self->players;
		1402	};
		1403
		1404	if ($uniq) {
		1405	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
		1406	$self->save_objects ($uniq, cf::IO_UNIQUES);
		1407	} else {
		1408	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
		1409	}
		1410	}
		1411
		1412	sub swap_out {
		1413	my ($self) = @_;
		1414
		1415	# save first because save cedes
		1416	$self->save;
		1417
		1418	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1419
		1420	return if $self->players;
		1421	return if $self->in_memory != cf::MAP_IN_MEMORY;
		1422	return if $self->{deny_save};
		1423
		1424	$self->clear;
		1425	$self->in_memory (cf::MAP_SWAPPED);
		1426	}
		1427
		1428	sub reset_at {
		1429	my ($self) = @_;
		1430
		1431	# TODO: safety, remove and allow resettable per-player maps
		1432	return 1e99 if $self->{path}{user_rel};
		1433	return 1e99 if $self->{deny_reset};
		1434
		1435	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		1436	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
		1437
		1438	$time + $to
		1439	}
		1440
		1441	sub should_reset {
		1442	my ($self) = @_;
		1443
		1444	$self->reset_at <= $cf::RUNTIME
		1445	}
		1446
		1447	sub unlink_save {
		1448	my ($self) = @_;
		1449
		1450	utf8::encode (my $save = $self->{path}->save_path);
		1451	aioreq_pri 3; IO::AIO::aio_unlink $save;
		1452	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
		1453	}
		1454
		1455	sub rename {
		1456	my ($self, $new_path) = @_;
		1457
		1458	$self->unlink_save;
		1459
		1460	delete $cf::MAP{$self->path};
		1461	$self->{path} = new cf::path $new_path;
		1462	$self->path ($self->{path}->as_string);
		1463	$cf::MAP{$self->path} = $self;
		1464
		1465	$self->save;
		1466	}
		1467
		1468	sub reset {
		1469	my ($self) = @_;
		1470
		1471	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1472
		1473	return if $self->players;
		1474	return if $self->{path}{user_rel};#d#
		1475
		1476	warn "resetting map ", $self->path;#d#
		1477
		1478	delete $cf::MAP{$self->path};
		1479
		1480	$_->clear_links_to ($self) for values %cf::MAP;
		1481
		1482	$self->unlink_save;
		1483	$self->destroy;
		1484	}
		1485
		1486	my $nuke_counter = "aaaa";
		1487
		1488	sub nuke {
		1489	my ($self) = @_;
		1490
		1491	$self->{deny_save} = 1;
		1492	$self->reset_timeout (1);
		1493	$self->rename ("{nuke}/" . ($nuke_counter++));
		1494	$self->reset; # polite request, might not happen
		1495	}
		1496
		1497	sub customise_for {
		1498	my ($map, $ob) = @_;
		1499
		1500	if ($map->per_player) {
		1501	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
		1502	}
		1503
		1504	$map
		1505	}
		1506
		1507	sub emergency_save {
		1508	my $freeze_guard = cf::freeze_mainloop;
		1509
		1510	warn "enter emergency perl save\n";
		1511
		1512	cf::sync_job {
		1513	warn "begin emergency player save\n";
		1514	$_->save for values %cf::PLAYER;
		1515	warn "end emergency player save\n";
		1516
		1517	warn "begin emergency map save\n";
		1518	$_->save for values %cf::MAP;
		1519	warn "end emergency map save\n";
		1520	};
		1521
		1522	warn "leave emergency perl save\n";
		1523	}
		1524
		1525	package cf;
		1526
		1527	=back
		1528
898		1529
899	=head3 cf::object::player	1530	=head3 cf::object::player
900		1531
901	=over 4	1532	=over 4
902		1533
…		…
938	(ref $cf::CFG{"may_$access"}	1569	(ref $cf::CFG{"may_$access"}
939	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	1570	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
940	: $cf::CFG{"may_$access"})	1571	: $cf::CFG{"may_$access"})
941	}	1572	}
942		1573
		1574	=item $player_object->enter_link
		1575
		1576	Freezes the player and moves him/her to a special map (C<{link}>).
		1577
		1578	The player should be reaosnably safe there for short amounts of time. You
		1579	I<MUST> call C<leave_link> as soon as possible, though.
		1580
		1581	=item $player_object->leave_link ($map, $x, $y)
		1582
		1583	Moves the player out of the specila link map onto the given map. If the
		1584	map is not valid (or omitted), the player will be moved back to the
		1585	location he/she was before the call to C<enter_link>, or, if that fails,
		1586	to the emergency map position.
		1587
		1588	Might block.
		1589
		1590	=cut
		1591
		1592	sub cf::object::player::enter_link {
		1593	my ($self) = @_;
		1594
		1595	$self->deactivate_recursive;
		1596
		1597	return if $self->map == $LINK_MAP;
		1598
		1599	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
		1600	if $self->map;
		1601
		1602	$self->enter_map ($LINK_MAP, 20, 20);
		1603	}
		1604
		1605	sub cf::object::player::leave_link {
		1606	my ($self, $map, $x, $y) = @_;
		1607
		1608	my $link_pos = delete $self->{_link_pos};
		1609
		1610	unless ($map) {
		1611	# restore original map position
		1612	($map, $x, $y) = @{ $link_pos \|\| [] };
		1613	$map = cf::map::find $map;
		1614
		1615	unless ($map) {
		1616	($map, $x, $y) = @$EMERGENCY_POSITION;
		1617	$map = cf::map::find $map
		1618	or die "FATAL: cannot load emergency map\n";
		1619	}
		1620	}
		1621
		1622	($x, $y) = (-1, -1)
		1623	unless (defined $x) && (defined $y);
		1624
		1625	# use -1 or undef as default coordinates, not 0, 0
		1626	($x, $y) = ($map->enter_x, $map->enter_y)
		1627	if $x <=0 && $y <= 0;
		1628
		1629	$map->load;
		1630
		1631	return unless $self->contr->active;
		1632	$self->activate_recursive;
		1633	$self->enter_map ($map, $x, $y);
		1634	}
		1635
		1636	cf::player->attach (
		1637	on_logout => sub {
		1638	my ($pl) = @_;
		1639
		1640	# abort map switching before logout
		1641	if ($pl->ob->{_link_pos}) {
		1642	cf::sync_job {
		1643	$pl->ob->leave_link
		1644	};
		1645	}
		1646	},
		1647	on_login => sub {
		1648	my ($pl) = @_;
		1649
		1650	# try to abort aborted map switching on player login :)
		1651	# should happen only on crashes
		1652	if ($pl->ob->{_link_pos}) {
		1653	$pl->ob->enter_link;
		1654	(async {
		1655	# we need this sleep as the login has a concurrent enter_exit running
		1656	# and this sleep increases chances of the player not ending up in scorn
		1657	$pl->ob->reply (undef,
		1658	"There was an internal problem at your last logout, "
		1659	. "the server will try to bring you to your intended destination in a second.",
		1660	cf::NDI_RED);
		1661	Coro::Timer::sleep 1;
		1662	$pl->ob->leave_link;
		1663	})->prio (2);
		1664	}
		1665	},
		1666	);
		1667
		1668	=item $player_object->goto ($path, $x, $y)
		1669
		1670	=cut
		1671
		1672	sub cf::object::player::goto {
		1673	my ($self, $path, $x, $y) = @_;
		1674
		1675	$self->enter_link;
		1676
		1677	(async {
		1678	$path = new cf::path $path;
		1679
		1680	my $map = cf::map::find $path->as_string;
		1681	$map = $map->customise_for ($self) if $map;
		1682
		1683	# warn "entering ", $map->path, " at ($x, $y)\n"
		1684	# if $map;
		1685
		1686	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1687
		1688	$self->leave_link ($map, $x, $y);
		1689	})->prio (1);
		1690	}
		1691
		1692	=item $player_object->enter_exit ($exit_object)
		1693
		1694	=cut
		1695
		1696	sub parse_random_map_params {
		1697	my ($spec) = @_;
		1698
		1699	my $rmp = { # defaults
		1700	xsize => 10,
		1701	ysize => 10,
		1702	};
		1703
		1704	for (split /\n/, $spec) {
		1705	my ($k, $v) = split /\s+/, $_, 2;
		1706
		1707	$rmp->{lc $k} = $v if (length $k) && (length $v);
		1708	}
		1709
		1710	$rmp
		1711	}
		1712
		1713	sub prepare_random_map {
		1714	my ($exit) = @_;
		1715
		1716	# all this does is basically replace the /! path by
		1717	# a new random map path (?random/...) with a seed
		1718	# that depends on the exit object
		1719
		1720	my $rmp = parse_random_map_params $exit->msg;
		1721
		1722	if ($exit->map) {
		1723	$rmp->{region} = $exit->map->region_name;
		1724	$rmp->{origin_map} = $exit->map->path;
		1725	$rmp->{origin_x} = $exit->x;
		1726	$rmp->{origin_y} = $exit->y;
		1727	}
		1728
		1729	$rmp->{random_seed} \|\|= $exit->random_seed;
		1730
		1731	my $data = cf::to_json $rmp;
		1732	my $md5 = Digest::MD5::md5_hex $data;
		1733
		1734	if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY \| O_CREAT, 0666) {
		1735	aio_write $fh, 0, (length $data), $data, 0;
		1736
		1737	$exit->slaying ("?random/$md5");
		1738	$exit->msg (undef);
		1739	}
		1740	}
		1741
		1742	sub cf::object::player::enter_exit {
		1743	my ($self, $exit) = @_;
		1744
		1745	return unless $self->type == cf::PLAYER;
		1746
		1747	$self->enter_link;
		1748
		1749	(async {
		1750	$self->deactivate_recursive; # just to be sure
		1751	unless (eval {
		1752	prepare_random_map $exit
		1753	if $exit->slaying eq "/!";
		1754
		1755	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
		1756	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
		1757
		1758	1;
		1759	}) {
		1760	$self->message ("Something went wrong deep within the crossfire server. "
		1761	. "I'll try to bring you back to the map you were before. "
		1762	. "Please report this to the dungeon master",
		1763	cf::NDI_UNIQUE \| cf::NDI_RED);
		1764
		1765	warn "ERROR in enter_exit: $@";
		1766	$self->leave_link;
		1767	}
		1768	})->prio (1);
		1769	}
		1770
943	=head3 cf::client	1771	=head3 cf::client
944		1772
945	=over 4	1773	=over 4
946		1774
947	=item $client->send_drawinfo ($text, $flags)	1775	=item $client->send_drawinfo ($text, $flags)
…		…
990	on_reply => sub {	1818	on_reply => sub {
991	my ($ns, $msg) = @_;	1819	my ($ns, $msg) = @_;
992		1820
993	# this weird shuffling is so that direct followup queries	1821	# this weird shuffling is so that direct followup queries
994	# get handled first	1822	# get handled first
995	my $queue = delete $ns->{query_queue};	1823	my $queue = delete $ns->{query_queue}
		1824	or return; # be conservative, not sure how that can happen, but we saw a crash here
996		1825
997	(shift @$queue)->[1]->($msg);	1826	(shift @$queue)->[1]->($msg);
998		1827
999	push @{ $ns->{query_queue} }, @$queue;	1828	push @{ $ns->{query_queue} }, @$queue;
1000		1829
…		…
1006	}	1835	}
1007	}	1836	}
1008	},	1837	},
1009	);	1838	);
1010		1839
1011	=item $client->coro (\&cb)	1840	=item $client->async (\&cb)
1012		1841
1013	Create a new coroutine, running the specified callback. The coroutine will	1842	Create a new coroutine, running the specified callback. The coroutine will
1014	be automatically cancelled when the client gets destroyed (e.g. on logout,	1843	be automatically cancelled when the client gets destroyed (e.g. on logout,
1015	or loss of connection).	1844	or loss of connection).
1016		1845
1017	=cut	1846	=cut
1018		1847
1019	sub cf::client::coro {	1848	sub cf::client::async {
1020	my ($self, $cb) = @_;	1849	my ($self, $cb) = @_;
1021		1850
1022	my $coro; $coro = async {	1851	my $coro = &Coro::async ($cb);
1023	eval {
1024	$cb->();
1025	};
1026	warn $@ if $@;
1027	};
1028		1852
1029	$coro->on_destroy (sub {	1853	$coro->on_destroy (sub {
1030	delete $self->{_coro}{$coro+0};	1854	delete $self->{_coro}{$coro+0};
1031	});	1855	});
1032		1856
…		…
1204		2028
1205	{	2029	{
1206	my $path = cf::localdir . "/database.pst";	2030	my $path = cf::localdir . "/database.pst";
1207		2031
1208	sub db_load() {	2032	sub db_load() {
1209	warn "loading database $path\n";#d# remove later
1210	$DB = stat $path ? Storable::retrieve $path : { };	2033	$DB = stat $path ? Storable::retrieve $path : { };
1211	}	2034	}
1212		2035
1213	my $pid;	2036	my $pid;
1214		2037
1215	sub db_save() {	2038	sub db_save() {
1216	warn "saving database $path\n";#d# remove later
1217	waitpid $pid, 0 if $pid;	2039	waitpid $pid, 0 if $pid;
1218	if (0 == ($pid = fork)) {	2040	if (0 == ($pid = fork)) {
1219	$DB->{_meta}{version} = 1;	2041	$DB->{_meta}{version} = 1;
1220	Storable::nstore $DB, "$path~";	2042	Storable::nstore $DB, "$path~";
1221	rename "$path~", $path;	2043	rename "$path~", $path;
…		…
1269	open my $fh, "<:utf8", cf::confdir . "/config"	2091	open my $fh, "<:utf8", cf::confdir . "/config"
1270	or return;	2092	or return;
1271		2093
1272	local $/;	2094	local $/;
1273	*CFG = YAML::Syck::Load <$fh>;	2095	*CFG = YAML::Syck::Load <$fh>;
		2096
		2097	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2098
		2099	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2100	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2101
		2102	if (exists $CFG{mlockall}) {
		2103	eval {
		2104	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2105	and die "WARNING: m(un)lockall failed: $!\n";
		2106	};
		2107	warn $@ if $@;
		2108	}
1274	}	2109	}
1275		2110
1276	sub main {	2111	sub main {
		2112	# we must not ever block the main coroutine
		2113	local $Coro::idle = sub {
		2114	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
		2115	async { Event::one_event };
		2116	};
		2117
1277	cfg_load;	2118	cfg_load;
1278	db_load;	2119	db_load;
1279	load_extensions;	2120	load_extensions;
1280	Event::loop;	2121	Event::loop;
1281	}	2122	}
1282		2123
1283	#############################################################################	2124	#############################################################################
1284	# initialisation	2125	# initialisation
1285		2126
1286	sub perl_reload() {	2127	sub reload() {
1287	# can/must only be called in main	2128	# can/must only be called in main
1288	if ($Coro::current != $Coro::main) {	2129	if ($Coro::current != $Coro::main) {
1289	warn "can only reload from main coroutine\n";	2130	warn "can only reload from main coroutine\n";
1290	return;	2131	return;
1291	}	2132	}
1292		2133
1293	warn "reloading...";	2134	warn "reloading...";
1294		2135
1295	local $FREEZE = 1;	2136	my $guard = freeze_mainloop;
1296	cf::emergency_save;	2137	cf::emergency_save;
1297		2138
1298	eval {	2139	eval {
1299	# if anything goes wrong in here, we should simply crash as we already saved	2140	# if anything goes wrong in here, we should simply crash as we already saved
1300		2141
…		…
1362	cf::load_extensions;	2203	cf::load_extensions;
1363		2204
1364	# reattach attachments to objects	2205	# reattach attachments to objects
1365	warn "reattach";	2206	warn "reattach";
1366	_global_reattach;	2207	_global_reattach;
		2208	reattach $_ for values %MAP;
1367	};	2209	};
1368		2210
1369	if ($@) {	2211	if ($@) {
1370	warn $@;	2212	warn $@;
1371	warn "error while reloading, exiting.";	2213	warn "error while reloading, exiting.";
…		…
1373	}	2215	}
1374		2216
1375	warn "reloaded successfully";	2217	warn "reloaded successfully";
1376	};	2218	};
1377		2219
		2220	#############################################################################
		2221
		2222	unless ($LINK_MAP) {
		2223	$LINK_MAP = cf::map::new;
		2224
		2225	$LINK_MAP->width (41);
		2226	$LINK_MAP->height (41);
		2227	$LINK_MAP->alloc;
		2228	$LINK_MAP->path ("{link}");
		2229	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
		2230	$LINK_MAP->in_memory (MAP_IN_MEMORY);
		2231
		2232	# dirty hack because... archetypes are not yet loaded
		2233	Event->timer (
		2234	after => 10,
		2235	cb => sub {
		2236	$_[0]->w->cancel;
		2237
		2238	# provide some exits "home"
		2239	my $exit = cf::object::new "exit";
		2240
		2241	$exit->slaying ($EMERGENCY_POSITION->[0]);
		2242	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
		2243	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
		2244
		2245	$LINK_MAP->insert ($exit->clone, 19, 19);
		2246	$LINK_MAP->insert ($exit->clone, 19, 20);
		2247	$LINK_MAP->insert ($exit->clone, 19, 21);
		2248	$LINK_MAP->insert ($exit->clone, 20, 19);
		2249	$LINK_MAP->insert ($exit->clone, 20, 21);
		2250	$LINK_MAP->insert ($exit->clone, 21, 19);
		2251	$LINK_MAP->insert ($exit->clone, 21, 20);
		2252	$LINK_MAP->insert ($exit->clone, 21, 21);
		2253
		2254	$exit->destroy;
		2255	});
		2256
		2257	$LINK_MAP->{deny_save} = 1;
		2258	$LINK_MAP->{deny_reset} = 1;
		2259
		2260	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
		2261	}
		2262
1378	register "<global>", __PACKAGE__;	2263	register "<global>", __PACKAGE__;
1379		2264
1380	register_command "perl-reload" => sub {	2265	register_command "reload" => sub {
1381	my ($who, $arg) = @_;	2266	my ($who, $arg) = @_;
1382		2267
1383	if ($who->flag (FLAG_WIZ)) {	2268	if ($who->flag (FLAG_WIZ)) {
1384	$who->message ("start of reload.");	2269	$who->message ("start of reload.");
1385	perl_reload;	2270	reload;
1386	$who->message ("end of reload.");	2271	$who->message ("end of reload.");
1387	}	2272	}
1388	};	2273	};
1389		2274
1390	unshift @INC, $LIBDIR;	2275	unshift @INC, $LIBDIR;
…		…
1393	reentrant => 0,	2278	reentrant => 0,
1394	prio => 0,	2279	prio => 0,
1395	at => $NEXT_TICK \|\| $TICK,	2280	at => $NEXT_TICK \|\| $TICK,
1396	data => WF_AUTOCANCEL,	2281	data => WF_AUTOCANCEL,
1397	cb => sub {	2282	cb => sub {
1398	unless ($FREEZE) {
1399	cf::server_tick; # one server iteration	2283	cf::server_tick; # one server iteration
1400	$RUNTIME += $TICK;	2284	$RUNTIME += $TICK;
1401	}
1402
1403	$NEXT_TICK += $TICK;	2285	$NEXT_TICK += $TICK;
1404		2286
1405	# if we are delayed by four ticks or more, skip them all	2287	# if we are delayed by four ticks or more, skip them all
1406	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2288	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1407		2289
…		…
1410	},	2292	},
1411	);	2293	);
1412		2294
1413	IO::AIO::max_poll_time $TICK * 0.2;	2295	IO::AIO::max_poll_time $TICK * 0.2;
1414		2296
		2297	Event->io (
1415	Event->io (fd => IO::AIO::poll_fileno,	2298	fd => IO::AIO::poll_fileno,
1416	poll => 'r',	2299	poll => 'r',
1417	prio => 5,	2300	prio => 5,
1418	data => WF_AUTOCANCEL,	2301	data => WF_AUTOCANCEL,
1419	cb => \&IO::AIO::poll_cb);	2302	cb => \&IO::AIO::poll_cb,
		2303	);
1420		2304
1421	# we must not ever block the main coroutine	2305	Event->timer (
1422	$Coro::idle = sub {	2306	data => WF_AUTOCANCEL,
1423	#Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#	2307	after => 0,
1424	warn "FATAL: Coro::idle was called, major BUG\n";	2308	interval => 10,
		2309	cb => sub {
1425	(Coro::unblock_sub {	2310	(Coro::unblock_sub {
1426	Event::one_event;	2311	write_runtime
		2312	or warn "ERROR: unable to write runtime file: $!";
1427	})->();	2313	})->();
1428	};	2314	},
		2315	);
		2316
		2317	END { cf::emergency_save }
1429		2318
1430	1	2319	1
1431		2320

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.147 by root, Mon Jan 8 12:23:33 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.147 by root, Mon Jan 8 12:23:33 2007 UTC