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.64 by root, Sat Jul 14 19:27:59 2007 UTC vs.
Revision 1.81 by root, Fri Jan 18 03:34:55 2008 UTC

52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub safe_spot($) {
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;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
57sub enter_map { 75sub enter_map {
58 my ($pl) = @_; 76 my ($pl) = @_;
59 77
60 my $ob = $pl->ob; 78 my $ob = $pl->ob;
61 79
64 ? @{delete $ob->{_link_pos}} 82 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 83 : ($pl->maplevel, $ob->x, $ob->y);
66 84
67 $ob->enter_link; 85 $ob->enter_link;
68 86
87 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 89
90 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 91 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 92 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 93 my $age = $cf::RUNTIME - $time;
74 94
75 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#
76 96
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 97 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 } else {
92 $ob->message (
93 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
94 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
95 . "Better use a savebed next time, much worse things could have happened... "
96 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
97 cf::NDI_RED
98 );
99 }
100 } else {
101 $ob->message ( 98 $ob->message (
102 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 99 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
103 . "as lots of things could happen when you leave by other means, such as cave-ins, " 100 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
104 . "or monsters suddenly snapping your body. Better use a savebed next time. " 101 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
105 . "H<Always apply a bed of reality to disconnect from the server.>", 102 . "H<You disconnected too long without having used a savebed.>",
106 cf::NDI_RED 103 cf::NDI_RED
107 ); 104 );
105 # kill them.
106 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 $pl->killer ("a cave-in");
109 } else {
110 ($map, $x, $y) = $pl->savebed;
111
112 $ob->message (
113 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
114 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
115 . "Better use a savebed next time, much worse things could have happened... "
116 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
117 cf::NDI_RED
118 );
119 }
120 } else {
121 $ob->message (
122 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
123 . "as lots of things could happen when you leave by other means, such as cave-ins, "
124 . "or monsters suddenly snapping your body. Better use a savebed next time. "
125 . "H<Always apply a bed of reality to disconnect from the server.>",
126 cf::NDI_RED
108 } 127 );
109 } 128 }
110 } 129 }
111 130
112 $ob->goto ($map, $x, $y); 131 $ob->goto ($map, $x, $y);
113} 132}
115# delete a player directory, be non-blocking AND synchronous... 134# delete a player directory, be non-blocking AND synchronous...
116# (thats hard, so we crap out and fork). 135# (thats hard, so we crap out and fork).
117sub nuke_playerdir { 136sub nuke_playerdir {
118 my ($user) = @_; 137 my ($user) = @_;
119 138
120 aio_stat "$PLAYERDIR/$user"; 139 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
121 system "cd \Q$PLAYERDIR\E " 140
122 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 141 cf::fork_call {
123 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 142 rename "$PLAYERDIR/$user", $temp;
143 system "rm", "-rf", $temp;
144 };
124} 145}
125 146
126cf::client->attach (on_addme => sub { 147cf::client->attach (on_addme => sub {
127 my ($ns) = @_; 148 my ($ns) = @_;
128 149
137*** or it has been disabled. Face caching is mandatory 158*** or it has been disabled. Face caching is mandatory
138*** so please enable it or use a newer client. 159*** so please enable it or use a newer client.
139*** 160***
140*** Look at your client preferences: 161*** Look at your client preferences:
141*** 162***
142*** CFPlus: all known versions automatically enable the facecache. 163*** deliantra: all known versions automatically enable the facecache.
143*** cfclient: use the -cache commandline option. 164*** cfclient: use the -cache commandline option.
144*** cfclient: map will not redraw automatically (bug). 165*** cfclient: map will not redraw automatically (bug).
145*** gcfclient: use -cache commandline option, or enable 166*** gcfclient: use -cache commandline option, or enable
146*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 167*** gcfclient: Client => Configure => Map & Image => Cache Images.
147*** jcrossclient: your client is broken, use CFPlus or gcfclient. 168*** jcrossclient: your client is broken, use deliantra or gcfclient.
148*** 169***
149*** 170***
150EOF 171EOF
151 if ($ns->version =~ /jcrossclient/) { 172 if ($ns->version =~ /jcrossclient/) {
152 # let them, for now 173 # let them, for now
172 } 193 }
173 194
174 $ns->pl and return $ns->destroy; 195 $ns->pl and return $ns->destroy;
175 196
176 $ns->async (sub { 197 $ns->async (sub {
198 $Coro::current->{desc} = "addme init";
199
177 my ($user, $pass); 200 my ($user, $pass);
178 201
179 $ns->send_packet ("addme_success"); 202 $ns->send_packet ("addme_success");
180 203
181 for (;;) { 204 for (;;) {
209 Coro::Timer::sleep 0.4; 232 Coro::Timer::sleep 0.4;
210 } 233 }
211 234
212 check_playing $ns, $user and next; 235 check_playing $ns, $user and next;
213 236
237 $Coro::current->{desc} = "addme($user) pass";
238
214 $ns->send_drawinfo ( 239 $ns->send_drawinfo (
215 "Welcome $user, please enter your password now. " 240 "Welcome $user, please enter your password now. "
216 . "New users should now choose a password. " 241 . "New users should now choose a password. "
217 . "Anything your client lets you enter is fine.", 242 . "Anything your client lets you enter is fine.",
218 cf::NDI_BLUE 243 cf::NDI_BLUE
240 next; 265 next;
241 } 266 }
242 local $cf::LOGIN_LOCK{$user} = 1; 267 local $cf::LOGIN_LOCK{$user} = 1;
243 268
244 check_playing $ns, $user and next; 269 check_playing $ns, $user and next;
270
271 $Coro::current->{desc} = "addme($user) check";
245 272
246 # try to read the user file and check the password 273 # try to read the user file and check the password
247 if (my $pl = cf::player::find $user) { 274 if (my $pl = cf::player::find $user) {
248 aio_stat $pl->path and next; 275 aio_stat $pl->path and next;
249 my $mtime = (stat _)[9]; 276 my $mtime = (stat _)[9];
303 next; 330 next;
304 } 331 }
305 } 332 }
306 333
307 # the rest of this function is character creation 334 # the rest of this function is character creation
335 $Coro::current->{desc} = "addme($user) chargen";
308 336
309 # just to make sure nothing is left over 337 # just to make sure nothing is left over
310 nuke_playerdir $user; 338 nuke_playerdir $user;
311 339
312 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 340 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
356 384
357 $ob->set_animation (2); 385 $ob->set_animation (2);
358 $ob->add_statbonus; 386 $ob->add_statbonus;
359 387
360 while () { 388 while () {
361 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 389 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
362 my $msg = $ob->msg; 390 my $msg = $ob->msg;
363 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 391 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
364 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 392 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
365 393
366 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
367 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 395 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
368 396
369 last if $res =~ /[dD]/; 397 last if $res =~ /[dD]/;
386 last; 414 last;
387 } 415 }
388 Coro::Timer::sleep 0.2; 416 Coro::Timer::sleep 0.2;
389 } 417 }
390 418
391 $ob->reply (undef, "Welcome to Crossfire!"); 419 $ob->reply (undef, "Welcome to Deliantra!");
392 420
393 delete $pl->{deny_save}; 421 delete $pl->{deny_save};
394 422
395 last; 423 last;
396 } 424 }
469 497
470 if ($cleanly) { 498 if ($cleanly) {
471 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 499 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
472 } else { 500 } else {
473 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 501 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
474 $pl->{unclean_save} = $cf::RUNTIME; 502 $pl->{unclean_save} = $cf::RUNTIME
503 unless safe_spot $pl;
475 } 504 }
476 }, 505 },
477); 506);
478 507
479############################################################################# 508#############################################################################
480 509
481our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 510our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
482our $SAVE_TIMEOUT = 20; # save players every n seconds 511our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
483 512
484our $SCHEDULER = cf::async_ext { 513our $SCHEDULER = cf::async_ext {
485 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 514 $Coro::current->{desc} = "player scheduler";
515
486 while () { 516 while () {
487 $schedule_interval->next; 517 Coro::EV::timer_once $SCHEDULE_INTERVAL;
488 518
489 # this weird form of iteration over values is used because 519 # this weird form of iteration over values is used because
490 # the hash changes underneath us frequently, and for 520 # the hash changes underneath us frequently, and for
491 # keeps a direct reference to the value without (in 5.8 perls) 521 # keeps a direct reference to the value without (in 5.8 perls)
492 # keeping a reference, so this is prone to crashes or worse. 522 # keeping a reference, so this is prone to crashes or worse.
496 or next; 526 or next;
497 $pl->valid or next; 527 $pl->valid or next;
498 528
499 eval { 529 eval {
500 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 530 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
501 cf::wait_for_tick_begin;
502 $pl->save; 531 $pl->save;
503 532
504 unless ($pl->active || $pl->ns) { 533 unless ($pl->active || $pl->ns) {
505 # check refcounts, this is tricky and needs to be adjusted to fit server internals 534 # check refcounts, this is tricky and needs to be adjusted to fit server internals
506 my $ob = $pl->ob; 535 my $ob = $pl->ob;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines