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.92 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.100 by root, Wed Sep 2 16:54:20 2009 UTC

… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
73} 70}
74 71
75sub enter_map { 72sub enter_map {
76 my ($pl) = @_; 73 my ($pl) = @_;
77 74
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob; 75 my $ob = $pl->ob;
80 76
81 my ($map, $x, $y) 77 my ($map, $x, $y)
82 = $ob->{_link_pos} 78 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
85 81
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link; 82 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89 83
90 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
91 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
93 86
94 if ($time && $m) { 87 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime 89 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
… …
130 cf::NDI_RED 123 cf::NDI_RED
131 ); 124 );
132 } 125 }
133 } 126 }
134 127
135 warn $pl->ob->name, ": enter map 5\n";#d#
136 #$ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub {
138 warn $pl->ob->name, ": enter map check\n";#d#
139 $_[0]
140 }, sub {
141 warn $pl->ob->name, ": enter map done\n";#d#
142 });
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
145} 129}
146 130
147# delete a player directory, be non-blocking AND synchronous... 131# delete a player directory, be non-blocking AND synchronous...
148# (thats hard, so we crap out and fork). 132# (that's hard, so we crap out and fork).
149sub nuke_playerdir { 133sub nuke_playerdir {
150 my ($user) = @_; 134 my ($user) = @_;
151 135
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 136 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153 137
… …
157 }; 141 };
158} 142}
159 143
160cf::client->attach (on_addme => sub { 144cf::client->attach (on_addme => sub {
161 my ($ns) = @_; 145 my ($ns) = @_;
162
163 if (!$ns->facecache)
164 {
165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
166
167
168***
169*** WARNING:
170*** Your client does not support face/image caching,
171*** or it has been disabled. Face caching is mandatory
172*** so please enable it or use a newer client.
173***
174*** Look at your client preferences:
175***
176*** deliantra: all known versions automatically enable the facecache.
177*** cfclient: use the -cache commandline option.
178*** cfclient: map will not redraw automatically (bug).
179*** gcfclient: use -cache commandline option, or enable
180*** gcfclient: Client => Configure => Map & Image => Cache Images.
181*** jcrossclient: your client is broken, use deliantra or gcfclient.
182***
183***
184EOF
185 if ($ns->version =~ /jcrossclient/) {
186 # let them, for now
187 } else {
188 $ns->flush;
189 return $ns->destroy;
190 }
191
192 # $ns->facecache = true;
193 }
194
195 if ($ns->mapmode < cf::Map1aCmd) {
196 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
197
198
199***
200*** WARNING:
201*** Your client is too old. Please upgrade to a newer version.
202EOF
203
204 $ns->flush;
205 return $ns->destroy;
206 }
207 146
208 $ns->pl and return $ns->destroy; 147 $ns->pl and return $ns->destroy;
209 148
210 $ns->async (sub { 149 $ns->async (sub {
211 $Coro::current->{desc} = "addme init"; 150 $Coro::current->{desc} = "addme init";
… …
292 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) {
293 nuke_str $pass; 232 nuke_str $pass;
294 # password matches, wonderful 233 # password matches, wonderful
295 my $pl = cf::player::find $user or next; 234 my $pl = cf::player::find $user or next;
296 $pl->connect ($ns); 235 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
298 enter_map $pl; 236 enter_map $pl;
299 last; 237 last;
300 } elsif (can_cleanup $pl, $mtime) { 238 } elsif (can_cleanup $pl, $mtime) {
301 Coro::Timer::sleep 1; 239 Coro::Timer::sleep 1;
302 240
… …
433 Coro::Timer::sleep 0.2; 371 Coro::Timer::sleep 0.2;
434 } 372 }
435 373
436 $ob->reply (undef, "Welcome to Deliantra!"); 374 $ob->reply (undef, "Welcome to Deliantra!");
437 375
376 # XXX: Workaround for delayed client ext protocol handshake
377 $pl->esrv_new_player;
378
438 delete $pl->{deny_save}; 379 delete $pl->{deny_save};
439 380
440 last; 381 last;
441 } 382 }
442 }); 383 });
443}); 384});
444 385
445cf::register_command quit => sub { 386cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 387 my ($ob, $arg) = @_;
447 388
448 $ob->reply (undef, 389 $ob->send_msg (undef,
449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 390 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
450 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 391 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
451 cf::NDI_UNIQUE | cf::NDI_RED); 392 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
452}; 393};
453 394
454cf::register_command quit_character => sub { 395cf::register_command quit_character => sub {
455 my ($ob, $arg) = @_; 396 my ($ob, $arg) = @_;
456 397
457 my $pl = $ob->contr; 398 my $pl = $ob->contr;
458 399
459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 400 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
460 if ($_[0] !~ /^[yY]/) { 401 if ($_[0] !~ /^[yY]/) {
461 $ob->reply (undef, 402 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 "Ok, not not quitting then.",
463 cf::NDI_UNIQUE | cf::NDI_RED);
464 } else { 403 } else {
465 $ob->reply (undef, 404 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
466 "Ok, quitting, hope to see you again.",
467 cf::NDI_UNIQUE | cf::NDI_RED);
468 $pl->ns->flush; 405 $pl->ns->flush;
469 cf::async { $pl->quit_character }; 406 cf::async { $pl->quit_character };
470 } 407 }
471 }); 408 });
472}; 409};
… …
485 cf::async { $pl->save }; 422 cf::async { $pl->save };
486 423
487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 424 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
488 $ob->check_score; 425 $ob->check_score;
489 426
490 $ob->reply (undef, "In the future, you will wake up here when you die."); 427 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
491 428
492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 429 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
493 if ($_[0] !~ /^[yY]/) { 430 if ($_[0] !~ /^[yY]/) {
494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 431 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
495 $pl->deactivate; 432 $pl->deactivate;

Diff Legend

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