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

Diff Legend

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