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.55 by root, Sun Jun 24 01:09:28 2007 UTC vs.
Revision 1.105 by root, Wed Apr 28 11:28:21 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
… …
41 return unless cf::player::find_active $user; 37 return unless cf::player::find_active $user;
42 38
43 $ns->send_drawinfo ( 39 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 40 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 41 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 42 . "If you have already a registered, make sure nobody "
47 . "else is using your account at this time. If you lost your conenction " 43 . "else is using your account at this time. If you lost your connection "
48 . "then the server will likely timeout within a minute. If you still " 44 . "then the server will likely timeout within a minute. If you still "
49 . "cannot log-in after a minute, you are still logged in. Make sure " 45 . "cannot log-in after a minute, you are still logged in. Make sure "
50 . "you do not have another client running. If you use windows, reboot, " 46 . "you do not have another client running. If you use windows, reboot, "
51 . "this will fix anything.", 47 . "this will fix anything.",
52 cf::NDI_RED 48 cf::NDI_RED
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 warn $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);
96} 129}
97 130
98# delete a player directory, be non-blocking AND synchronous... 131# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 132# (that's hard, so we crap out and fork).
100sub nuke_playerdir { 133sub nuke_playerdir {
101 my ($user) = @_; 134 my ($user) = @_;
102 135
103 aio_stat "$PLAYERDIR/$user"; 136 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 137
109sub send_capabilities { 138 cf::fork_call {
139 rename "$PLAYERDIR/$user", $temp;
140 system "rm", "-rf", $temp;
141 };
142}
143
144cf::client->attach (on_addme => sub {
110 my ($ns) = @_; 145 my ($ns) = @_;
111 146
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 $ns->fxix ($v);
211
212 } elsif ($k eq "msg") {
213 $ns->can_msg ($v);
214
215 } elsif ($k eq "excmd") {
216 # we support it
217
218 } else {
219 # other commands:
220 # sexp: no idea, probably for oudated servers
221 # tick: more stupidity, server should send a tick per tick
222
223 $setup{$k} = "FALSE";
224 }
225 }
226
227 $ns->send_packet (join " ", setup => %setup);
228
229 cf::datalog setup =>
230 request => $args,
231 reply => \%setup,
232 client => $ns->version,
233 ;
234}
235
236sub addme {
237 my ($ns) = @_;
238
239 if (!$ns->facecache)
240 {
241 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
242
243
244***
245*** WARNING:
246*** Your client does not support face/image caching,
247*** or it has been disabled. Face caching is mandatory
248*** so please enable it or use a newer client.
249***
250*** Look at your client preferences:
251***
252*** CFPlus: all known versions automatically enable the facecache.
253*** cfclient: use the -cache commandline option.
254*** cfclient: map will not redraw automatically (bug).
255*** gcfclient: use -cache commandline option, or enable
256*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
257*** jcrossclient: your client is broken, use CFPlus or gcfclient.
258***
259***
260EOF
261 if ($ns->version =~ /jcrossclient/) {
262 # let them, for now
263 } else {
264 $ns->flush;
265 return $ns->destroy;
266 }
267
268 # $ns->facecache = true;
269 }
270
271 if ($ns->mapmode < cf::Map1aCmd) {
272 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
273
274
275***
276*** WARNING:
277*** Your client is too old. Please upgrade to a newer version.
278EOF
279
280 $ns->flush;
281 return $ns->destroy;
282 }
283
284 $ns->pl and return $ns->destroy; 147 $ns->pl and return $ns->destroy;
285 148
286 $ns->async (sub { 149 $ns->async (sub {
150 $Coro::current->{desc} = "addme init";
151
287 my ($user, $pass); 152 my ($user, $pass);
288 153
289 $ns->send_packet ("addme_success"); 154 $ns->send_packet ("addme_success");
290 155
291 for (;;) { 156 for (;;) {
… …
296 cf::NDI_BLUE 161 cf::NDI_BLUE
297 ); 162 );
298 163
299 # read username 164 # read username
300 while () { 165 while () {
301 $user = query $ns, 0, "What is your name?\n:"; 166 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
302 167
303 if ($cf::LOGIN_LOCK{$user}) { 168 if ($cf::LOGIN_LOCK{$user}) {
304 $ns->send_drawinfo ( 169 $ns->send_drawinfo (
305 "That username is currently used in another login session. " 170 "That username is currently used in another login session. "
306 . "Chose another, or wait till the other session has ended.", 171 . "Chose another, or wait till the other session has ended.",
307 cf::NDI_RED 172 cf::NDI_RED
308 ); 173 );
309 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 174 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
310 last; 175 last;
311 } else { 176 } else {
312 $ns->send_drawinfo ( 177 $ns->send_drawinfo (
313 "Your username contains illegal characters " 178 "Your username contains illegal characters "
314 . "(only a-z, A-Z and 0-9 are allowed), " 179 . "(only a-z, A-Z and 0-9 are allowed), "
315 . "or is not between 3 and 18 characters in length.", 180 . "or is not between 3 and 20 characters in length.",
316 cf::NDI_RED 181 cf::NDI_RED
317 ); 182 );
318 } 183 }
184 Coro::Timer::sleep 0.4;
319 } 185 }
320 186
321 check_playing $ns, $user and next; 187 check_playing $ns, $user and next;
188
189 $Coro::current->{desc} = "addme($user) pass";
322 190
323 $ns->send_drawinfo ( 191 $ns->send_drawinfo (
324 "Welcome $user, please enter your password now. " 192 "Welcome $user, please enter your password now. "
325 . "New users should now choose a password. " 193 . "New users should now choose a password. "
326 . "Anything your client lets you enter is fine.", 194 . "Anything your client lets you enter is fine.",
… …
334 $ns->send_drawinfo ( 202 $ns->send_drawinfo (
335 "Try to use at least three characters as your password please, " 203 "Try to use at least three characters as your password please, "
336 . "that cannot be too much to ask for :)", 204 . "that cannot be too much to ask for :)",
337 cf::NDI_RED 205 cf::NDI_RED
338 ); 206 );
207 Coro::Timer::sleep 0.4;
339 } 208 }
340 209
341 # lock this username for the remainder of this login session 210 # lock this username for the remainder of this login session
342 if ($cf::LOGIN_LOCK{$user}) { 211 if ($cf::LOGIN_LOCK{$user}) {
343 $ns->send_drawinfo ( 212 $ns->send_drawinfo (
… …
348 next; 217 next;
349 } 218 }
350 local $cf::LOGIN_LOCK{$user} = 1; 219 local $cf::LOGIN_LOCK{$user} = 1;
351 220
352 check_playing $ns, $user and next; 221 check_playing $ns, $user and next;
222
223 $Coro::current->{desc} = "addme($user) check";
353 224
354 # try to read the user file and check the password 225 # try to read the user file and check the password
355 if (my $pl = cf::player::find $user) { 226 if (my $pl = cf::player::find $user) {
356 aio_stat $pl->path and next; 227 aio_stat $pl->path and next;
357 my $mtime = (stat _)[9]; 228 my $mtime = (stat _)[9];
… …
411 next; 282 next;
412 } 283 }
413 } 284 }
414 285
415 # the rest of this function is character creation 286 # the rest of this function is character creation
287 $Coro::current->{desc} = "addme($user) chargen";
416 288
417 # just to make sure nothing is left over 289 # just to make sure nothing is left over
418 nuke_playerdir $user; 290 nuke_playerdir $user;
419 291
420 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 292 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
424 nuke_str $pass2; 296 nuke_str $pass2;
425 $ns->send_drawinfo ( 297 $ns->send_drawinfo (
426 "The passwords do not match, please try again.", 298 "The passwords do not match, please try again.",
427 cf::NDI_RED 299 cf::NDI_RED
428 ); 300 );
301 Coro::Timer::sleep 0.5;
429 next; 302 next;
430 } 303 }
431 304
432 nuke_str $pass2; 305 nuke_str $pass2;
433 306
434 my $pl = cf::player::new $user; 307 my $pl = cf::player::new $user;
435 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 308 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]);
436 nuke_str $pass; 309 nuke_str $pass;
437 $pl->connect ($ns); 310 $pl->connect ($ns);
438 my $ob = $pl->ob; 311 my $ob = $pl->ob;
439 312
440 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 313 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
455 $ob->swap_stats ($res - 1, $swap - 1); 328 $ob->swap_stats ($res - 1, $swap - 1);
456 } 329 }
457 } else { 330 } else {
458 $ob->roll_stats; 331 $ob->roll_stats;
459 } 332 }
333
334 Coro::Timer::sleep 0.05;
460 } 335 }
461 336
462 $ob->set_animation (2); 337 $ob->set_animation (2);
463 $ob->add_statbonus; 338 $ob->add_statbonus;
464 339
465 while () { 340 while () {
466 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 341 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
467 my $msg = $ob->msg; 342 my $msg = $ob->msg;
468 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 343 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
469 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 344 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
470 345
471 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
472 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
473 348
474 last if $res =~ /[dD]/; 349 last if $res =~ /[dD]/;
475 350
476 $pl->chargen_race_next; 351 $pl->chargen_race_next;
352 Coro::Timer::sleep 0.05;
477 } 353 }
478 354
355 # create the playerdir, if necessary, as chargen_race_done did it before
356 # presumably because of unique maps
357 aio_mkdir playerdir $pl, 0770;
479 $pl->chargen_race_done; 358 $pl->chargen_race_done;
480 359
481 while () { 360 while () {
482 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 361 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
483 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 362 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
487 last; 366 last;
488 } elsif ($res =~ /^[mM]/) { 367 } elsif ($res =~ /^[mM]/) {
489 $pl->gender (0); 368 $pl->gender (0);
490 last; 369 last;
491 } 370 }
371 Coro::Timer::sleep 0.05;
492 } 372 }
493 373
494 $ob->reply (undef, "Welcome to Crossfire!"); 374 $ob->reply (undef, "Welcome to Deliantra!");
375
376 # XXX: Workaround for delayed client ext protocol handshake
377 $pl->esrv_new_player;
495 378
496 delete $pl->{deny_save}; 379 delete $pl->{deny_save};
497 380
498 last; 381 last;
499 } 382 }
383
384 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
385 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
386 }
500 }); 387 });
501} 388});
502 389
503cf::register_command quit => sub { 390cf::register_command quit => sub {
504 my ($ob, $arg) = @_; 391 my ($ob, $arg) = @_;
505 392
506 $ob->reply (undef, 393 $ob->send_msg (undef,
507 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 394 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
508 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 395 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
509 cf::NDI_UNIQUE | cf::NDI_RED); 396 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
510}; 397};
511 398
512cf::register_command quit_character => sub { 399cf::register_command quit_character => sub {
513 my ($ob, $arg) = @_; 400 my ($ob, $arg) = @_;
514 401
515 my $pl = $ob->contr; 402 my $pl = $ob->contr;
516 403
517 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 404 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
518 if ($_[0] !~ /^[yY]/) { 405 if ($_[0] !~ /^[yY]/) {
519 $ob->reply (undef, 406 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
520 "Ok, not not quitting then.",
521 cf::NDI_UNIQUE | cf::NDI_RED);
522 } else { 407 } else {
523 $ob->reply (undef, 408 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
524 "Ok, quitting, hope to see you again.",
525 cf::NDI_UNIQUE | cf::NDI_RED);
526 $pl->ns->flush; 409 $pl->ns->flush;
410 cf::async {
411 ext::highscore::check $pl->ob;
527 cf::async { $pl->quit_character }; 412 $pl->quit_character;
413 };
528 } 414 }
529 }); 415 });
530}; 416};
531 417
532cf::object->attach ( 418cf::object->attach (
… …
540 426
541 # update respawn position 427 # update respawn position
542 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 428 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
543 cf::async { $pl->save }; 429 cf::async { $pl->save };
544 430
545 $pl->killer ("left"); 431 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
546 $ob->check_score; 432 ext::highscore::check $ob;
547 433
548 $ob->reply (undef, "In the future, you will wake up here when you die."); 434 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
549 435
550 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 436 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
551 if ($_[0] !~ /^[yY]/) { 437 if ($_[0] !~ /^[yY]/) {
552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 438 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
553 $pl->deactivate; 439 $pl->deactivate;
… …
572 458
573 if ($cleanly) { 459 if ($cleanly) {
574 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 460 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
575 } else { 461 } else {
576 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 462 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
577 $pl->{unclean_save} = $cf::RUNTIME; 463 $pl->{unclean_save} = $cf::RUNTIME
464 unless safe_spot $pl;
578 } 465 }
579 }, 466 },
580); 467);
581 468
582cf::client->attach (
583 on_addme => \&addme,
584 on_setup => \&setup,
585);
586 469
587#############################################################################
588
589our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
590our $SAVE_TIMEOUT = 20; # save players every n seconds
591
592our $SCHEDULER = cf::async_ext {
593 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
594 while () {
595 $schedule_interval->next;
596
597 # this weird form of iteration over values is used because
598 # the hash changes underneath us frequently, and for
599 # keeps a direct reference to the value without (in 5.8 perls)
600 # keeping a reference, so this is prone to crashes or worse.
601 my @players = keys %cf::PLAYER;
602 for (@players) {
603 my $pl = $cf::PLAYER{$_}
604 or next;
605 $pl->valid or next;
606
607 eval {
608 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
609 cf::wait_for_tick_begin;
610 $pl->save;
611
612 unless ($pl->active || $pl->ns) {
613 # check refcounts, this is tricky and needs to be adjusted to fit server internals
614 my $ob = $pl->ob;
615
616 my $pl_ref = $pl->refcnt_cnt;
617 my $ob_ref = $ob->refcnt_cnt;
618
619 ## pl_ref == $pl + ob->contr + %cf::PLAYER
620 ## ob_ref == $ob + pl->observe + simply being an object
621 if ($pl_ref == 3 && $ob_ref == 3) {
622 warn "player-scheduler destroy ", $ob->name;#d#
623
624 # remove from sight and get fresh "copies"
625 $pl = delete $cf::PLAYER{$ob->name};
626 $ob = $pl->ob;
627
628 $pl->destroy; # destroys $ob
629 } else {
630 my $a_ = $pl->refcnt;#d#
631 my $b_ = $ob->refcnt;#d#
632
633 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
634 }
635 }
636 }
637 };
638 warn $@ if $@;
639 Coro::cede;
640 };
641 }
642};
643
644$SCHEDULER->prio (1);
645

Diff Legend

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