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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines