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.59 by root, Tue Jul 3 01:04:43 2007 UTC vs.
Revision 1.109 by root, Tue May 4 21:45:42 2010 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 List::Util qw(min max);
8 7
9our %EXT_SETUP; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
10 9
11# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
12sub nuke_str { 11sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 13}
15 14
16sub query { 15sub query {
17 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
18 17
19 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
21 Coro::schedule while ref $current;
22
23 $current
24} 20}
25 21
26sub can_cleanup { 22sub can_cleanup {
27 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
28 24
… …
53 ); 49 );
54 50
55 1 51 1
56} 52}
57 53
54sub safe_spot($) {
55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
58
59 my $m = $ob->map
60 or return;
61 my $x = $ob->x;
62 my $y = $ob->y;
63
64# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0;
68
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70}
71
58sub enter_map { 72sub enter_map {
59 my ($pl) = @_; 73 my ($pl) = @_;
60 74
75 my $ob = $pl->ob;
76
61 my ($map, $x, $y) 77 my ($map, $x, $y)
62 = $pl->ob->{_link_pos} 78 = $ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
65 81
66 $pl->ob->enter_link; 82 $ob->enter_link;
67 83
84 my $m = cf::map::find $map;
68 if (my $time = delete $pl->{unclean_save}) { 85 my $time = delete $pl->{unclean_save};
69 if (my $m = cf::map::find $map) { 86
87 if ($time && $m) {
70 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime 89 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
91
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 92 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
74 93
75 # for now, just go back to savebed 94 if ($age >= $MAX_DISCONNECT_TIME) {
95 $ob->message (
96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
98 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
99 . "H<You disconnected too long without having used a savebed.>",
100 cf::NDI_RED
101 );
102 # kill them.
103 # reminds me of the famous badness 10000 syndrome...
104 $ob->stats->hp (-10000); #] if they survive this they deserved to live
105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
106 } else {
76 ($map, $x, $y) = $pl->savebed; 107 ($map, $x, $y) = $pl->savebed;
77 108
78 $pl->ns->send_drawinfo ( 109 $ob->message (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 110 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
80 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 111 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
81 . "Better use a savebed next time, much worse things could have happened...", 112 . "Better use a savebed next time, much worse things could have happened... "
113 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
82 cf::NDI_RED 114 cf::NDI_RED
83 ); 115 );
116 }
84 } else { 117 } else {
85 $pl->ns->send_drawinfo ( 118 $ob->message (
86 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 119 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
87 . "as lots of things could happen when you leave by other means, such as cave-ins, " 120 . "as lots of things could happen when you leave by other means, such as cave-ins, "
88 . "or monsters suddenly snapping your body. Better use a savebed next time.", 121 . "or monsters suddenly snapping your body. Better use a savebed next time. "
122 . "H<Always apply a bed of reality to disconnect from the server.>",
89 cf::NDI_RED 123 cf::NDI_RED
90 ); 124 );
91 }
92 } 125 }
93 } 126 }
94 127
95 $pl->ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
129}
130
131sub encode_password {
132 crypt $_[0],
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
96} 135}
97 136
98# delete a player directory, be non-blocking AND synchronous... 137# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 138# (that's hard, so we crap out and fork).
100sub nuke_playerdir { 139sub nuke_playerdir {
101 my ($user) = @_; 140 my ($user) = @_;
102 141
103 aio_stat "$PLAYERDIR/$user"; 142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
104 system "cd \Q$PLAYERDIR\E "
105 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
106 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
107}
108 143
109sub send_capabilities { 144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp;
147 };
148}
149
150cf::client->attach (on_addme => sub {
110 my ($ns) = @_; 151 my ($ns) = @_;
111 152
112 return unless $ns->extcmd;
113
114 $ns->ext_event (capabilities =>
115 # id, name, flags (1 == 2d), edge length
116 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
117 );
118}
119
120sub setup {
121 my ($ns, $args) = @_;
122
123 # run through the cmds of setup
124 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
125 #
126 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
127 # The client then must sort this out
128
129 my %setup = split / +/, $args;
130 while (my ($k, $v) = each %setup) {
131 if ($k eq "sound") {
132 $ns->sound ($v);
133
134 } elsif ($k eq "exp64") {
135 $setup{$k} = 1;
136
137 } elsif ($k eq "spellmon") {
138 $ns->monitor_spells ($v);
139
140 } elsif ($k eq "darkness") {
141 $ns->darkness ($v);
142
143 } elsif ($k eq "map1cmd") {
144 $ns->mapmode (cf::Map1Cmd) if $v > 0;
145
146 } elsif ($k eq "map1acmd") {
147 $ns->mapmode (cf::Map1aCmd) if $v > 0;
148
149 } elsif ($k eq "map2cmd") {
150 # gcfclient bug, map1acmd is sent too late
151 $ns->mapmode (cf::Map1aCmd);
152 $setup{$k} = "FALSE";
153
154 } elsif ($k eq "newmapcmd") {
155 $ns->newmapcmd ($v);
156
157 } elsif ($k eq "mapinfocmd") {
158 $ns->mapinfocmd ($v);
159
160 } elsif ($k eq "extcmd") {
161 $ns->extcmd ($v > 0);
162 send_capabilities $ns;
163
164 } elsif ($k eq "extmap") {
165 $ns->extmap ($v);
166
167 } elsif ($k eq "facecache") {
168 if (!$v) {
169 $v = 1;
170 $setup{$k} = $v;
171 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
172 }
173
174 $ns->facecache ($v);
175
176 } elsif ($k eq "faceset") {
177 $ns->faceset (0);
178 $setup{$k} = 0;
179 # $ns->image2 (1)
180
181 } elsif ($k eq "tileset") {
182 $setup{$k} = $ns->faceset ($v & 1);
183
184 } elsif ($k eq "itemcmd") {
185 # Version of the item protocol command to use. Currently,
186 # only supported versions are 1 and 2. Using a numeric
187 # value will make it very easy to extend this in the future.
188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
189
190 $setup{$k} = $ns->itemcmd;
191
192 } elsif ($k eq "mapsize") {
193 my ($x, $y) = split /x/, $v;
194
195 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
196 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
197
198 $setup{$k} = "${x}x${y}";
199
200 } elsif ($k eq "extendedMapInfos") {
201 $ns->ext_mapinfos ($v);
202
203 } elsif ($k eq "extendedTextInfos") {
204 $ns->has_readable_type ($v);
205
206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
207 $ns->smoothing ($v);
208
209 } elsif ($k eq "fxix") {
210 $v = 2 if $v > 2;
211 $ns->fxix ($v);
212 $setup{$k} = $v;
213
214 } elsif ($k eq "msg") {
215 $v = 2 if $v > 2;
216 $ns->can_msg ($v >= 2);
217 $setup{$k} = $v;
218
219 } elsif ($k eq "xwidget") {
220 # eXperimental server-side widgets
221 $ns->{can_widget} = 1;
222
223 } elsif ($k eq "excmd") {
224 # we support it
225
226 } else {
227 # other commands:
228 # sexp: no idea, probably for oudated servers
229 # tick: more stupidity, server should send a tick per tick
230
231 $setup{$k} = "FALSE";
232 }
233 }
234
235 $ns->send_packet (join " ", setup => %setup);
236
237 cf::datalog setup =>
238 request => $args,
239 reply => \%setup,
240 client => $ns->version,
241 ;
242}
243
244sub addme {
245 my ($ns) = @_;
246
247 if (!$ns->facecache)
248 {
249 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
250
251
252***
253*** WARNING:
254*** Your client does not support face/image caching,
255*** or it has been disabled. Face caching is mandatory
256*** so please enable it or use a newer client.
257***
258*** Look at your client preferences:
259***
260*** CFPlus: all known versions automatically enable the facecache.
261*** cfclient: use the -cache commandline option.
262*** cfclient: map will not redraw automatically (bug).
263*** gcfclient: use -cache commandline option, or enable
264*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
265*** jcrossclient: your client is broken, use CFPlus or gcfclient.
266***
267***
268EOF
269 if ($ns->version =~ /jcrossclient/) {
270 # let them, for now
271 } else {
272 $ns->flush;
273 return $ns->destroy;
274 }
275
276 # $ns->facecache = true;
277 }
278
279 if ($ns->mapmode < cf::Map1aCmd) {
280 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
281
282
283***
284*** WARNING:
285*** Your client is too old. Please upgrade to a newer version.
286EOF
287
288 $ns->flush;
289 return $ns->destroy;
290 }
291
292 $ns->pl and return $ns->destroy; 153 $ns->pl and return $ns->destroy;
293 154
294 $ns->async (sub { 155 $ns->async (sub {
156 $Coro::current->{desc} = "addme init";
157
295 my ($user, $pass); 158 my ($user, $pass);
296 159
297 $ns->send_packet ("addme_success"); 160 $ns->send_packet ("addme_success");
298 161
299 for (;;) { 162 for (;;) {
… …
304 cf::NDI_BLUE 167 cf::NDI_BLUE
305 ); 168 );
306 169
307 # read username 170 # read username
308 while () { 171 while () {
309 $user = query $ns, 0, "What is your name?\n:"; 172 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
310 173
311 if ($cf::LOGIN_LOCK{$user}) { 174 if ($cf::LOGIN_LOCK{$user}) {
312 $ns->send_drawinfo ( 175 $ns->send_drawinfo (
313 "That username is currently used in another login session. " 176 "That username is currently used in another login session. "
314 . "Chose another, or wait till the other session has ended.", 177 . "Chose another, or wait till the other session has ended.",
315 cf::NDI_RED 178 cf::NDI_RED
316 ); 179 );
317 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 180 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
318 last; 181 last;
319 } else { 182 } else {
320 $ns->send_drawinfo ( 183 $ns->send_drawinfo (
321 "Your username contains illegal characters " 184 "Your username contains illegal characters "
322 . "(only a-z, A-Z and 0-9 are allowed), " 185 . "(only a-z, A-Z and 0-9 are allowed), "
323 . "or is not between 3 and 18 characters in length.", 186 . "or is not between 3 and 20 characters in length.",
324 cf::NDI_RED 187 cf::NDI_RED
325 ); 188 );
326 } 189 }
190 Coro::Timer::sleep 0.4;
327 } 191 }
328 192
329 check_playing $ns, $user and next; 193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass";
330 196
331 $ns->send_drawinfo ( 197 $ns->send_drawinfo (
332 "Welcome $user, please enter your password now. " 198 "Welcome $user, please enter your password now. "
333 . "New users should now choose a password. " 199 . "New users should now choose a password. "
334 . "Anything your client lets you enter is fine.", 200 . "Anything your client lets you enter is fine.",
… …
342 $ns->send_drawinfo ( 208 $ns->send_drawinfo (
343 "Try to use at least three characters as your password please, " 209 "Try to use at least three characters as your password please, "
344 . "that cannot be too much to ask for :)", 210 . "that cannot be too much to ask for :)",
345 cf::NDI_RED 211 cf::NDI_RED
346 ); 212 );
213 Coro::Timer::sleep 0.4;
347 } 214 }
348 215
349 # lock this username for the remainder of this login session 216 # lock this username for the remainder of this login session
350 if ($cf::LOGIN_LOCK{$user}) { 217 if ($cf::LOGIN_LOCK{$user}) {
351 $ns->send_drawinfo ( 218 $ns->send_drawinfo (
… …
356 next; 223 next;
357 } 224 }
358 local $cf::LOGIN_LOCK{$user} = 1; 225 local $cf::LOGIN_LOCK{$user} = 1;
359 226
360 check_playing $ns, $user and next; 227 check_playing $ns, $user and next;
228
229 $Coro::current->{desc} = "addme($user) check";
361 230
362 # try to read the user file and check the password 231 # try to read the user file and check the password
363 if (my $pl = cf::player::find $user) { 232 if (my $pl = cf::player::find $user) {
364 aio_stat $pl->path and next; 233 aio_stat $pl->path and next;
365 my $mtime = (stat _)[9]; 234 my $mtime = (stat _)[9];
… …
419 next; 288 next;
420 } 289 }
421 } 290 }
422 291
423 # the rest of this function is character creation 292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
424 294
425 # just to make sure nothing is left over 295 # just to make sure nothing is left over
426 nuke_playerdir $user; 296 nuke_playerdir $user;
427 297
428 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 298 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
432 nuke_str $pass2; 302 nuke_str $pass2;
433 $ns->send_drawinfo ( 303 $ns->send_drawinfo (
434 "The passwords do not match, please try again.", 304 "The passwords do not match, please try again.",
435 cf::NDI_RED 305 cf::NDI_RED
436 ); 306 );
307 Coro::Timer::sleep 0.5;
437 next; 308 next;
438 } 309 }
439 310
440 nuke_str $pass2; 311 nuke_str $pass2;
441 312
442 my $pl = cf::player::new $user; 313 my $pl = cf::player::new $user;
443 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 314 $pl->password (encode_password $pass);
444 nuke_str $pass; 315 nuke_str $pass;
445 $pl->connect ($ns); 316 $pl->connect ($ns);
446 my $ob = $pl->ob; 317 my $ob = $pl->ob;
447 318
448 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
463 $ob->swap_stats ($res - 1, $swap - 1); 334 $ob->swap_stats ($res - 1, $swap - 1);
464 } 335 }
465 } else { 336 } else {
466 $ob->roll_stats; 337 $ob->roll_stats;
467 } 338 }
339
340 Coro::Timer::sleep 0.05;
468 } 341 }
469 342
470 $ob->set_animation (2); 343 $ob->set_animation (2);
471 $ob->add_statbonus; 344 $ob->add_statbonus;
472 345
473 while () { 346 while () {
474 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
475 my $msg = $ob->msg; 348 my $msg = $ob->msg;
476 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
477 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
478 351
479 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
480 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
481 354
482 last if $res =~ /[dD]/; 355 last if $res =~ /[dD]/;
483 356
484 $pl->chargen_race_next; 357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
485 } 359 }
486 360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
487 $pl->chargen_race_done; 364 $pl->chargen_race_done;
488 365
489 while () { 366 while () {
490 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
491 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
495 last; 372 last;
496 } elsif ($res =~ /^[mM]/) { 373 } elsif ($res =~ /^[mM]/) {
497 $pl->gender (0); 374 $pl->gender (0);
498 last; 375 last;
499 } 376 }
377 Coro::Timer::sleep 0.05;
500 } 378 }
501 379
502 $ob->reply (undef, "Welcome to Crossfire!"); 380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
503 384
504 delete $pl->{deny_save}; 385 delete $pl->{deny_save};
505 386
506 last; 387 last;
507 } 388 }
389
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
392 }
508 }); 393 });
509} 394});
395
396cf::register_command password => sub {
397 my ($pl, $arg) = @_;
398
399 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message (
411 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 }
420
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') {
423 $new_pw =
424 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9;
427 }
428
429 cf::async {
430 my $plc = cf::player::find $player;
431 if ($plc) {
432 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message (
448 "Ok, changed your password!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else {
453 $pl->message (
454 "Ok, please confirm your new password by sending "
455 . "the command again within one minute!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 }
459 }
460};
510 461
511cf::register_command quit => sub { 462cf::register_command quit => sub {
512 my ($ob, $arg) = @_; 463 my ($ob, $arg) = @_;
513 464
514 $ob->reply (undef, 465 $ob->send_msg (undef,
515 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 466 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
516 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 467 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
517 cf::NDI_UNIQUE | cf::NDI_RED); 468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
518}; 469};
519 470
520cf::register_command quit_character => sub { 471cf::register_command quit_character => sub {
521 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
522 473
523 my $pl = $ob->contr; 474 my $pl = $ob->contr;
524 475
525 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
526 if ($_[0] !~ /^[yY]/) { 477 if ($_[0] !~ /^[yY]/) {
527 $ob->reply (undef, 478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
528 "Ok, not not quitting then.",
529 cf::NDI_UNIQUE | cf::NDI_RED);
530 } else { 479 } else {
531 $ob->reply (undef, 480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
532 "Ok, quitting, hope to see you again.",
533 cf::NDI_UNIQUE | cf::NDI_RED);
534 $pl->ns->flush; 481 $pl->ns->flush;
482 cf::async {
483 ext::highscore::check $pl->ob;
535 cf::async { $pl->quit_character }; 484 $pl->quit_character;
485 };
536 } 486 }
537 }); 487 });
538}; 488};
539 489
540cf::object->attach ( 490cf::object->attach (
… …
548 498
549 # update respawn position 499 # update respawn position
550 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 500 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
551 cf::async { $pl->save }; 501 cf::async { $pl->save };
552 502
553 $pl->killer ("left"); 503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
554 $ob->check_score; 504 ext::highscore::check $ob;
555 505
556 $ob->reply (undef, "In the future, you will wake up here when you die."); 506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
557 507
558 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 508 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
559 if ($_[0] !~ /^[yY]/) { 509 if ($_[0] !~ /^[yY]/) {
560 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
561 $pl->deactivate; 511 $pl->deactivate;
… …
580 530
581 if ($cleanly) { 531 if ($cleanly) {
582 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 532 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
583 } else { 533 } else {
584 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 534 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
585 $pl->{unclean_save} = $cf::RUNTIME; 535 $pl->{unclean_save} = $cf::RUNTIME
536 unless safe_spot $pl;
586 } 537 }
587 }, 538 },
588); 539);
589 540
590cf::client->attach (
591 on_addme => \&addme,
592 on_setup => \&setup,
593);
594
595#############################################################################
596
597our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
598our $SAVE_TIMEOUT = 20; # save players every n seconds
599
600our $SCHEDULER = cf::async_ext {
601 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
602 while () {
603 $schedule_interval->next;
604
605 # this weird form of iteration over values is used because
606 # the hash changes underneath us frequently, and for
607 # keeps a direct reference to the value without (in 5.8 perls)
608 # keeping a reference, so this is prone to crashes or worse.
609 my @players = keys %cf::PLAYER;
610 for (@players) {
611 my $pl = $cf::PLAYER{$_}
612 or next;
613 $pl->valid or next;
614
615 eval {
616 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
617 cf::wait_for_tick_begin;
618 $pl->save;
619
620 unless ($pl->active || $pl->ns) {
621 # check refcounts, this is tricky and needs to be adjusted to fit server internals
622 my $ob = $pl->ob;
623
624 my $pl_ref = $pl->refcnt_cnt;
625 my $ob_ref = $ob->refcnt_cnt;
626
627 ## pl_ref == $pl + ob->contr + %cf::PLAYER
628 ## ob_ref == $ob + pl->observe + simply being an object
629 if ($pl_ref == 3 && $ob_ref == 3) {
630 warn "player-scheduler destroy ", $ob->name;#d#
631
632 # remove from sight and get fresh "copies"
633 $pl = delete $cf::PLAYER{$ob->name};
634 $ob = $pl->ob;
635
636 $pl->destroy; # destroys $ob
637 } else {
638 my $a_ = $pl->refcnt;#d#
639 my $b_ = $ob->refcnt;#d#
640
641 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
642 }
643 }
644 }
645 };
646 warn $@ if $@;
647 Coro::cede;
648 };
649 }
650};
651
652$SCHEDULER->prio (1);
653

Diff Legend

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