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

Diff Legend

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