ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.61 by root, Tue Jul 10 06:12:13 2007 UTC vs.
Revision 1.122 by root, Thu Nov 15 07:08:15 2012 UTC

1#! perl # mandatory 1#! perl # mandatory depends=highscore
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use Deliantra::Util ();
7 8
8# paranoia function to overwrite a string-in-place 9CONF MAX_DISCONNECT_TIME = 3600;
9sub nuke_str {
10 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
11}
12 10
13sub query { 11sub query {
14 my ($ns, $flags, $text) = @_; 12 my ($ns, $flags, $text) = @_;
15 13
16 my $current = $Coro::current; 14 $ns->query ($flags, $text, Coro::rouse_cb);
17 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 15 Coro::rouse_wait
18 Coro::schedule while ref $current;
19
20 $current
21} 16}
22 17
23sub can_cleanup { 18sub can_cleanup {
24 my ($pl, $mtime) = @_; 19 my ($pl, $mtime) = @_;
25 20
… …
50 ); 45 );
51 46
52 1 47 1
53} 48}
54 49
50sub safe_spot($) {
51 my ($pl) = @_;
52
53 my $ob = $pl->ob;
54
55 my $m = $ob->map
56 or return;
57 my $x = $ob->x;
58 my $y = $ob->y;
59
60 # never happens normally, but helps when shell users make mistakes
61 $m->linkable
62 or return 1;
63
64 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
65}
66
55sub enter_map { 67sub enter_map {
56 my ($pl) = @_; 68 my ($pl) = @_;
57 69
70 my $ob = $pl->ob;
71
58 my ($map, $x, $y) 72 my ($map, $x, $y)
59 = $pl->ob->{_link_pos} 73 = $ob->{_link_pos}
60 ? @{delete $pl->ob->{_link_pos}} 74 ? @{delete $ob->{_link_pos}}
61 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 75 : ($pl->maplevel, $ob->x, $ob->y);
62 76
63 $pl->ob->enter_link; 77 $ob->enter_link;
64 78
79 my $m = cf::map::find $map;
65 if (my $time = delete $pl->{unclean_save}) { 80 my $time = delete $pl->{unclean_save};
66 if (my $m = cf::map::find $map) { 81
82 if ($time && $m) {
67 if ($time < $m->{instantiate_time}) { 83 if ($time < $m->{instantiate_time}) {
68 # the map was reset in the meantime 84 # the map was reset in the meantime
69 my $age = $cf::RUNTIME - $time; 85 my $age = $cf::RUNTIME - $time;
86
70 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 87 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
71 88
72 # for now, just go back to savebed 89 if ($age >= $MAX_DISCONNECT_TIME) {
90 $ob->message (
91 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
92 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
93 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
94 . "H<You disconnected too long without having used a savebed.>",
95 cf::NDI_RED
96 );
97 # kill them.
98 # reminds me of the famous badness 10000 syndrome...
99 $ob->stats->hp (-10000); #] if they survive this they deserved to live
100 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
101 } else {
73 ($map, $x, $y) = $pl->savebed; 102 ($map, $x, $y) = $pl->savebed;
74 103
75 $pl->ns->send_drawinfo ( 104 $ob->message (
76 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 105 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
77 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 106 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
78 . "Better use a savebed next time, much worse things could have happened...", 107 . "Better use a savebed next time, much worse things could have happened... "
108 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
79 cf::NDI_RED 109 cf::NDI_RED
80 ); 110 );
111 }
81 } else { 112 } else {
82 $pl->ns->send_drawinfo ( 113 $ob->message (
83 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 114 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
84 . "as lots of things could happen when you leave by other means, such as cave-ins, " 115 . "as lots of things could happen when you leave by other means, such as cave-ins, "
85 . "or monsters suddenly snapping your body. Better use a savebed next time.", 116 . "or monsters suddenly snapping your body. Better use a savebed next time. "
117 . "H<Always apply a bed of reality to disconnect from the server.>",
86 cf::NDI_RED 118 cf::NDI_RED
87 ); 119 );
88 } 120 }
89 }
90 } 121 }
91 122
92 $pl->ob->goto ($map, $x, $y); 123 $ob->goto ($map, $x, $y);
93} 124}
94 125
95# delete a player directory, be non-blocking AND synchronous... 126sub encode_password($) {
96# (thats hard, so we crap out and fork). 127 "!" . unpack "H*", $_[0]
128}
129
130sub compare_password($$) {
131 my ($pass, $token) = @_;
132
133 if ($token =~ /!!(.*)/) {
134 return +(substr $pass, 0, 8) eq pack "H*", $1;
135 } elsif ($token =~ /!(.*)/) {
136 return $pass eq pack "H*", $1;
137 } else {
138 return $token eq crypt $pass, $token;
139 }
140}
141
142# delete a player directory
97sub nuke_playerdir { 143sub nuke_playerdir {
98 my ($user) = @_; 144 my ($user) = @_;
99 145
146 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
147
148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
100 aio_stat "$PLAYERDIR/$user"; 149 aio_rename "$PLAYERDIR/$user", $temp;
101 system "cd \Q$PLAYERDIR\E " 150 IO::AIO::aio_rmtree $temp;
102 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 151}
103 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 152
153sub login_done {
154 my ($pl) = @_;
155
156 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
157 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
158 }
159}
160
161sub chargen {
162 my ($ns, $user, $pass) = @_;
163
164 # the rest of this function is character creation
165 $Coro::current->{desc} = "addme($user) chargen";
166
167 # just to make sure nothing is left over
168 # normally, nothing is there.
169 nuke_playerdir $user;
170
171 my $pl = cf::player::new $user;
172 $pl->password (encode_password $pass);
173 $pl->connect ($ns);
174 my $ob = $pl->ob;
175
176 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
177
178 while () {
179 $ob->update_stats;
180 $pl->save_stats;
181
182 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
183 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
184
185 if ($res =~ /^[Nn]/) {
186 last;
187 } elsif ($res > 0 && $res <= 7) {
188 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
189
190 if ($swap > 0 && $swap <= 7) {
191 $ob->swap_stats ($res - 1, $swap - 1);
192 }
193 } else {
194 $ob->roll_stats;
195 }
196
197 Coro::Timer::sleep 0.05;
198 }
199
200 $ob->set_animation (2);
201 $ob->add_statbonus;
202
203 while () {
204 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
205 my $msg = $ob->msg;
206 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
207 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
208
209 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
210 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
211
212 last if $res =~ /[dD]/;
213
214 $pl->chargen_race_next;
215 Coro::Timer::sleep 0.05;
216 }
217
218 # create the playerdir, if necessary, as chargen_race_done did it before
219 # presumably because of unique maps
220 aio_mkdir playerdir $pl, 0770;
221 $pl->chargen_race_done;
222
223 while () {
224 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
225 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
226
227 if ($res =~ /^[fF]/) {
228 $pl->gender (1);
229 last;
230 } elsif ($res =~ /^[mM]/) {
231 $pl->gender (0);
232 last;
233 }
234 Coro::Timer::sleep 0.05;
235 }
236
237 $ob->reply (undef, "Welcome to Deliantra!");
238
239 # XXX: Workaround for delayed client ext protocol handshake
240 $pl->esrv_new_player;
241
242 delete $pl->{deny_save};
104} 243}
105 244
106cf::client->attach (on_addme => sub { 245cf::client->attach (on_addme => sub {
107 my ($ns) = @_; 246 my ($ns) = @_;
108 247
109 if (!$ns->facecache)
110 {
111 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
112
113
114***
115*** WARNING:
116*** Your client does not support face/image caching,
117*** or it has been disabled. Face caching is mandatory
118*** so please enable it or use a newer client.
119***
120*** Look at your client preferences:
121***
122*** CFPlus: all known versions automatically enable the facecache.
123*** cfclient: use the -cache commandline option.
124*** cfclient: map will not redraw automatically (bug).
125*** gcfclient: use -cache commandline option, or enable
126*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
127*** jcrossclient: your client is broken, use CFPlus or gcfclient.
128***
129***
130EOF
131 if ($ns->version =~ /jcrossclient/) {
132 # let them, for now
133 } else {
134 $ns->flush;
135 return $ns->destroy;
136 }
137
138 # $ns->facecache = true;
139 }
140
141 if ($ns->mapmode < cf::Map1aCmd) {
142 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
143
144
145***
146*** WARNING:
147*** Your client is too old. Please upgrade to a newer version.
148EOF
149
150 $ns->flush;
151 return $ns->destroy;
152 }
153
154 $ns->pl and return $ns->destroy; 248 $ns->pl and return $ns->destroy;
155 249
156 $ns->async (sub { 250 $ns->async (sub {
251 $Coro::current->{desc} = "addme init";
252
157 my ($user, $pass); 253 my ($user, $pass);
158 254
159 $ns->send_packet ("addme_success"); 255 $ns->send_packet ("addme_success");
160 256
161 for (;;) { 257 for (;;) {
… …
166 cf::NDI_BLUE 262 cf::NDI_BLUE
167 ); 263 );
168 264
169 # read username 265 # read username
170 while () { 266 while () {
171 $user = query $ns, 0, "What is your name?\n:"; 267 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
172 268
173 if ($cf::LOGIN_LOCK{$user}) { 269 if ($cf::LOGIN_LOCK{$user}) {
174 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
175 "That username is currently used in another login session. " 271 "That username is currently used in another login session. "
176 . "Chose another, or wait till the other session has ended.", 272 . "Chose another, or wait till the other session has ended.",
177 cf::NDI_RED 273 cf::NDI_RED
178 ); 274 );
179 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 275 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
180 last; 276 last;
181 } else { 277 } else {
182 $ns->send_drawinfo ( 278 $ns->send_drawinfo (
183 "Your username contains illegal characters " 279 "Your username contains illegal characters "
184 . "(only a-z, A-Z and 0-9 are allowed), " 280 . "(only a-z, A-Z and 0-9 are allowed), "
185 . "or is not between 3 and 18 characters in length.", 281 . "or is not between 3 and 20 characters in length.",
186 cf::NDI_RED 282 cf::NDI_RED
187 ); 283 );
188 } 284 }
189 Coro::Timer::sleep 0.4; 285 Coro::Timer::sleep 0.4;
190 } 286 }
191 287
192 check_playing $ns, $user and next; 288 check_playing $ns, $user and next;
289
290 $Coro::current->{desc} = "addme($user) pass";
193 291
194 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
195 "Welcome $user, please enter your password now. " 293 "Welcome $user, please enter your password now. "
196 . "New users should now choose a password. " 294 . "New users should now choose a password. "
197 . "Anything your client lets you enter is fine.", 295 . "Anything your client lets you enter is fine.",
… …
221 } 319 }
222 local $cf::LOGIN_LOCK{$user} = 1; 320 local $cf::LOGIN_LOCK{$user} = 1;
223 321
224 check_playing $ns, $user and next; 322 check_playing $ns, $user and next;
225 323
324 $Coro::current->{desc} = "addme($user) check";
325
226 # try to read the user file and check the password 326 # try to read the user file and check the password
227 if (my $pl = cf::player::find $user) { 327 if (my $pl = cf::player::find $user) {
228 aio_stat $pl->path and next; 328 aio_stat $pl->path and next;
229 my $mtime = (stat _)[9]; 329 my $mtime = (stat _)[9];
230 my $hash = $pl->password; 330 my $token = $pl->password;
231 331
232 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 332 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
233 nuke_str $pass; 333 # player exists and passwords match - we can proceed
334
234 # password matches, wonderful 335 # password matches, wonderful
235 my $pl = cf::player::find $user or next; 336 my $pl = cf::player::find $user or next;
236 $pl->connect ($ns); 337 $pl->connect ($ns);
237 enter_map $pl; 338 enter_map $pl;
339 login_done $pl;
238 last; 340 return;
239 } elsif (can_cleanup $pl, $mtime) { 341 } elsif (can_cleanup $pl, $mtime) {
240 Coro::Timer::sleep 1; 342 Coro::Timer::sleep 1;
241 343
242 $ns->send_drawinfo ( 344 $ns->send_drawinfo (
243 "Player exists, but password does not match. If this is your account, " 345 "Player exists, but password does not match. If this is your account, "
244 . "please try again. If not, you can now decide to take over this account " 346 . "please try again. If not, you can now decide to take over this account "
245 . "because it has not been in-use for some time.", 347 . "because it has not been in-use for some time.",
246 cf::NDI_RED 348 cf::NDI_RED
247 ); 349 );
248 350
249 #TODO: nuke_str
250 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 351 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
251 or next; 352 or next;
252 353
253 # check if the file hasn't changed 354 # check if the file hasn't changed
254 aio_stat cf::player::path $user and next; 355 aio_stat cf::player::path $user and next;
… …
256 357
257 $pl->quit_character; 358 $pl->quit_character;
258 359
259 # fall through to creation 360 # fall through to creation
260 } else { 361 } else {
261 nuke_str $pass;
262
263 Coro::Timer::sleep 1; 362 Coro::Timer::sleep 1;
264 363
265 $ns->send_drawinfo ( 364 $ns->send_drawinfo (
266 "Wrong username or password. Please try again " 365 "Wrong username or password. Please try again "
267 . "(check for Numlock and other semi-obvious error sources).", 366 . "(check for Numlock and other semi-obvious error sources).",
… …
269 ); 368 );
270 next; 369 next;
271 } 370 }
272 } else { 371 } else {
273 # unable to load the playerfile: 372 # unable to load the playerfile:
274 # check wether the player dir exists, which means the file is corrupted or 373 # check whether the player dir exists, which means the file is corrupted or
275 # something very similar. 374 # something very similar.
276 if (!aio_stat cf::player::playerdir $user) { 375 if (!aio_stat cf::player::playerdir $user) {
277 $ns->send_drawinfo ( 376 $ns->send_drawinfo (
278 "Unable to retrieve this player. It might be a locked or broken account. " 377 "Unable to retrieve this player. It might be a locked or broken account. "
279 . "If this is your account, ask a dungeon master for assistance. " 378 . "If this is your account, ask a dungeon master for assistance. "
… …
282 ); 381 );
283 next; 382 next;
284 } 383 }
285 } 384 }
286 385
287 # the rest of this function is character creation
288
289 # just to make sure nothing is left over
290 nuke_playerdir $user;
291
292 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
293 387
294 if ($pass2 ne $pass) { 388 if ($pass2 ne $pass) {
295 nuke_str $pass;
296 nuke_str $pass2;
297 $ns->send_drawinfo ( 389 $ns->send_drawinfo (
298 "The passwords do not match, please try again.", 390 "The passwords do not match, please try again.",
299 cf::NDI_RED 391 cf::NDI_RED
300 ); 392 );
301 Coro::Timer::sleep 0.5; 393 Coro::Timer::sleep 0.5;
302 next; 394 next;
303 } 395 }
304 396
305 nuke_str $pass2;
306
307 my $pl = cf::player::new $user;
308 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
309 nuke_str $pass;
310 $pl->connect ($ns);
311 my $ob = $pl->ob;
312
313 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
314
315 while () {
316 $ob->update_stats;
317 $pl->save_stats;
318
319 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
320 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
321
322 if ($res =~ /^[Nn]/) {
323 last;
324 } elsif ($res > 0 && $res <= 7) {
325 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
326
327 if ($swap > 0 && $swap <= 7) {
328 $ob->swap_stats ($res - 1, $swap - 1);
329 }
330 } else {
331 $ob->roll_stats;
332 }
333
334 Coro::Timer::sleep 0.2;
335 }
336
337 $ob->set_animation (2);
338 $ob->add_statbonus;
339
340 while () {
341 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
342 my $msg = $ob->msg;
343 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
344 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
345
346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
348
349 last if $res =~ /[dD]/;
350
351 $pl->chargen_race_next;
352 Coro::Timer::sleep 0.2;
353 }
354
355 $pl->chargen_race_done;
356
357 while () {
358 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
359 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
360
361 if ($res =~ /^[fF]/) {
362 $pl->gender (1);
363 last;
364 } elsif ($res =~ /^[mM]/) {
365 $pl->gender (0);
366 last;
367 }
368 Coro::Timer::sleep 0.2;
369 }
370
371 $ob->reply (undef, "Welcome to Crossfire!");
372
373 delete $pl->{deny_save};
374
375 last; 397 last;
376 } 398 }
399
400 # lock again, too layz to make this nicer
401 local $cf::LOGIN_LOCK{$user} = 1;
402
403 chargen $ns, $user, $pass;
404 login_done $ns->pl;
377 }); 405 });
378}); 406});
379 407
408cf::client->attach (
409 on_version => sub {
410 my ($ns, $arg) = @_;
411
412 $ns->ext_msg (nonces => map { join "", map { chr rand 256 } 0..63 } 1..2);
413 },
414);
415
416#cf::register_async_exticmd create_login => sub {
417# my ($ns, $reply, $user, $pass) = @_;
418#
419# $ns->pl and return $ns->destroy;
420#};
421
422cf::register_async_exticmd login => sub {
423 my ($ns, $reply, $user, $hash) = @_;
424
425 $ns->pl and return $ns->destroy;
426};
427
428cf::register_command password => sub {
429 my ($pl, $arg) = @_;
430
431 unless ($pl->flag (cf::FLAG_WIZ)) {
432 $pl->message (
433 "The password can currently only changed by a DM.",
434 cf::NDI_UNIQUE | cf::NDI_REPLY);
435 return;
436 }
437
438 my (@args) = split /\s+/, $arg;
439 my ($player, $new_pw) = @args;
440
441 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
442 $pl->message (
443 "Usage: password <player> [<new password>]",
444 cf::NDI_UNIQUE | cf::NDI_REPLY);
445 return;
446 }
447
448 if ($new_pw eq '') {
449 $new_pw =
450 join '',
451 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
452 1..9;
453 }
454
455 cf::async {
456 my $plc = cf::player::find $player;
457 if ($plc) {
458 $plc->password (encode_password $new_pw);
459 $pl->message (
460 "Ok, changed password of '$player' to '$new_pw'!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 } else {
463 $pl->message (
464 "Fail! Couldn't set password for '$player', "
465 . "he doesn't seem to exist!",
466 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
467 }
468 };
469};
470
380cf::register_command quit => sub { 471cf::register_command quit => sub {
381 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
382 473
383 $ob->reply (undef, 474 $ob->send_msg (undef,
384 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 475 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
385 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 476 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
386 cf::NDI_UNIQUE | cf::NDI_RED); 477 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
387}; 478};
388 479
389cf::register_command quit_character => sub { 480cf::register_command quit_character => sub {
390 my ($ob, $arg) = @_; 481 my ($ob, $arg) = @_;
391 482
392 my $pl = $ob->contr; 483 my $pl = $ob->contr;
393 484
394 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 485 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
395 if ($_[0] !~ /^[yY]/) { 486 if ($_[0] !~ /^[yY]/) {
396 $ob->reply (undef, 487 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
397 "Ok, not not quitting then.",
398 cf::NDI_UNIQUE | cf::NDI_RED);
399 } else { 488 } else {
400 $ob->reply (undef, 489 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
401 "Ok, quitting, hope to see you again.", 490 cf::async {
402 cf::NDI_UNIQUE | cf::NDI_RED);
403 $pl->ns->flush;
404 cf::async { $pl->quit_character }; 491 $pl->quit_character;
492 };
405 } 493 }
406 }); 494 });
407}; 495};
408 496
409cf::object->attach ( 497cf::object->attach (
… …
415 503
416 my $pl = $ob->contr; 504 my $pl = $ob->contr;
417 505
418 # update respawn position 506 # update respawn position
419 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 507 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
420 cf::async { $pl->save };
421 508
422 $pl->killer ("left"); 509 cf::async {
423 $ob->check_score; 510 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
511 ext::highscore::check $ob;
424 512
425 $ob->reply (undef, "In the future, you will wake up here when you die."); 513 $pl->save;
426 514
515 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
516
517 my $ns = $pl->ns
518 or return;
519
427 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 520 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
428 if ($_[0] !~ /^[yY]/) { 521 if ($_[0] !~ /^[yY]/) {
429 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
430 $pl->deactivate; 523 $pl->deactivate;
431 $pl->ns->destroy; 524 $pl->ns->destroy;
432 } else { 525 }
433 cf::async { $pl->save };
434 } 526 });
435 }); 527 };
436 }, 528 },
437); 529);
438 530
439cf::player->attach ( 531cf::player->attach (
440 on_login => sub { 532 on_login => sub {
… …
449 541
450 if ($cleanly) { 542 if ($cleanly) {
451 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 543 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
452 } else { 544 } else {
453 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 545 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
454 $pl->{unclean_save} = $cf::RUNTIME; 546 $pl->{unclean_save} = $cf::RUNTIME
547 unless safe_spot $pl;
455 } 548 }
456 }, 549 },
457); 550);
458 551
459#############################################################################
460
461our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
462our $SAVE_TIMEOUT = 20; # save players every n seconds
463
464our $SCHEDULER = cf::async_ext {
465 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
466 while () {
467 $schedule_interval->next;
468
469 # this weird form of iteration over values is used because
470 # the hash changes underneath us frequently, and for
471 # keeps a direct reference to the value without (in 5.8 perls)
472 # keeping a reference, so this is prone to crashes or worse.
473 my @players = keys %cf::PLAYER;
474 for (@players) {
475 my $pl = $cf::PLAYER{$_}
476 or next;
477 $pl->valid or next;
478
479 eval {
480 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
481 cf::wait_for_tick_begin;
482 $pl->save;
483
484 unless ($pl->active || $pl->ns) {
485 # check refcounts, this is tricky and needs to be adjusted to fit server internals
486 my $ob = $pl->ob;
487
488 my $pl_ref = $pl->refcnt_cnt;
489 my $ob_ref = $ob->refcnt_cnt;
490
491 ## pl_ref == $pl + ob->contr + %cf::PLAYER
492 ## ob_ref == $ob + pl->observe + simply being an object
493 if ($pl_ref == 3 && $ob_ref == 3) {
494 warn "player-scheduler destroy ", $ob->name;#d#
495
496 # remove from sight and get fresh "copies"
497 $pl = delete $cf::PLAYER{$ob->name};
498 $ob = $pl->ob;
499
500 $pl->destroy; # destroys $ob
501 } else {
502 my $a_ = $pl->refcnt;#d#
503 my $b_ = $ob->refcnt;#d#
504
505 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
506 }
507 }
508 }
509 };
510 warn $@ if $@;
511 Coro::cede;
512 };
513 }
514};
515
516$SCHEDULER->prio (1);
517

Diff Legend

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