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

Diff Legend

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