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.10 by root, Fri Jan 5 20:04:02 2007 UTC vs.
Revision 1.119 by root, Thu Nov 15 05:54:02 2012 UTC

1#! perl 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;
7 7
8my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 8CONF MAX_DISCONNECT_TIME = 3600;
9
10# paranoia function to overwrite a string-in-place
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 9
15sub query { 10sub query {
16 my ($ns, $flags, $text) = @_; 11 my ($ns, $flags, $text) = @_;
17 12
18 my $current = $Coro::current; 13 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 14 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 15}
24 16
25sub can_cleanup { 17sub can_cleanup {
26 my ($playerfile, $mtime) = @_; 18 my ($pl, $mtime) = @_;
27 19
28 my $age = time - $mtime; 20 my $age = time - $mtime;
29 my $level = $playerfile =~ /^level (\d+)$/m ? $1 : return; 21 my $level = $pl->ob->level;
30 22
31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3 23 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3
32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 24 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 25 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
34 || $age > 700 * 86400 # 2 years for everybody else 26 || $age > 700 * 86400 # 2 years for everybody else
35} 27}
36 28
37sub check_playing { 29sub check_playing {
38 my ($ns, $user) = @_; 30 my ($ns, $user) = @_;
39 31
40 return unless cf::player::find $user; 32 return unless cf::player::find_active $user;
41 33
42 $ns->send_drawinfo ( 34 $ns->send_drawinfo (
43 "That player is already logged in on this server. " 35 "That player is already logged in on this server. "
44 . "If you want to create a new player, choose another name. " 36 . "If you want to create a new player, choose another name. "
45 . "If you are already a registered player, make sure nobody " 37 . "If you have already a registered, make sure nobody "
46 . "else is using your account at this time. If you lost your conenction " 38 . "else is using your account at this time. If you lost your connection "
47 . "then the server will likely timeout within a minute. If you still " 39 . "then the server will likely timeout within a minute. If you still "
48 . "cannot log-in after a minute, you are still logged in. Make sure " 40 . "cannot log-in after a minute, you are still logged in. Make sure "
49 . "you do not have another client running. If you use windows, reboot, " 41 . "you do not have another client running. If you use windows, reboot, "
50 . "this will fix anything.", 42 . "this will fix anything.",
51 cf::NDI_RED 43 cf::NDI_RED
52 ); 44 );
53 45
54 1 46 1
55} 47}
56 48
57# delete a player directory, be non-blocking AND synchronous... 49sub safe_spot($) {
58# (thats hard, so we crap out and fork). 50 my ($pl) = @_;
51
52 my $ob = $pl->ob;
53
54 my $m = $ob->map
55 or return;
56 my $x = $ob->x;
57 my $y = $ob->y;
58
59 # never happens normally, but helps when shell users make mistakes
60 $m->linkable
61 or return 1;
62
63# return 0;#d#
64# warn join ":", $m->at ($x, $y);#d#
65# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
66# return 0;
67
68 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
69}
70
71sub enter_map {
72 my ($pl) = @_;
73
74 my $ob = $pl->ob;
75
76 my ($map, $x, $y)
77 = $ob->{_link_pos}
78 ? @{delete $ob->{_link_pos}}
79 : ($pl->maplevel, $ob->x, $ob->y);
80
81 $ob->enter_link;
82
83 my $m = cf::map::find $map;
84 my $time = delete $pl->{unclean_save};
85
86 if ($time && $m) {
87 if ($time < $m->{instantiate_time}) {
88 # the map was reset in the meantime
89 my $age = $cf::RUNTIME - $time;
90
91 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
92
93 if ($age >= $MAX_DISCONNECT_TIME) {
94 $ob->message (
95 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
96 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
97 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
98 . "H<You disconnected too long without having used a savebed.>",
99 cf::NDI_RED
100 );
101 # kill them.
102 # reminds me of the famous badness 10000 syndrome...
103 $ob->stats->hp (-10000); #] if they survive this they deserved to live
104 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
105 } else {
106 ($map, $x, $y) = $pl->savebed;
107
108 $ob->message (
109 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
110 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
111 . "Better use a savebed next time, much worse things could have happened... "
112 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
113 cf::NDI_RED
114 );
115 }
116 } else {
117 $ob->message (
118 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
119 . "as lots of things could happen when you leave by other means, such as cave-ins, "
120 . "or monsters suddenly snapping your body. Better use a savebed next time. "
121 . "H<Always apply a bed of reality to disconnect from the server.>",
122 cf::NDI_RED
123 );
124 }
125 }
126
127 $ob->goto ($map, $x, $y);
128}
129
130sub encode_password($) {
131 "!" . unpack "H*", $_[0]
132}
133
134sub compare_password($$) {
135 my ($pass, $token) = @_;
136
137 if ($token =~ /!!(.*)/) {
138 return +(substr $pass, 0, 8) eq pack "H*", $1;
139 } elsif ($token =~ /!(.*)/) {
140 return $pass eq pack "H*", $1;
141 } else {
142 return $token eq crypt $pass, $token;
143 }
144}
145
146# delete a player directory
59sub nuke_playerdir { 147sub nuke_playerdir {
60 my ($user) = @_; 148 my ($user) = @_;
61 149
150 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
151
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
62 aio_stat "$PLAYERDIR/$user"; 153 aio_rename "$PLAYERDIR/$user", $temp;
63 system "cd \Q$PLAYERDIR\E " 154 IO::AIO::aio_rmtree $temp;
64 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
65 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
66} 155}
67 156
68sub addme { 157sub login_done {
158 my ($pl) = @_;
159
160 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
161 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
162 }
163}
164
165sub chargen {
166 my ($ns, $user, $pass) = @_;
167
168 # the rest of this function is character creation
169 $Coro::current->{desc} = "addme($user) chargen";
170
171 # just to make sure nothing is left over
172 # normally, nothing is there.
173 nuke_playerdir $user;
174
175 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
176
177 if ($pass2 ne $pass) {
178 $ns->send_drawinfo (
179 "The passwords do not match, please try again.",
180 cf::NDI_RED
181 );
182 Coro::Timer::sleep 0.5;
183 next;
184 }
185
186 my $pl = cf::player::new $user;
187 $pl->password (encode_password $pass);
188 $pl->connect ($ns);
189 my $ob = $pl->ob;
190
191 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
192
193 while () {
194 $ob->update_stats;
195 $pl->save_stats;
196
197 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
198 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
199
200 if ($res =~ /^[Nn]/) {
201 last;
202 } elsif ($res > 0 && $res <= 7) {
203 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
204
205 if ($swap > 0 && $swap <= 7) {
206 $ob->swap_stats ($res - 1, $swap - 1);
207 }
208 } else {
209 $ob->roll_stats;
210 }
211
212 Coro::Timer::sleep 0.05;
213 }
214
215 $ob->set_animation (2);
216 $ob->add_statbonus;
217
218 while () {
219 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
220 my $msg = $ob->msg;
221 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
222 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
223
224 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
225 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
226
227 last if $res =~ /[dD]/;
228
229 $pl->chargen_race_next;
230 Coro::Timer::sleep 0.05;
231 }
232
233 # create the playerdir, if necessary, as chargen_race_done did it before
234 # presumably because of unique maps
235 aio_mkdir playerdir $pl, 0770;
236 $pl->chargen_race_done;
237
238 while () {
239 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
240 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
241
242 if ($res =~ /^[fF]/) {
243 $pl->gender (1);
244 last;
245 } elsif ($res =~ /^[mM]/) {
246 $pl->gender (0);
247 last;
248 }
249 Coro::Timer::sleep 0.05;
250 }
251
252 $ob->reply (undef, "Welcome to Deliantra!");
253
254 # XXX: Workaround for delayed client ext protocol handshake
255 $pl->esrv_new_player;
256
257 delete $pl->{deny_save};
258}
259
260cf::client->attach (on_addme => sub {
69 my ($ns) = @_; 261 my ($ns) = @_;
70 262
71 $ns->destroy if $ns->pl; 263 $ns->pl and return $ns->destroy;
72 264
73 $ns->async (sub { 265 $ns->async (sub {
266 $Coro::current->{desc} = "addme init";
267
74 my ($user, $pass); 268 my ($user, $pass);
75 269
76 $ns->send_packet ("addme_success"); 270 $ns->send_packet ("addme_success");
77 271
78 for (;;) { 272 for (;;) {
… …
83 cf::NDI_BLUE 277 cf::NDI_BLUE
84 ); 278 );
85 279
86 # read username 280 # read username
87 while () { 281 while () {
88 $user = query $ns, 0, "What is your name?\n:"; 282 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
89 283
90 if ($cf::LOGIN_LOCK{$user}) { 284 if ($cf::LOGIN_LOCK{$user}) {
91 $ns->send_drawinfo ( 285 $ns->send_drawinfo (
92 "That username is currently used in another login session. " 286 "That username is currently used in another login session. "
93 . "Chose another, or wait till the other session has ended.", 287 . "Chose another, or wait till the other session has ended.",
94 cf::NDI_RED 288 cf::NDI_RED
95 ); 289 );
96 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { 290 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
97 last; 291 last;
98 } else { 292 } else {
99 $ns->send_drawinfo ( 293 $ns->send_drawinfo (
100 "Your username contains illegal characters " 294 "Your username contains illegal characters "
101 . "(only a-z, A-Z and 0-9 are allowed), " 295 . "(only a-z, A-Z and 0-9 are allowed), "
102 . "or is not between 3 and 18 characters in length.", 296 . "or is not between 3 and 20 characters in length.",
103 cf::NDI_RED 297 cf::NDI_RED
104 ); 298 );
105 } 299 }
300 Coro::Timer::sleep 0.4;
106 } 301 }
107 302
108 check_playing $ns, $user and next; 303 check_playing $ns, $user and next;
304
305 $Coro::current->{desc} = "addme($user) pass";
109 306
110 $ns->send_drawinfo ( 307 $ns->send_drawinfo (
111 "Welcome $user, please enter your password now. " 308 "Welcome $user, please enter your password now. "
112 . "New users should now choose a password. " 309 . "New users should now choose a password. "
113 . "Anything your client lets you enter is fine.", 310 . "Anything your client lets you enter is fine.",
… …
121 $ns->send_drawinfo ( 318 $ns->send_drawinfo (
122 "Try to use at least three characters as your password please, " 319 "Try to use at least three characters as your password please, "
123 . "that cannot be too much to ask for :)", 320 . "that cannot be too much to ask for :)",
124 cf::NDI_RED 321 cf::NDI_RED
125 ); 322 );
323 Coro::Timer::sleep 0.4;
126 } 324 }
127
128 my $dir = "$PLAYERDIR/$user";
129 my $plfile = "$dir/$user.pl";
130 325
131 # lock this username for the remainder of this login session 326 # lock this username for the remainder of this login session
132 if ($cf::LOGIN_LOCK{$user}) { 327 if ($cf::LOGIN_LOCK{$user}) {
133 $ns->send_drawinfo ( 328 $ns->send_drawinfo (
134 "That username is currently used in another login session. " 329 "That username is currently used in another login session. "
… …
139 } 334 }
140 local $cf::LOGIN_LOCK{$user} = 1; 335 local $cf::LOGIN_LOCK{$user} = 1;
141 336
142 check_playing $ns, $user and next; 337 check_playing $ns, $user and next;
143 338
339 $Coro::current->{desc} = "addme($user) check";
340
144 # try to read the user file and check the password 341 # try to read the user file and check the password
145 if (my $fh = aio_open $plfile, O_RDONLY, 0) { 342 if (my $pl = cf::player::find $user) {
343 aio_stat $pl->path and next;
146 my $mtime = (stat $fh)[9]; 344 my $mtime = (stat _)[9];
345 my $token = $pl->password;
147 346
148 0 < aio_read $fh, 0, 16384, my $buf, 0 or next; 347 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
149 $buf =~ /^password (\S+)$/m or next; 348 # player exists and passwords match - we can proceed
150 my $hash = $1;
151 349
152 if ($hash eq crypt $pass, $hash) { 350 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
153 nuke_str $pass;
154 # password matches, wonderful 351 # password matches, wonderful
155 my $pl = cf::player::load $plfile or next; 352 my $pl = cf::player::find $user or next;
156 $pl->enable_save (1);
157 $pl->connect ($ns); 353 $pl->connect ($ns);
354 enter_map $pl;
355 login_done $pl;
158 last; 356 return;
159 } elsif (can_cleanup $buf, $mtime) { 357 } elsif (can_cleanup $pl, $mtime) {
160 Coro::Timer::sleep 1; 358 Coro::Timer::sleep 1;
161 359
162 $ns->send_drawinfo ( 360 $ns->send_drawinfo (
163 "Player exists, but password does not match. If this is your account, " 361 "Player exists, but password does not match. If this is your account, "
164 . "please try again. If not, you can now decide to take over this account " 362 . "please try again. If not, you can now decide to take over this account "
165 . "because it has not been in-use for some time.", 363 . "because it has not been in-use for some time.",
166 cf::NDI_RED 364 cf::NDI_RED
167 ); 365 );
168 366
169 #TODO: nuke_str
170 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 367 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
171 or next; 368 or next;
172 369
173 # check if the file hasn't changed 370 # check if the file hasn't changed
174 aio_stat $plfile and next; 371 aio_stat cf::player::path $user and next;
175 $mtime == (stat _)[9] or next; 372 $mtime == (stat _)[9] or next;
176 373
177 nuke_playerdir $user; 374 $pl->quit_character;
178 375
179 # fall through to creation 376 # fall through to creation
180 } else { 377 } else {
181 nuke_str $pass;
182
183 Coro::Timer::sleep 1; 378 Coro::Timer::sleep 1;
184 379
185 $ns->send_drawinfo ( 380 $ns->send_drawinfo (
186 "Wrong username or password. Please try again " 381 "Wrong username or password. Please try again "
187 . "(check for Numlock and other semi-obvious error sources).", 382 . "(check for Numlock and other semi-obvious error sources).",
188 cf::NDI_RED 383 cf::NDI_RED
189 ); 384 );
190 next; 385 next;
191 } 386 }
192 } 387 } else {
193 388 # unable to load the playerfile:
194 # the rest of this function is character creation 389 # check whether the player dir exists, which means the file is corrupted or
195 390 # something very similar.
196 # just to make sure nothing is left over 391 if (!aio_stat cf::player::playerdir $user) {
197 nuke_playerdir $user;
198
199 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
200
201 if ($pass2 ne $pass) {
202 nuke_str $pass;
203 nuke_str $pass2;
204 $ns->send_drawinfo ( 392 $ns->send_drawinfo (
205 "The passwords do not match, please try again.", 393 "Unable to retrieve this player. It might be a locked or broken account. "
394 . "If this is your account, ask a dungeon master for assistance. "
395 . "Otherwise choose a different login name.",
206 cf::NDI_RED 396 cf::NDI_RED
207 ); 397 );
208 next; 398 next;
209 }
210
211 nuke_str $pass2;
212
213 my $pl = cf::player::create;
214 $pl->ob->name ($user);
215 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
216 nuke_str $pass;
217 $pl->connect ($ns);
218
219 my $ob = $pl->ob;
220
221 while () {
222 $ob->update_stats;
223 $pl->save_stats;
224
225 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
226 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
227
228 if ($res =~ /^[Nn]/) {
229 last;
230 } elsif ($res > 0 && $res <= 7) {
231 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
232
233 if ($swap > 0 && $swap <= 7) {
234 $ob->swap_stats ($res - 1, $swap - 1);
235 }
236 } else {
237 $ob->roll_stats;
238 } 399 }
239 } 400 }
240 401
241 $ob->set_animation (2);
242 $ob->add_statbonus;
243
244 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE);
245 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR,
246 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
247
248 $ns->state (cf::ST_CHANGE_CLASS);
249 $pl->enable_save (1);#d# too early
250
251 last; 402 last;
252 } 403 }
404
405 # lock again, too layz to make this nicer
406 local $cf::LOGIN_LOCK{$user} = 1;
407 chargen $ns, $user, $pass;
408 login_done $ns->pl;
253 }); 409 });
254} 410});
411
412cf::register_command password => sub {
413 my ($pl, $arg) = @_;
414
415 unless ($pl->flag (cf::FLAG_WIZ)) {
416 $pl->message (
417 "The password can currently only changed by a DM.",
418 cf::NDI_UNIQUE | cf::NDI_REPLY);
419 return;
420 }
421
422 my (@args) = split /\s+/, $arg;
423 my ($player, $new_pw) = @args;
424
425 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
426 $pl->message (
427 "Usage: password <player> [<new password>]",
428 cf::NDI_UNIQUE | cf::NDI_REPLY);
429 return;
430 }
431
432 if ($new_pw eq '') {
433 $new_pw =
434 join '',
435 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
436 1..9;
437 }
438
439 cf::async {
440 my $plc = cf::player::find $player;
441 if ($plc) {
442 $plc->password (encode_password $new_pw);
443 $pl->message (
444 "Ok, changed password of '$player' to '$new_pw'!",
445 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
446 } else {
447 $pl->message (
448 "Fail! Couldn't set password for '$player', "
449 . "he doesn't seem to exist!",
450 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
451 }
452 };
453};
454
455cf::register_command quit => sub {
456 my ($ob, $arg) = @_;
457
458 $ob->send_msg (undef,
459 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
460 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462};
463
464cf::register_command quit_character => sub {
465 my ($ob, $arg) = @_;
466
467 my $pl = $ob->contr;
468
469 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
470 if ($_[0] !~ /^[yY]/) {
471 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
472 } else {
473 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
474 cf::async {
475 $pl->quit_character;
476 };
477 }
478 });
479};
255 480
256cf::object->attach ( 481cf::object->attach (
257 type => cf::SAVEBED, 482 type => cf::SAVEBED,
258 on_apply => sub { 483 on_apply => sub {
259 my ($bed, $ob) = @_; 484 my ($bed, $ob) = @_;
260 485
261 return cf::override 0 unless $ob->type == cf::PLAYER; 486 return cf::override 0 unless $ob->type == cf::PLAYER;
262 487
488 my $pl = $ob->contr;
489
263 # update respawn position 490 # update respawn position
264 $ob->contr->savebed ($bed->map->path, $bed->x, $bed->y); 491 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
265 492
266 $ob->contr->killer ("left"); 493 cf::async {
267 $ob->check_score; 494 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
495 ext::highscore::check $ob;
268 496
269 $ob->reply (undef, "In the future, you will wake up here when you die."); 497 $pl->save;
270 $ob->contr->save (1);
271 498
499 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
500
501 my $ns = $pl->ns
502 or return;
503
272 $ob->contr->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 504 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
273 if ($_[0] !~ /^[yY]/) { 505 if ($_[0] !~ /^[yY]/) {
274 $ob->contr->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 506 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
507 $pl->deactivate;
275 $ob->contr->ns->destroy; 508 $pl->ns->destroy;
276 } else { 509 }
277 $ob->contr->enable_save (1);
278 } 510 });
279 }); 511 };
280 }, 512 },
281); 513);
282 514
283cf::player->attach ( 515cf::player->attach (
284 on_login => sub { 516 on_login => sub {
… …
293 525
294 if ($cleanly) { 526 if ($cleanly) {
295 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 527 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
296 } else { 528 } else {
297 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 529 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
530 $pl->{unclean_save} = $cf::RUNTIME
531 unless safe_spot $pl;
298 } 532 }
299 }, 533 },
300); 534);
301 535
302cf::client->attach (
303 on_addme => \&addme,
304);
305

Diff Legend

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