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

Diff Legend

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