ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.111 by root, Sat Apr 15 12:46:48 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 09:33:12 2006 UTC

13use SDL::OpenGL; 13use SDL::OpenGL;
14 14
15use Crossfire; 15use Crossfire;
16use Crossfire::Protocol; 16use Crossfire::Protocol;
17 17
18use Compress::LZF;
19
18use CFClient; 20use CFClient;
19use CFClient::UI; 21use CFClient::UI;
20 22
21our $VERSION = '0.1'; 23our $VERSION = '0.1';
22 24
23my $MAX_FPS = 60; 25my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused as of yet 26my $MIN_FPS = 5; # unused as of yet
25 27
28our $META_SERVER = "crossfire.real-time.com:13326";
29
30our $FACEMAP;
31our $TILECACHE;
26our $FACECACHE; 32our $MAPCACHE;
27 33
28our $LAST_REFRESH; 34our $LAST_REFRESH;
29our $NOW; 35our $NOW;
30 36
31our $CFG; 37our $CFG;
38our $FULLSCREEN; 44our $FULLSCREEN;
39our $FONTSIZE; 45our $FONTSIZE;
40 46
41our $MAP; 47our $MAP;
42our $MAPWIDGET; 48our $MAPWIDGET;
49our $BUTTONBAR;
50our $LOGVIEW;
51our $CONSOLE;
52our $METASERVER;
43 53
44our $SDL_ACTIVE; 54our $SDL_ACTIVE;
45our $SDL_EV; 55our $SDL_EV;
46our %SDL_CB; 56our %SDL_CB;
47 57
48our $ALT_ENTER_MESSAGE; 58our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 59our $STATUS_LINE;
50our $DEBUG_STATUS; 60our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
53our $CONSOLE;
54 61
55sub status { 62sub status {
56 $STATUS_LINE->set_text ($_[0]); 63 $STATUS_LINE->set_text ($_[0]);
57 my ($w, $h) = $STATUS_LINE->size_request; 64 my ($w, $h) = $STATUS_LINE->size_request;
58 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 65 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
67sub start_game { 74sub start_game {
68 status "logging in..."; 75 status "logging in...";
69 76
70 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 77 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
71 78
79 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
80
72 $MAP = new CFClient::Map $mapsize, $mapsize; 81 $MAP = new CFClient::Map $mapsize, $mapsize;
82
83 my ($host, $port) = split /:/, $CFG->{host};
73 84
74 $CONN = new conn 85 $CONN = new conn
75 host => $CFG->{host}, 86 host => $host,
76 port => $CFG->{port}, 87 port => $port || 13327,
77 user => $CFG->{user}, 88 user => $CFG->{user},
78 pass => $CFG->{password}, 89 pass => $CFG->{password},
79 mapw => $mapsize, 90 mapw => $mapsize,
80 maph => $mapsize, 91 maph => $mapsize,
81 ; 92 ;
137 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
138 my ($self, $value) = @_; 149 my ($self, $value) = @_;
139 $CFG->{fow_smooth} = $value; 150 $CFG->{fow_smooth} = $value;
140 }); 151 });
141 152
142 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
143 $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
144 my ($self, $value) = @_; 155 my ($self, $value) = @_;
145 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
146 }); 157 });
147 158
148 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 159 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
149 destroy_screen (); 160 destroy_screen ();
150 init_screen (); 161 init_screen ();
151 }); 162 });
152 163
153 $dialog 164 $dialog
165}
166
167sub metaserver_dialog {
168 my $dialog = new CFClient::UI::FancyFrame
169 child => (my $vbox = new CFClient::UI::VBox);
170
171 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
172
173 $dialog
174}
175
176sub update_metaserver {
177 my ($HOST) = @_;
178
179 status "fetching metaserver list...";
180
181 my $buf;
182
183 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
184
185 Event->io (fd => $fh, poll => 'r', cb => sub {
186 my $res = sysread $fh, $buf, 8192, length $buf;
187
188 if (!defined $res) {
189 $_[0]->w->cancel;
190 status "metaserver: $!";
191 } elsif ($res == 0) {
192 $_[0]->w->cancel;
193 status "server list retrieved";
194
195 my $table = $METASERVER->{table};
196
197 $table->clear;
198
199 my @col = qw(Use #Users Host Uptime Version Description);
200 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
201 for 0 .. $#col;
202
203 my @align = qw(1 0 1 1 -1);
204
205 my $y = 0;
206 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
207 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
208
209 for ($desc) {
210 s/<br>/\n/gi;
211 s/<li>/\n· /gi;
212 s/<.*?>//sgi;
213 s/&/&amp;/g;
214 s/</&lt;/g;
215 s/>/&gt;/g;
216 }
217
218 $uptime = sprintf "%dd %02d:%02d:%02d",
219 (int $m->[8] / 86400),
220 (int $m->[8] / 3600) % 24,
221 (int $m->[8] / 60) % 60,
222 $m->[8] % 60;
223
224 $m = [$users, $host, $uptime, $version, $desc];
225
226 $y++;
227
228 $table->add (0, $y, new CFClient::UI::VBox children => [
229 (new CFClient::UI::Button text => " ", connect_activate => sub {
230 $HOST->set_text ($CFG->{host} = $host);
231 }),
232 (new CFClient::UI::Empty expand => 1),
233 ]);
234
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
236 for 0 .. $#$m;
237 }
238 }
239 });
154} 240}
155 241
156sub server_setup { 242sub server_setup {
157 my $dialog = new CFClient::UI::FancyFrame 243 my $dialog = new CFClient::UI::FancyFrame
158 child => (my $vbox = new CFClient::UI::VBox); 244 child => (my $vbox = new CFClient::UI::VBox);
159 245
160 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); 246 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
161 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 247 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
162 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 248 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
249
250 {
251 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252
163 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 253 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
164 my ($self, $value) = @_; 254 my ($self, $value) = @_;
165 $CFG->{host} = $value; 255 $CFG->{host} = $value;
166 }); 256 });
167 257
168 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 258 $METASERVER = metaserver_dialog;
169 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub { 259
170 my ($self, $value) = @_; 260 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
171 $CFG->{port} = $value; 261 update_metaserver $HOST;
172 }); 262 });
263 }
173 264
174 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 265 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
175 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 266 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
176 my ($self, $value) = @_; 267 my ($self, $value) = @_;
177 $CFG->{user} = $value; 268 $CFG->{user} = $value;
178 }); 269 });
179 270
180 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 271 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
181 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 272 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
182 my ($self, $value) = @_; 273 my ($self, $value) = @_;
183 $CFG->{password} = $value; 274 $CFG->{password} = $value;
184 }); 275 });
185 276
186 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 277 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
218 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
219 expand => 1, 310 expand => 1,
220 fontsize => $::CFG->{log_fontsize}, 311 fontsize => $::CFG->{log_fontsize},
221 ); 312 );
222 313
223 $vbox->add (my $input = new CFClient::UI::LineEntry); 314 $vbox->add (my $input = new CFClient::UI::LineEntry
315 connect_focus_in => sub {
316 my ($input, $prev_focus) = @_;
317
318 delete $input->{refocus_map};
319
320 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
321 $input->{refocus_map} = 1;
322 }
323 delete $input->{auto_activated};
324 },
224 $input->connect (activate => sub { 325 connect_activate => sub {
225 my ($input, $text) = @_; 326 my ($input, $text) = @_;
226 $input->set_text (''); 327 $input->set_text ('');
227 328
228 if ($text =~ /^\/(.*)/) { 329 if ($text =~ /^\/(.*)/) {
229 $::CONN->user_send ("command $1"); 330 $::CONN->user_send ("command $1");
230 } else { 331 } else {
231 my $say_cmd = $::CFG->{say_command} || 'say'; 332 my $say_cmd = $::CFG->{say_command} || 'say';
232 $::CONN->user_send ("command $say_cmd $text"); 333 $::CONN->user_send ("command $say_cmd $text");
233 } 334 }
335 if ($input->{refocus_map}) {
336 delete $input->{refocus_map};
337 $MAPWIDGET->focus_in
234 1 338 }
235 }); 339 },
236 $input->connect (escape => sub { 340 connect_escape => sub {
237 $MAPWIDGET->focus_in 341 $MAPWIDGET->focus_in
238 }); 342 },
239 $input->focus_in; 343 );
240 344
241 $CONSOLE = { 345 $CONSOLE = {
242 window => $window, 346 window => $window,
243 input => $input 347 input => $input
244 }; 348 };
260 $FAST = $CFG->{fast}; 364 $FAST = $CFG->{fast};
261 365
262 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 366 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
263 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5; 367 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
264 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5; 368 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
265 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0; 369 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
266 370
267 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0; 371 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
268 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0; 372 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
269 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0; 373 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
270 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0; 374 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
312 $MAPWIDGET->focus_in; 416 $MAPWIDGET->focus_in;
313 $MAPWIDGET->connect (activate_console => sub { 417 $MAPWIDGET->connect (activate_console => sub {
314 my ($mapwidget, $preset) = @_; 418 my ($mapwidget, $preset) = @_;
315 419
316 if ($CONSOLE) { 420 if ($CONSOLE) {
421 $CONSOLE->{input}->{auto_activated} = 1;
317 $CONSOLE->{input}->focus_in; 422 $CONSOLE->{input}->focus_in;
318 423
319 if ($preset && $CONSOLE->{input}->get_text eq '') { 424 if ($preset && $CONSOLE->{input}->get_text eq '') {
320 $CONSOLE->{input}->set_text ($preset); 425 $CONSOLE->{input}->set_text ($preset);
321 } 426 }
331 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 436 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
332 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 437 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
333 status "Configuration Saved"; 438 status "Configuration Saved";
334 }); 439 });
335 440
336 $BUTTONBAR->{children}[0]->emit ("activate"); 441 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
337} 442}
338 443
339sub destroy_screen { 444sub destroy_screen {
340 $CFClient::UI::ROOT->{children} = []; 445 $CFClient::UI::ROOT->{children} = [];
341 undef $SDL_ACTIVE; 446 undef $SDL_ACTIVE;
404 509
405 $self->send ($command); 510 $self->send ($command);
406 status $command; 511 status $command;
407} 512}
408 513
514sub conn::map_scroll {
515 my ($self, $dx, $dy) = @_;
516
517 $MAP->scroll ($dx, $dy);
518}
519
409sub conn::feed_map1a { 520sub conn::feed_map1a {
410 my ($self, $data) = @_; 521 my ($self, $data) = @_;
411 522
412# $self->Crossfire::Protocol::feed_map1a ($data); 523# $self->Crossfire::Protocol::feed_map1a ($data);
413 524
414 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
415 $MAP->map1a_update ($data); 525 $MAP->map1a_update ($data);
416 $MAPWIDGET->update; 526 $MAPWIDGET->update;
417} 527}
418 528
419#sub conn::map_update { 529sub conn::flush_map {
420# my ($self, $dirty) = @_; 530 my ($self) = @_;
421# 531
422# $MAPWIDGET->update; 532 my $map_info = delete $self->{map_info}
423#} 533 or return;
534
535 my ($hash, $x, $y, $w, $h) = @$map_info;
536
537 my $data = $MAP->get_rect ($x, $y, $w, $h);
538 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
539
540 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
541
542}
424 543
425sub conn::map_clear { 544sub conn::map_clear {
426 my ($self) = @_; 545 my ($self) = @_;
427 546
547 $self->flush_map;
548 delete $self->{neigh};
549
428 $MAP->clear; 550 $MAP->clear;
551}
429 552
430# refresh; 553
554sub conn::load_map($$$) {
555 my ($self, $hash, $x, $y) = @_;
556
557 if (defined (my $data = $MAPCACHE->get ($hash))) {
558 $data = Compress::LZF::decompress $data;
559 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
560 for my $id ($MAP->set_rect ($x, $y, $data)) {
561 my $data = $TILECACHE->get ($id)
562 or next;
563
564 $self->set_texture ($id => $data);
565 }
566 }
567}
568
569sub conn::flood_fill {
570 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
571
572 # the server does not allow map paths > 6
573 return if 6 <= length $path;
574
575 for my $tile (1..4) {
576 next if $self->{neigh}{$hash}[$tile];
577 next unless $flags & (1 << ($tile - 1));
578
579 my $neigh = $self->{neigh}{$hash} ||= [];
580
581 $self->send_mapinfo ("spatial $path$tile", sub {
582 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
583
584 warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
585 return if $mode ne "spatial";
586
587 $x += $MAP->ox;
588 $y += $MAP->oy;
589
590 $self->load_map ($hash, $x, $y);
591
592 $neigh->[$tile] = [$x, $y, $w, $h];
593
594 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
595 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
596 });
597 }
598}
599
600sub conn::map_change {
601 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
602
603 $self->flush_map;
604
605 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
606
607 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
608
609 my $mapmapw = 250;
610 my $mapmaph = 250;
611
612 $self->flood_fill ("", $hash, $flags,
613 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
614 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
615
616 $x += $ox;
617 $y += $oy;
618
619 $self->{map_info} = [$hash, $x, $y, $w, $h];
620
621 $self->load_map ($hash, $x, $y);
431} 622}
432 623
433sub conn::face_find { 624sub conn::face_find {
434 my ($self, $face) = @_; 625 my ($self, $facenum, $face) = @_;
435 626
436 $FACECACHE->{"$face->{chksum},$face->{name}"} 627 my $hash = "$face->{chksum},$face->{name}";
628
629 my $id = $FACEMAP->get ($hash);
630
631 unless ($id) {
632 # create new id for face
633 # i love transactions
634 for (1..100) {
635 my $txn = $CFClient::DB_ENV->txn_begin;
636 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
637 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
638 $id++;
639 if ($FACEMAP->put (id => $id) == 0
640 && $FACEMAP->put ($hash => $id) == 0) {
641 $txn->txn_commit;
642
643 goto gotid;
644 }
645 }
646 $txn->abort;
647 }
648
649 CFClient::fatal "maximum number of transaction retries reached - database problems?";
650 }
651
652gotid:
653 $face->{id} = $id;
654 $MAP->set_face ($facenum => $id);
655 $TILECACHE->get ($id)
437} 656}
438 657
439sub conn::face_update { 658sub conn::face_update {
440 my ($self, $facenum, $face) = @_; 659 my ($self, $facenum, $face) = @_;
441 660
442 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 661 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
443 662
444 my $tex = $face->{texture} = 663 $self->set_texture ($face->{id} => delete $face->{image});
664}
665
666sub conn::set_texture {
667 my ($self, $id, $data) = @_;
668
669 $self->{texture}[$id] ||= do {
670 my $tex =
445 new_from_image CFClient::Texture 671 new_from_image CFClient::Texture
446 delete $face->{image}, minify => 1; 672 $data, minify => 1;
447 673
448 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 674 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
449 $MAPWIDGET->update; 675 $MAPWIDGET->update;
676
677 $tex
678 };
450} 679}
451 680
452sub conn::query { 681sub conn::query {
453 my ($self, $flags, $prompt) = @_; 682 my ($self, $flags, $prompt) = @_;
454 683
460 my ($self, $color, $text) = @_; 689 my ($self, $color, $text) = @_;
461 690
462 my @color = ( 691 my @color = (
463 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 692 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
464 [1.00, 1.00, 1.00], 693 [1.00, 1.00, 1.00],
465 [0.00, 0.00, 0.55], 694 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
466 [1.00, 0.00, 0.00], 695 [1.00, 0.00, 0.00],
467 [1.00, 0.54, 0.00], 696 [1.00, 0.54, 0.00],
468 [0.11, 0.56, 1.00], 697 [0.11, 0.56, 1.00],
469 [0.93, 0.46, 0.00], 698 [0.93, 0.46, 0.00],
470 [0.18, 0.54, 0.34], 699 [0.18, 0.54, 0.34],
513# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 742# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
514 }, 743 },
515); 744);
516 745
517############################################################################# 746#############################################################################
747
748$TILECACHE = CFClient::db_table "tilecache";
749$FACEMAP = CFClient::db_table "facemap";
518 750
519CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 751CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
520 752
521my %DEF_CFG = ( 753my %DEF_CFG = (
522 sdl_mode => 0, 754 sdl_mode => 0,
528 fow_intensity => 0.45, 760 fow_intensity => 0.45,
529 fow_smooth => 0, 761 fow_smooth => 0,
530 log_fontsize => 14, 762 log_fontsize => 14,
531 mapsize => 100, 763 mapsize => 100,
532 host => "crossfire.schmorp.de", 764 host => "crossfire.schmorp.de",
533 port => 13327,
534 say_command => 'say', 765 say_command => 'say',
535); 766);
536 767
537while (my ($k, $v) = each %DEF_CFG) { 768while (my ($k, $v) = each %DEF_CFG) {
538 $CFG->{$k} = $v unless exists $CFG->{$k}; 769 $CFG->{$k} = $v unless exists $CFG->{$k};
556 787
557 CFClient::add_font $_ for @fonts; 788 CFClient::add_font $_ for @fonts;
558 CFClient::set_font $fonts[0]; 789 CFClient::set_font $fonts[0];
559} 790}
560 791
561$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
562
563Event::loop; 792Event::loop;
564 793
565Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
566 794

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines