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.53 by root, Mon Jun 11 21:38:13 2007 UTC vs.
Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 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);
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) 160 if (!$ns->facecache)
240 { 161 {
241 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 162 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
242 163
243 164
244*** 165***
245*** WARNING: 166*** WARNING:
246*** Your client does not support face/image caching, 167*** Your client does not support face/image caching,
247*** or it has been disabled. Face caching is mandatory 168*** or it has been disabled. Face caching is mandatory
248*** so please enable it or use a newer client. 169*** so please enable it or use a newer client.
249*** 170***
250*** Look at your client preferences: 171*** Look at your client preferences:
251*** 172***
252*** CFPlus: all known versions automatically enable the facecache. 173*** deliantra: all known versions automatically enable the facecache.
253*** cfclient: use the -cache commandline option. 174*** cfclient: use the -cache commandline option.
254*** cfclient: map will not redraw automatically (bug). 175*** cfclient: map will not redraw automatically (bug).
255*** gcfclient: use -cache commandline option, or enable 176*** gcfclient: use -cache commandline option, or enable
256*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 177*** gcfclient: Client => Configure => Map & Image => Cache Images.
257*** jcrossclient: your client is broken, use CFPlus or gcfclient. 178*** jcrossclient: your client is broken, use deliantra or gcfclient.
258*** 179***
259*** 180***
260EOF 181EOF
261 if ($ns->version =~ /jcrossclient/) { 182 if ($ns->version =~ /jcrossclient/) {
262 # let them, for now 183 # let them, for now
… …
282 } 203 }
283 204
284 $ns->pl and return $ns->destroy; 205 $ns->pl and return $ns->destroy;
285 206
286 $ns->async (sub { 207 $ns->async (sub {
208 $Coro::current->{desc} = "addme init";
209
287 my ($user, $pass); 210 my ($user, $pass);
288 211
289 $ns->send_packet ("addme_success"); 212 $ns->send_packet ("addme_success");
290 213
291 for (;;) { 214 for (;;) {
… …
296 cf::NDI_BLUE 219 cf::NDI_BLUE
297 ); 220 );
298 221
299 # read username 222 # read username
300 while () { 223 while () {
301 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
302 225
303 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
304 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
305 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
306 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
307 cf::NDI_RED 230 cf::NDI_RED
308 ); 231 );
309 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 232 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
310 last; 233 last;
311 } else { 234 } else {
312 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
313 "Your username contains illegal characters " 236 "Your username contains illegal characters "
314 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
315 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
316 cf::NDI_RED 239 cf::NDI_RED
317 ); 240 );
318 } 241 }
242 Coro::Timer::sleep 0.4;
319 } 243 }
320 244
321 check_playing $ns, $user and next; 245 check_playing $ns, $user and next;
246
247 $Coro::current->{desc} = "addme($user) pass";
322 248
323 $ns->send_drawinfo ( 249 $ns->send_drawinfo (
324 "Welcome $user, please enter your password now. " 250 "Welcome $user, please enter your password now. "
325 . "New users should now choose a password. " 251 . "New users should now choose a password. "
326 . "Anything your client lets you enter is fine.", 252 . "Anything your client lets you enter is fine.",
… …
334 $ns->send_drawinfo ( 260 $ns->send_drawinfo (
335 "Try to use at least three characters as your password please, " 261 "Try to use at least three characters as your password please, "
336 . "that cannot be too much to ask for :)", 262 . "that cannot be too much to ask for :)",
337 cf::NDI_RED 263 cf::NDI_RED
338 ); 264 );
265 Coro::Timer::sleep 0.4;
339 } 266 }
340 267
341 # lock this username for the remainder of this login session 268 # lock this username for the remainder of this login session
342 if ($cf::LOGIN_LOCK{$user}) { 269 if ($cf::LOGIN_LOCK{$user}) {
343 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
… …
349 } 276 }
350 local $cf::LOGIN_LOCK{$user} = 1; 277 local $cf::LOGIN_LOCK{$user} = 1;
351 278
352 check_playing $ns, $user and next; 279 check_playing $ns, $user and next;
353 280
281 $Coro::current->{desc} = "addme($user) check";
282
354 # try to read the user file and check the password 283 # try to read the user file and check the password
355 if (my $pl = cf::player::find $user) { 284 if (my $pl = cf::player::find $user) {
356 aio_stat $pl->path and next; 285 aio_stat $pl->path and next;
357 my $mtime = (stat _)[9]; 286 my $mtime = (stat _)[9];
358 my $hash = $pl->password; 287 my $hash = $pl->password;
… …
360 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 289 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
361 nuke_str $pass; 290 nuke_str $pass;
362 # password matches, wonderful 291 # password matches, wonderful
363 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
364 $pl->connect ($ns); 293 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
365 enter_map $pl; 295 enter_map $pl;
366 last; 296 last;
367 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
368 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
369 299
… …
411 next; 341 next;
412 } 342 }
413 } 343 }
414 344
415 # the rest of this function is character creation 345 # the rest of this function is character creation
346 $Coro::current->{desc} = "addme($user) chargen";
416 347
417 # just to make sure nothing is left over 348 # just to make sure nothing is left over
418 nuke_playerdir $user; 349 nuke_playerdir $user;
419 350
420 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 351 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
424 nuke_str $pass2; 355 nuke_str $pass2;
425 $ns->send_drawinfo ( 356 $ns->send_drawinfo (
426 "The passwords do not match, please try again.", 357 "The passwords do not match, please try again.",
427 cf::NDI_RED 358 cf::NDI_RED
428 ); 359 );
360 Coro::Timer::sleep 0.5;
429 next; 361 next;
430 } 362 }
431 363
432 nuke_str $pass2; 364 nuke_str $pass2;
433 365
… …
455 $ob->swap_stats ($res - 1, $swap - 1); 387 $ob->swap_stats ($res - 1, $swap - 1);
456 } 388 }
457 } else { 389 } else {
458 $ob->roll_stats; 390 $ob->roll_stats;
459 } 391 }
392
393 Coro::Timer::sleep 0.05;
460 } 394 }
461 395
462 $ob->set_animation (2); 396 $ob->set_animation (2);
463 $ob->add_statbonus; 397 $ob->add_statbonus;
464 398
465 while () { 399 while () {
466 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 400 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
467 my $msg = $ob->msg; 401 my $msg = $ob->msg;
468 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 402 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
469 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 403 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
470 404
471 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 405 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"; 406 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
473 407
474 last if $res =~ /[dD]/; 408 last if $res =~ /[dD]/;
475 409
476 $pl->chargen_race_next; 410 $pl->chargen_race_next;
411 Coro::Timer::sleep 0.2;
477 } 412 }
478 413
414 # create the playerdir, if necessary, as chargen_race_done did it before
415 # presumably because of unique maps
416 aio_mkdir playerdir $pl, 0770;
479 $pl->chargen_race_done; 417 $pl->chargen_race_done;
418
419 while () {
420 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
421 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
422
423 if ($res =~ /^[fF]/) {
424 $pl->gender (1);
425 last;
426 } elsif ($res =~ /^[mM]/) {
427 $pl->gender (0);
428 last;
429 }
430 Coro::Timer::sleep 0.2;
431 }
432
433 $ob->reply (undef, "Welcome to Deliantra!");
434
435 # XXX: Workaround for delayed client ext protocol handshake
436 $pl->esrv_new_player;
480 437
481 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
482 439
483 last; 440 last;
484 } 441 }
485 }); 442 });
486} 443});
487 444
488cf::register_command quit => sub { 445cf::register_command quit => sub {
489 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
490 447
491 $ob->reply (undef, 448 $ob->send_msg (undef,
492 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
493 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 450 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
494 cf::NDI_UNIQUE | cf::NDI_RED); 451 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
495}; 452};
496 453
497cf::register_command quit_character => sub { 454cf::register_command quit_character => sub {
498 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
499 456
500 my $pl = $ob->contr; 457 my $pl = $ob->contr;
501 458
502 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
503 if ($_[0] !~ /^[yY]/) { 460 if ($_[0] !~ /^[yY]/) {
504 $ob->reply (undef, 461 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
505 "Ok, not not quitting then.",
506 cf::NDI_UNIQUE | cf::NDI_RED);
507 } else { 462 } else {
508 $ob->reply (undef, 463 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
509 "Ok, quitting, hope to see you again.",
510 cf::NDI_UNIQUE | cf::NDI_RED);
511 $pl->ns->flush; 464 $pl->ns->flush;
512 cf::async { $pl->quit_character }; 465 cf::async { $pl->quit_character };
513 } 466 }
514 }); 467 });
515}; 468};
… …
525 478
526 # update respawn position 479 # update respawn position
527 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 480 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
528 cf::async { $pl->save }; 481 cf::async { $pl->save };
529 482
530 $pl->killer ("left"); 483 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
531 $ob->check_score; 484 $ob->check_score;
532 485
533 $ob->reply (undef, "In the future, you will wake up here when you die."); 486 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
534 487
535 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
536 if ($_[0] !~ /^[yY]/) { 489 if ($_[0] !~ /^[yY]/) {
537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 490 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
538 $pl->deactivate; 491 $pl->deactivate;
… …
557 510
558 if ($cleanly) { 511 if ($cleanly) {
559 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 512 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
560 } else { 513 } else {
561 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 514 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
562 $pl->{unclean_save} = $cf::RUNTIME; 515 $pl->{unclean_save} = $cf::RUNTIME
516 unless safe_spot $pl;
563 } 517 }
564 }, 518 },
565); 519);
566 520
567cf::client->attach (
568 on_addme => \&addme,
569 on_setup => \&setup,
570);
571 521
572#############################################################################
573
574our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
575our $SAVE_TIMEOUT = 20; # save players every n seconds
576
577our $SCHEDULER = cf::async_ext {
578 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
579 while () {
580 $schedule_interval->next;
581
582 # this weird form of iteration over values is used because
583 # the hash changes underneath us frequently, and for
584 # keeps a direct reference to the value without (in 5.8 perls)
585 # keeping a reference, so this is prone to crashes or worse.
586 my @players = keys %cf::PLAYER;
587 for (@players) {
588 my $pl = $cf::PLAYER{$_}
589 or next;
590 $pl->valid or next;
591
592 eval {
593 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
594 cf::wait_for_tick_begin;
595 $pl->save;
596
597 unless ($pl->active || $pl->ns) {
598 # check refcounts, this is tricky and needs to be adjusted to fit server internals
599 my $ob = $pl->ob;
600
601 my $pl_ref = $pl->refcnt_cnt;
602 my $ob_ref = $ob->refcnt_cnt;
603
604 ## pl_ref == $pl + ob->contr + %cf::PLAYER
605 ## ob_ref == $ob + pl->observe + simply being an object
606 if ($pl_ref == 3 && $ob_ref == 3) {
607 warn "player-scheduler destroy ", $ob->name;#d#
608
609 # remove from sight and get fresh "copies"
610 $pl = delete $cf::PLAYER{$ob->name};
611 $ob = $pl->ob;
612
613 $ob->destroy;
614 $pl->destroy;
615 } else {
616 my $a_ = $pl->refcnt;#d#
617 my $b_ = $ob->refcnt;#d#
618
619 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
620 }
621 }
622 }
623 };
624 warn $@ if $@;
625 Coro::cede;
626 };
627 }
628};
629
630$SCHEDULER->prio (1);
631

Diff Legend

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