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.41 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.79 by root, Wed Apr 12 00:36:14 2006 UTC

… …
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Client;
18use Crossfire::Protocol; 17use Crossfire::Protocol;
19 18
20use Crossfire::Client::Widget; 19use CFClient;
20use CFClient::UI;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21 26
22our $FACECACHE; 27our $FACECACHE;
23
24our $VERSION = '0.1';
25
26our %GL_EXT;
27 28
28our $CFG; 29our $CFG;
29our $CONN; 30our $CONN;
30 31
32our @SDL_MODES;
31our $WIDTH; 33our $WIDTH;
32our $HEIGHT; 34our $HEIGHT;
33our $FULLSCREEN; 35our $FULLSCREEN;
34 36
37our $NOW;
38
39our $MAPWIDGET;
35our $FONTSIZE; 40our $FONTSIZE;
36 41
37our $SDL_TIMER; 42our $SDL_TIMER;
38our $SDL_APP; 43our $SDL_APP;
39our $SDL_EV = new SDL::Event; 44our $SDL_EV;
40our %SDL_CB; 45our %SDL_CB;
41 46
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 47our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE;
49our $DEBUG_STATUS;
45 50
46our $TOPLEVEL; 51my $last_refresh;
52my %ANIMATE;
53my $refresh_handler;
47 54
48our $tw; # Test widget #d# 55our ($tw, $te); # Test widget #d#
49 56
50sub init_screen { 57sub init_screen {
51 $SDL_APP = new SDL::App 58 $SDL_APP = new SDL::App
52 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
53 -title => "Crossfire+ Client", 60 -title => "Crossfire+ Client",
54 -width => $WIDTH, 61 -width => $WIDTH,
55 -height => $HEIGHT, 62 -height => $HEIGHT,
56 -opengl => 1, 63 -opengl => 1,
57 -red_size => 8, 64 -red_size => 5,
58 -green_size => 8, 65 -green_size => 5,
59 -blue_size => 8, 66 -blue_size => 5,
67 -alpha_size => 0,
60 -double_buffer => 1, 68 -double_buffer => 1,
61 -fullscreen => $FULLSCREEN, 69 -fullscreen => $FULLSCREEN,
62 -resizeable => 0; 70 -resizeable => 0;
63 71
64 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 72 $SDL_EV = new SDL::Event;
73 $SDL_EV->set_unicode (1);
65 74
66 $GL_EXT{GL_ARB_texture_non_power_of_two} 75 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
67 or warn "WARNING: non-power-of-two opengl extension required"; 76 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
77 while $SDL_EV->poll;
68 78
79 1
80 };
81
82 $last_refresh = SDL::GetTicks;
83
84 CFClient::gl_init;
85
69 $FONTSIZE = int $HEIGHT / 50; 86 $FONTSIZE = int $HEIGHT / 40;
70 87
71 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 88 #############################################################################
72 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE,
73 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
74 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
75 $TOPLEVEL->add ($ALT_ENTER_MESSAGE);
76 89
77 # Test code #d#
78 {
79 my $frm = new Crossfire::Client::Widget::Frame;
80 $tw = new Crossfire::Client::Widget::Window;
81 $frm->add (my $te = new Crossfire::Client::Widget::TextEntry 0, 0, 10, $FONTSIZE, "Foo in the garden!");
82 $tw->add ($frm);
83
84 $tw->move (0, $HEIGHT - 120);
85 $TOPLEVEL->add ($tw);
86# $te->focus_in;
87 }
88
89 glClearColor 0, 0, 0, 0; 90 glClearColor 0.45, 0.45, 0.45, 1;
90 91
91 glEnable GL_TEXTURE_2D; 92 glEnable GL_TEXTURE_2D;
92 glEnable GL_COLOR_MATERIAL; 93 glEnable GL_COLOR_MATERIAL;
93 glShadeModel GL_FLAT; 94 glShadeModel GL_FLAT;
94 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96 97
97 $_->() for @GL_INIT; 98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102
103 $STATUS_LINE = new CFClient::UI::Label
104 padding => 0,
105 y => $HEIGHT * 49 / 50 - $FONTSIZE;
106 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
107
108 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
109 padding => 0,
110 y => $HEIGHT * 49 / 50,
111 height => $HEIGHT / 50,
112 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
113 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
114
115 $MAPWIDGET = new CFClient::UI::MapWidget;
116 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
117 $MAPWIDGET->focus_in;
118}
119
120sub destroy_screen {
121 remove Glib::Source $SDL_TIMER;
122 undef $SDL_APP;
123 undef $SDL_EV;
124 SDL::Quit;
125}
126
127sub config_dialog {
128 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
129 child => (my $vbox = new CFClient::UI::VBox);
130 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
131 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
132
133 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
134 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
135
136 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
137 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
138
139 $mode_slider->connect (changed => sub {
140 my ($self, $value) = @_;
141
142 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
143 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
144 });
145 $mode_slider->emit (changed => $mode_slider->{range}[0]);
146
147 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
148 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
149
150 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
151 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
152
153 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
154 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
155
156 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
157 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
158
159 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
160 $table->add (1, 5, new CFClient::UI::Slider
161 req_w => 100,
162 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
163 connect_changed => sub {
164 my ($self, $value) = @_;
165
166 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
167 },
168 );
169
170 $vbox->add (my $hbox = new CFClient::UI::HBox);
171 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
172 warn "save\n";
173 });
174 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
175 warn "login\n";
176 });
177 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
178 warn "apply\n";
179 });
180
181 $CFClient::UI::TOPLEVEL->add ($dialog);
98} 182}
99 183
100sub start_game { 184sub start_game {
101 $SDL_TIMER = add Glib::Timeout 1000/100, sub {
102 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
103 while $SDL_EV->poll;
104
105 1
106 };
107
108 $WIDTH = $CFG->{width}; 185 $WIDTH = $CFG->{width};
109 $HEIGHT = $CFG->{height}; 186 $HEIGHT = $CFG->{height};
110 $FULLSCREEN = 0; 187 $FULLSCREEN = 0;
111 188
112 init_screen; 189 init_screen;
190
191 config_dialog;
192
193 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
113 194
114 $CONN = new conn 195 $CONN = new conn
115 host => $CFG->{host}, 196 host => $CFG->{host},
116 port => $CFG->{port}, 197 port => $CFG->{port},
117 user => $CFG->{user}, 198 user => $CFG->{user},
118 pass => $CFG->{password}, 199 pass => $CFG->{password},
119 mapw => 50, 200 mapw => $mapsize,
120 maph => 37, 201 maph => $mapsize,
121 ; 202 ;
203
204 CFClient::lowdelay fileno $CONN->{fh};
122} 205}
123 206
124sub stop_game { 207sub stop_game {
125 remove Glib::Source $SDL_TIMER; 208 remove Glib::Source $refresh_handler if $refresh_handler;
209 undef $refresh_handler;
126 210
127 undef $SDL_APP; 211 undef $CONN;
128 SDL::Quit; 212 destroy_screen;
129} 213}
130
131 214
132sub force_refresh { 215sub force_refresh {
133 glViewport 0, 0, $WIDTH, $HEIGHT; 216 glViewport 0, 0, $WIDTH, $HEIGHT;
134 217
135 glMatrixMode GL_PROJECTION; 218 glMatrixMode GL_PROJECTION;
136 glLoadIdentity; 219 glLoadIdentity;
137 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100; 220 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
138 glMatrixMode GL_MODELVIEW; 221 glMatrixMode GL_MODELVIEW;
222 glLoadIdentity;
139 223
140 glClear GL_COLOR_BUFFER_BIT; 224 glClear GL_COLOR_BUFFER_BIT;
141 225
142 $TOPLEVEL->draw; 226 $CFClient::UI::TOPLEVEL->draw;
143 227
144 SDL::GLSwapBuffers; 228 SDL::GLSwapBuffers;
145} 229}
146 230
147my $refresh_handler; 231sub debug {
232 $DEBUG_STATUS->set_text ($_[0]);
233 my ($w, $h) = $DEBUG_STATUS->size_request;
234 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
235}
236
237my $FPS;
148 238
149sub refresh { 239sub refresh {
150 $refresh_handler ||= add Glib::Idle sub { 240 $refresh_handler ||= add Glib::Idle sub {
241 if ($SDL_APP) {
242 $NOW = SDL::GetTicks;
243
244 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
245 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
246 $NOW = SDL::GetTicks;
247 }
248
249 my $interval = ($NOW - $last_refresh) * 0.001;
250 $last_refresh = $NOW;
251
252 if ($interval) {
253 $FPS ||= 1 / $interval;
254 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
255 debug sprintf "%5.02f", $FPS;
256 }
257
151 force_refresh; 258 force_refresh;
259 $_->animate ($interval) for grep $_, values %ANIMATE;
260
261 if (%ANIMATE) {
262 1
263 } else {
264 undef $refresh_handler;
265 0
266 }
267 } else {
152 undef $refresh_handler; 268 undef $refresh_handler;
269 0
153 0 270 }
154 }; 271 };
272}
273
274sub animation_start {
275 my ($widget) = @_;
276 $ANIMATE{$widget} = $widget;
277 Scalar::Util::weaken $ANIMATE{$widget};
278
279 refresh;
280}
281
282sub animation_stop {
283 my ($widget) = @_;
284 delete $ANIMATE{$widget};
155} 285}
156 286
157%SDL_CB = ( 287%SDL_CB = (
158 SDL_QUIT() => sub { 288 SDL_QUIT() => sub {
159 main_quit Gtk2; 289 main_quit Gtk2;
… …
167 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 297 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
168 # alt-enter 298 # alt-enter
169 $FULLSCREEN = !$FULLSCREEN; 299 $FULLSCREEN = !$FULLSCREEN;
170 init_screen; 300 init_screen;
171 } else { 301 } else {
172 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 302 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
173 } 303 }
174 }, 304 },
175 SDL_KEYUP() => sub { 305 SDL_KEYUP() => sub {
176 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 306 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
177 }, 307 },
178 SDL_MOUSEMOTION() => sub { 308 SDL_MOUSEMOTION() => sub {
179 warn "sdl motion\n";#d# 309 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
180 }, 310 },
181 SDL_MOUSEBUTTONDOWN() => sub { 311 SDL_MOUSEBUTTONDOWN() => sub {
182 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 312 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
183 }, 313 },
184 SDL_MOUSEBUTTONUP() => sub { 314 SDL_MOUSEBUTTONUP() => sub {
185 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 315 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
186 }, 316 },
187 SDL_ACTIVEEVENT() => sub { 317 SDL_ACTIVEEVENT() => sub {
188 warn "active\n";#d# 318# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
189 }, 319 },
190); 320);
191 321
192@conn::ISA = Crossfire::Protocol::; 322@conn::ISA = Crossfire::Protocol::;
193 323
194sub conn::map_update { 324sub conn::map_update {
195 my ($self, $dirty) = @_; 325 my ($self, $dirty) = @_;
196 326
197 refresh; 327 $MAPWIDGET->update;
198} 328}
199 329
200sub conn::map_scroll { 330sub conn::map_scroll {
201 my ($self, $dx, $dy) = @_; 331 my ($self, $dx, $dy) = @_;
202 332
203 refresh; 333# refresh;
204} 334}
205 335
206sub conn::map_clear { 336sub conn::map_clear {
207 my ($self) = @_; 337 my ($self) = @_;
208 338
209 refresh; 339# refresh;
210} 340}
211 341
212sub conn::face_find { 342sub conn::face_find {
213 my ($self, $face) = @_; 343 my ($self, $face) = @_;
214 344
… …
218sub conn::face_update { 348sub conn::face_update {
219 my ($self, $face) = @_; 349 my ($self, $face) = @_;
220 350
221 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 351 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
222 352
223 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 353 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
224} 354}
225 355
226sub conn::query { 356sub conn::query {
227 my ($self, $flags, $prompt) = @_; 357 my ($self, $flags, $prompt) = @_;
228 358
… …
240 } 370 }
241 $ent->set_text ($value); 371 $ent->set_text ($value);
242 $ent->signal_connect (changed => sub { 372 $ent->signal_connect (changed => sub {
243 my ($ent) = @_; 373 my ($ent) = @_;
244 $cfg->{$key} = $ent->get_text; 374 $cfg->{$key} = $ent->get_text;
375 # TODO: Mapsize should be a slider in the game gui
376 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
377 $cfg->{$key} = 100;
378 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
379 $cfg->{$key} = 50;
380 }
245 }); 381 });
246} 382}
247 383
248sub run_config_dialog { 384sub run_config_dialog {
249 my (%events) = @_; 385 my (%events) = @_;
… …
251 my $w = Gtk2::Window->new; 387 my $w = Gtk2::Window->new;
252 388
253 my @cfg = ( 389 my @cfg = (
254 [qw/Host host/], 390 [qw/Host host/],
255 [qw/Port port/], 391 [qw/Port port/],
392 [qw/Mapsize% mapsize/],
256 [qw/Username user/], 393 [qw/Username user/],
257 [qw/Password password/], 394 [qw/Password password/],
258 ); 395 );
259 396
260 my $cfg = {}; 397 my $cfg = {};
261
262 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
263 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
264 398
265 $w->add (my $vb = Gtk2::VBox->new); 399 $w->add (my $vb = Gtk2::VBox->new);
266 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 400 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
267 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 401 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
268 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 402 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
269 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 403 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
270 my $i = 0; 404 my $i = 0;
271 my $act = 0; 405 my $act = 0;
272 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 406 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
273 if ($_ eq $selmode) { $act = $i } 407 if ($_ eq $selmode) { $act = $i }
274 $cb->append_text ($_); 408 $cb->append_text ($_);
275 $i++; 409 $i++;
276 } 410 }
277 $cb->set_active ($act); 411 $cb->set_active ($act);
… …
294 $cb->signal_connect (clicked => sub { 428 $cb->signal_connect (clicked => sub {
295 for (keys %$cfg) { 429 for (keys %$cfg) {
296 $::CFG->{$_} = $cfg->{$_} 430 $::CFG->{$_} = $cfg->{$_}
297 if $_ ne '_i'; 431 if $_ ne '_i';
298 } 432 }
299 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 433 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
300 }); 434 });
301 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 435 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
302 $cb->signal_connect (clicked => sub { 436 $cb->signal_connect (clicked => sub {
303 for (keys %$cfg) { 437 for (keys %$cfg) {
304 $::CFG->{$_} = $cfg->{$_} 438 $::CFG->{$_} = $cfg->{$_}
… …
307 my $cb = $events{login} || sub {}; 441 my $cb = $events{login} || sub {};
308 $cb->($::CFG->{user}, $::CFG->{password}); 442 $cb->($::CFG->{user}, $::CFG->{password});
309 }); 443 });
310 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 444 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
311 $cb->signal_connect (clicked => sub { 445 $cb->signal_connect (clicked => sub {
312 my $cb = $events{login} || sub {}; 446 my $cb = $events{logout} || sub {};
313 $cb->(); 447 $cb->();
314 }); 448 });
315 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 449 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
316 $cb->signal_connect (clicked => sub { $w->destroy }); 450 $cb->signal_connect (clicked => sub { $w->destroy });
317 451
… …
323 457
324############################################################################# 458#############################################################################
325 459
326SDL::Init SDL_INIT_EVERYTHING; 460SDL::Init SDL_INIT_EVERYTHING;
327 461
328$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new; 462@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
463 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
329 464
330my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
331
332$TOPLEVEL->add ($mapwidget);
333$mapwidget->focus_in;
334
335Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 465CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
336 466
337$CFG ||= { 467$CFG ||= {
338 width => 640, 468 width => 640,
339 height => 480, 469 height => 480,
470 mapsize => 100,
340 fullscreen => 0, 471 fullscreen => 0,
341 host => "crossfire.schmorp.de", 472 host => "crossfire.schmorp.de",
342 port => 13327, 473 port => 13327,
343}; 474};
344 475
345Crossfire::Client::add_font Crossfire::Client::find_rcfile "uifont.ttf"; 476{
346Crossfire::Client::set_font "[Bitstream Vera Sans Mono]"; 477 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
478
479 CFClient::add_font $_ for @fonts;
480 CFClient::set_font $fonts[0];
481}
347 482
348$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 483$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
349 484
350run_config_dialog 485run_config_dialog
351 login => sub { start_game }, 486 login => sub { start_game },

Diff Legend

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