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.33 by root, Mon Apr 2 18:14:24 2007 UTC vs.
Revision 1.95 by root, Wed Dec 17 16:43:38 2008 UTC

1#! perl # MANDATORY 1#! perl # mandatory
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# 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
72sub enter_map {
73 my ($pl) = @_;
74
75 warn $pl->ob->name, ": enter map 1\n";#d#
76 my $ob = $pl->ob;
77
78 my ($map, $x, $y)
79 = $ob->{_link_pos}
80 ? @{delete $ob->{_link_pos}}
81 : ($pl->maplevel, $ob->x, $ob->y);
82
83 warn $pl->ob->name, ": enter map 2\n";#d#
84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86
87 my $m = cf::map::find $map;
61 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
62 $pl->ns->send_drawinfo ( 89 warn $pl->ob->name, ": enter map 4\n";#d#
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 warn $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 }
131
132 warn $pl->ob->name, ": enter map 5\n";#d#
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
70} 142}
71 143
72# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 145# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 146sub nuke_playerdir {
75 my ($user) = @_; 147 my ($user) = @_;
76 148
77 aio_stat "$PLAYERDIR/$user"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
78 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81}
82 150
83sub setup { 151 cf::fork_call {
84 my ($ns, $args) = @_; 152 rename "$PLAYERDIR/$user", $temp;
85 153 system "rm", "-rf", $temp;
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 } else {
161 # other commands:
162 # sexp: no idea, probably for oudated servers
163 # tick: more stupidity, server should sned a tick per tick
164
165 $setup{$k} = "FALSE";
166 }
167 } 154 };
168
169 $ns->send_packet (join " ", setup => %setup);
170
171 cf::datalog setup =>
172 request => $args,
173 reply => \%setup,
174 client => $ns->version,
175 ;
176} 155}
177 156
178sub addme { 157cf::client->attach (on_addme => sub {
179 my ($ns) = @_; 158 my ($ns) = @_;
180 159
181 if (!$ns->facecache) 160 if (!$ns->facecache)
182 { 161 {
183 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 162 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
184 163
185 164
186*** 165***
187*** WARNING: 166*** WARNING:
188*** Your client does not support face/image caching, 167*** Your client does not support face/image caching,
189*** or it has been disabled. Face caching is mandatory 168*** or it has been disabled. Face caching is mandatory
190*** so please enable it or use a newer client. 169*** so please enable it or use a newer client.
191*** 170***
192*** Look at your client preferences: 171*** Look at your client preferences:
193*** 172***
194*** CFPlus: all known versions automatically enable the facecache. 173*** deliantra: all known versions automatically enable the facecache.
195*** cfclient: use the -cache commandline option. 174*** cfclient: use the -cache commandline option.
196*** cfclient: map will not redraw automatically (bug). 175*** cfclient: map will not redraw automatically (bug).
197*** gcfclient: use -cache commandline option, or enable 176*** gcfclient: use -cache commandline option, or enable
198*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 177*** gcfclient: Client => Configure => Map & Image => Cache Images.
199*** jcrossclient: your client is broken, use CFPlus or gcfclient. 178*** jcrossclient: your client is broken, use deliantra or gcfclient.
200*** 179***
201*** 180***
202EOF 181EOF
203 if ($ns->version =~ /jcrossclient/) { 182 if ($ns->version =~ /jcrossclient/) {
204 # let them, for now 183 # let them, for now
… …
224 } 203 }
225 204
226 $ns->pl and return $ns->destroy; 205 $ns->pl and return $ns->destroy;
227 206
228 $ns->async (sub { 207 $ns->async (sub {
208 $Coro::current->{desc} = "addme init";
209
229 my ($user, $pass); 210 my ($user, $pass);
230 211
231 $ns->send_packet ("addme_success"); 212 $ns->send_packet ("addme_success");
232 213
233 for (;;) { 214 for (;;) {
… …
238 cf::NDI_BLUE 219 cf::NDI_BLUE
239 ); 220 );
240 221
241 # read username 222 # read username
242 while () { 223 while () {
243 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
244 225
245 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
246 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
247 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
248 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
249 cf::NDI_RED 230 cf::NDI_RED
250 ); 231 );
251 } 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/) {
252 last; 233 last;
253 } else { 234 } else {
254 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
255 "Your username contains illegal characters " 236 "Your username contains illegal characters "
256 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
257 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
258 cf::NDI_RED 239 cf::NDI_RED
259 ); 240 );
260 } 241 }
242 Coro::Timer::sleep 0.4;
261 } 243 }
262 244
263 check_playing $ns, $user and next; 245 check_playing $ns, $user and next;
246
247 $Coro::current->{desc} = "addme($user) pass";
264 248
265 $ns->send_drawinfo ( 249 $ns->send_drawinfo (
266 "Welcome $user, please enter your password now. " 250 "Welcome $user, please enter your password now. "
267 . "New users should now choose a password. " 251 . "New users should now choose a password. "
268 . "Anything your client lets you enter is fine.", 252 . "Anything your client lets you enter is fine.",
… …
276 $ns->send_drawinfo ( 260 $ns->send_drawinfo (
277 "Try to use at least three characters as your password please, " 261 "Try to use at least three characters as your password please, "
278 . "that cannot be too much to ask for :)", 262 . "that cannot be too much to ask for :)",
279 cf::NDI_RED 263 cf::NDI_RED
280 ); 264 );
265 Coro::Timer::sleep 0.4;
281 } 266 }
282 267
283 # lock this username for the remainder of this login session 268 # lock this username for the remainder of this login session
284 if ($cf::LOGIN_LOCK{$user}) { 269 if ($cf::LOGIN_LOCK{$user}) {
285 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
… …
291 } 276 }
292 local $cf::LOGIN_LOCK{$user} = 1; 277 local $cf::LOGIN_LOCK{$user} = 1;
293 278
294 check_playing $ns, $user and next; 279 check_playing $ns, $user and next;
295 280
281 $Coro::current->{desc} = "addme($user) check";
282
296 # try to read the user file and check the password 283 # try to read the user file and check the password
297 if (my $pl = cf::player::find $user) { 284 if (my $pl = cf::player::find $user) {
298 aio_stat $pl->path and next; 285 aio_stat $pl->path and next;
299 my $mtime = (stat _)[9]; 286 my $mtime = (stat _)[9];
300 my $hash = $pl->password; 287 my $hash = $pl->password;
… …
302 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) {
303 nuke_str $pass; 290 nuke_str $pass;
304 # password matches, wonderful 291 # password matches, wonderful
305 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
306 $pl->connect ($ns); 293 $pl->connect ($ns);
307 check_clean_save $pl; 294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
295 enter_map $pl;
308 last; 296 last;
309 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
310 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
311 299
312 $ns->send_drawinfo ( 300 $ns->send_drawinfo (
… …
337 . "(check for Numlock and other semi-obvious error sources).", 325 . "(check for Numlock and other semi-obvious error sources).",
338 cf::NDI_RED 326 cf::NDI_RED
339 ); 327 );
340 next; 328 next;
341 } 329 }
330 } else {
331 # unable to load the playerfile:
332 # check wether the player dir exists, which means the file is corrupted or
333 # something very similar.
334 if (!aio_stat cf::player::playerdir $user) {
335 $ns->send_drawinfo (
336 "Unable to retrieve this player. It might be a locked or broken account. "
337 . "If this is your account, ask a dungeon master for assistance. "
338 . "Otherwise choose a different login name.",
339 cf::NDI_RED
340 );
341 next;
342 }
342 } 343 }
343 344
344 # the rest of this function is character creation 345 # the rest of this function is character creation
346 $Coro::current->{desc} = "addme($user) chargen";
345 347
346 # just to make sure nothing is left over 348 # just to make sure nothing is left over
347 nuke_playerdir $user; 349 nuke_playerdir $user;
348 350
349 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.";
… …
353 nuke_str $pass2; 355 nuke_str $pass2;
354 $ns->send_drawinfo ( 356 $ns->send_drawinfo (
355 "The passwords do not match, please try again.", 357 "The passwords do not match, please try again.",
356 cf::NDI_RED 358 cf::NDI_RED
357 ); 359 );
360 Coro::Timer::sleep 0.5;
358 next; 361 next;
359 } 362 }
360 363
361 nuke_str $pass2; 364 nuke_str $pass2;
362 365
363 my $pl = cf::player::new $user; 366 my $pl = cf::player::new $user;
364 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 367 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
365 nuke_str $pass; 368 nuke_str $pass;
366 $pl->connect ($ns); 369 $pl->connect ($ns);
367
368 my $ob = $pl->ob; 370 my $ob = $pl->ob;
371
372 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
369 373
370 while () { 374 while () {
371 $ob->update_stats; 375 $ob->update_stats;
372 $pl->save_stats; 376 $pl->save_stats;
373 377
… …
383 $ob->swap_stats ($res - 1, $swap - 1); 387 $ob->swap_stats ($res - 1, $swap - 1);
384 } 388 }
385 } else { 389 } else {
386 $ob->roll_stats; 390 $ob->roll_stats;
387 } 391 }
392
393 Coro::Timer::sleep 0.05;
388 } 394 }
389 395
390 $ob->set_animation (2); 396 $ob->set_animation (2);
391 $ob->add_statbonus; 397 $ob->add_statbonus;
392 398
393 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 399 while () {
394 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 400 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
401 my $msg = $ob->msg;
402 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
403 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
404
405 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
395 "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";
396 407
397 $ns->state (cf::ST_CHANGE_CLASS); 408 last if $res =~ /[dD]/;
409
410 $pl->chargen_race_next;
411 Coro::Timer::sleep 0.2;
412 }
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;
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;
437
398 delete $pl->{deny_save};#d# too early 438 delete $pl->{deny_save};
399 439
400 last; 440 last;
401 } 441 }
402 }); 442 });
403} 443});
404 444
405cf::register_command quit => sub { 445cf::register_command quit => sub {
406 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
407 447
408 $ob->reply (undef, 448 $ob->send_msg (undef,
409 "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. "
410 . "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.",
411 cf::NDI_UNIQUE | cf::NDI_RED); 451 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
412}; 452};
413 453
414cf::register_command quit_character => sub { 454cf::register_command quit_character => sub {
415 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
416 456
417 my $pl = $ob->contr; 457 my $pl = $ob->contr;
418 458
419 $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 {
420 if ($_[0] !~ /^[yY]/) { 460 if ($_[0] !~ /^[yY]/) {
421 $ob->reply (undef, 461 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
422 "Ok, not not quitting then.",
423 cf::NDI_UNIQUE | cf::NDI_RED);
424 } else { 462 } else {
425 $ob->reply (undef, 463 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
426 "Ok, quitting, hope to see you again.",
427 cf::NDI_UNIQUE | cf::NDI_RED);
428 $pl->ns->flush; 464 $pl->ns->flush;
429 cf::async { $pl->quit_character }; 465 cf::async { $pl->quit_character };
430 } 466 }
431 }); 467 });
432}; 468};
… …
442 478
443 # update respawn position 479 # update respawn position
444 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 480 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
445 cf::async { $pl->save }; 481 cf::async { $pl->save };
446 482
447 $pl->killer ("left"); 483 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
448 $ob->check_score; 484 $ob->check_score;
449 485
450 $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);
451 487
452 $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 {
453 if ($_[0] !~ /^[yY]/) { 489 if ($_[0] !~ /^[yY]/) {
454 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 490 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
455 $pl->deactivate; 491 $pl->deactivate;
… …
474 510
475 if ($cleanly) { 511 if ($cleanly) {
476 $_->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;
477 } else { 513 } else {
478 $_->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;
479 $pl->{unclean_save} = $cf::RUNTIME; 515 $pl->{unclean_save} = $cf::RUNTIME
516 unless safe_spot $pl;
480 } 517 }
481 }, 518 },
482); 519);
483 520
484cf::client->attach (
485 on_addme => \&addme,
486 on_setup => \&setup,
487);
488 521
489#############################################################################
490
491our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
492our $SAVE_TIMEOUT = 20; # save players every n seconds
493
494our $SCHEDULER = cf::async_ext {
495 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
496 while () {
497 $schedule_interval->next;
498
499 # this weird form of iteration over values is used because
500 # the hash changes underneath us frequently, and for
501 # keeps a direct reference to the value without (in 5.8 perls)
502 # keeping a reference, so this is prone to crashes or worse.
503 my @players = keys %cf::PLAYER;
504 for (@players) {
505 my $pl = $cf::PLAYER{$_}
506 or next;
507 $pl->valid or next;
508
509 eval {
510 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
511 $cf::WAIT_FOR_TICK_ONE->wait;
512 $pl->save;
513
514 unless ($pl->active) {
515 # check refcounts, this is tricky and needs to be adjusted to fit server internals
516 my $ob = $pl->ob;
517 Scalar::Util::weaken $pl;
518 Scalar::Util::weaken $ob;
519 my $a_ = $pl->refcnt;#d#
520 my $b_ = $ob->refcnt;#d#
521 my $pl_ref = $pl->refcnt_cnt;
522 my $ob_ref = $ob->refcnt_cnt;
523
524 ## pl_ref == one from object + one from cf::PLAYER
525 ## ob_ref == one from simply being an object
526 if ($pl_ref == 2 && $ob_ref == 1) {
527 warn "player-scheduler destroy ", $ob->name;#d#
528
529 # remove from sight and get fresh "copies"
530 $pl = delete $cf::PLAYER{$ob->name};
531 $ob = $pl->ob;
532
533 $ob->destroy;
534 $pl->destroy;
535 } else {
536 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d#
537 }
538 }
539 }
540 };
541 warn $@ if $@;
542 Coro::cede;
543 };
544 }
545};
546
547$SCHEDULER->prio (1);
548

Diff Legend

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