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.77 by root, Fri Dec 28 19:44:34 2007 UTC vs.
Revision 1.85 by root, Mon May 5 16:02:20 2008 UTC

… …
52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub safe_spot($$$) { 57sub safe_spot($) {
58 my ($m, $x, $y) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
59 71
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61} 73}
62 74
63sub enter_map { 75sub enter_map {
… …
73 $ob->enter_link; 85 $ob->enter_link;
74 86
75 my $m = cf::map::find $map; 87 my $m = cf::map::find $map;
76 my $time = delete $pl->{unclean_save}; 88 my $time = delete $pl->{unclean_save};
77 89
78 if ($time && $m && !safe_spot $m, $x, $y) { 90 if ($time && $m) {
79 if ($time < $m->{instantiate_time}) { 91 if ($time < $m->{instantiate_time}) {
80 # the map was reset in the meantime 92 # the map was reset in the meantime
81 my $age = $cf::RUNTIME - $time; 93 my $age = $cf::RUNTIME - $time;
82 94
83 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 95 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
84
85 ($map, $x, $y) = $pl->savebed;
86 96
87 if ($age >= $MAX_DISCONNECT_TIME) { 97 if ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message ( 98 $ob->message (
89 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 99 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
90 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 100 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
93 cf::NDI_RED 103 cf::NDI_RED
94 ); 104 );
95 # kill them. 105 # kill them.
96 # reminds me of the famous badness 10000 syndrome... 106 # reminds me of the famous badness 10000 syndrome...
97 $ob->stats->hp (-10000); #] if they survive this they deserved to live 107 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 my $killer = cf::arch::get "killer_login";
98 $pl->killer ("a cave-in"); 109 $pl->killer ($killer);
110 $killer->destroy;
99 } else { 111 } else {
112 ($map, $x, $y) = $pl->savebed;
113
100 $ob->message ( 114 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
102 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 116 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
103 . "Better use a savebed next time, much worse things could have happened... " 117 . "Better use a savebed next time, much worse things could have happened... "
104 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>", 118 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
… …
146*** or it has been disabled. Face caching is mandatory 160*** or it has been disabled. Face caching is mandatory
147*** so please enable it or use a newer client. 161*** so please enable it or use a newer client.
148*** 162***
149*** Look at your client preferences: 163*** Look at your client preferences:
150*** 164***
151*** CFPlus: all known versions automatically enable the facecache. 165*** deliantra: all known versions automatically enable the facecache.
152*** cfclient: use the -cache commandline option. 166*** cfclient: use the -cache commandline option.
153*** cfclient: map will not redraw automatically (bug). 167*** cfclient: map will not redraw automatically (bug).
154*** gcfclient: use -cache commandline option, or enable 168*** gcfclient: use -cache commandline option, or enable
155*** gcfclient: Client => Configure => Map & Image => Cache Images. 169*** gcfclient: Client => Configure => Map & Image => Cache Images.
156*** jcrossclient: your client is broken, use CFPlus or gcfclient. 170*** jcrossclient: your client is broken, use deliantra or gcfclient.
157*** 171***
158*** 172***
159EOF 173EOF
160 if ($ns->version =~ /jcrossclient/) { 174 if ($ns->version =~ /jcrossclient/) {
161 # let them, for now 175 # let them, for now
… …
386 400
387 $pl->chargen_race_next; 401 $pl->chargen_race_next;
388 Coro::Timer::sleep 0.2; 402 Coro::Timer::sleep 0.2;
389 } 403 }
390 404
405 # create the playerdir, if necessary, as chargen_race_done did it before
406 # presumably because of unique maps
407 aio_mkdir playerdir $pl, 0770;
391 $pl->chargen_race_done; 408 $pl->chargen_race_done;
392 409
393 while () { 410 while () {
394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 411 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
395 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 412 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
453 470
454 # update respawn position 471 # update respawn position
455 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 472 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
456 cf::async { $pl->save }; 473 cf::async { $pl->save };
457 474
475 my $killer = cf::arch::get "killer_logout";
458 $pl->killer ("left"); 476 $pl->killer ($killer);
477 $killer->destroy;
459 $ob->check_score; 478 $ob->check_score;
460 479
461 $ob->reply (undef, "In the future, you will wake up here when you die."); 480 $ob->reply (undef, "In the future, you will wake up here when you die.");
462 481
463 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 482 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
485 504
486 if ($cleanly) { 505 if ($cleanly) {
487 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 506 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
488 } else { 507 } else {
489 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 508 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
490 $pl->{unclean_save} = $cf::RUNTIME; 509 $pl->{unclean_save} = $cf::RUNTIME
510 unless safe_spot $pl;
491 } 511 }
492 }, 512 },
493); 513);
494 514
495############################################################################# 515#############################################################################
… …
536 $pl->destroy; # destroys $ob 556 $pl->destroy; # destroys $ob
537 } else { 557 } else {
538 my $a_ = $pl->refcnt;#d# 558 my $a_ = $pl->refcnt;#d#
539 my $b_ = $ob->refcnt;#d# 559 my $b_ = $ob->refcnt;#d#
540 560
541 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 561 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
542 } 562 }
543 } 563 }
544 } 564 }
545 }; 565 };
546 warn $@ if $@; 566 warn $@ if $@;
547 Coro::cede; 567 cf::cede_to_tick;
548 }; 568 };
549 } 569 }
550}; 570};
551 571
552$SCHEDULER->prio (1); 572$SCHEDULER->prio (1);

Diff Legend

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