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

Diff Legend

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