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.56 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.98 by root, Sun Jun 28 16:46:50 2009 UTC

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

Diff Legend

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