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

Diff Legend

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