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.154 by elmex, Thu Apr 20 16:29:40 2006 UTC vs.
Revision 1.176 by root, Mon Apr 24 10:19:40 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5
6BEGIN {
7 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9
10 while (my ($filename, $zip) = each %PAR::LibCache) {
11 for ($zip->memberNames) {
12 next unless /^\/root\/(.*)/;
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1";
15 }
16 }
17
18 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 }
24}
25
26# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP};
5 28
6use Time::HiRes 'time'; 29use Time::HiRes 'time';
7use Event; 30use Event;
8 31
9use Crossfire; 32use Crossfire;
12use Compress::LZF; 35use Compress::LZF;
13 36
14use CFClient; 37use CFClient;
15use CFClient::UI; 38use CFClient::UI;
16use CFClient::MapWidget; 39use CFClient::MapWidget;
40
41$SIG{__DIE__} = sub { CFClient::fatal "$_[0]"; exit 1 };
17 42
18our $VERSION = '0.1'; 43our $VERSION = '0.1';
19 44
20my $MAX_FPS = 60; 45my $MAX_FPS = 60;
21my $MIN_FPS = 5; # unused as of yet 46my $MIN_FPS = 5; # unused as of yet
36our @SDL_MODES; 61our @SDL_MODES;
37our $WIDTH; 62our $WIDTH;
38our $HEIGHT; 63our $HEIGHT;
39our $FULLSCREEN; 64our $FULLSCREEN;
40our $FONTSIZE; 65our $FONTSIZE;
66
67our $FONT_PROP;
68our $FONT_FIXED;
41 69
42our $MAP; 70our $MAP;
43our $MAPWIDGET; 71our $MAPWIDGET;
44our $BUTTONBAR; 72our $BUTTONBAR;
45our $LOGVIEW; 73our $LOGVIEW;
46our $CONSOLE; 74our $CONSOLE;
47our $METASERVER; 75our $METASERVER;
48 76
77our $FLOORBOX;
49our $GAUGES; 78our $GAUGES;
50our $STATWIDS; 79our $STATWIDS;
51 80
52our $SDL_ACTIVE; 81our $SDL_ACTIVE;
53our %SDL_CB; 82our %SDL_CB;
117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 146 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 147 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
119 }); 148 });
120 $mode_slider->emit (changed => $mode_slider->{range}[0]); 149 $mode_slider->emit (changed => $mode_slider->{range}[0]);
121 150
151 my $row = 1;
152
122 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 153 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
123 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 154 $table->add (1, $row++, new CFClient::UI::CheckBox
155 state => $CFG->{fullscreen},
156 tooltip => "Bring the client into fullscreen mode",
157 connect_changed => sub {
124 my ($self, $value) = @_; 158 my ($self, $value) = @_;
125 $CFG->{fullscreen} = $value; 159 $CFG->{fullscreen} = $value;
160 }
126 }); 161 );
127 162
128 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 163 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
129 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 164 $table->add (1, $row++, new CFClient::UI::CheckBox
165 state => $CFG->{fast},
166 tooltip => "Lower the visual quality considerably to speed up rendering.",
167 connect_changed => sub {
130 my ($self, $value) = @_; 168 my ($self, $value) = @_;
131 $CFG->{fast} = $value; 169 $CFG->{fast} = $value;
170 }
132 }); 171 );
133 172
173 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
174 $table->add (1, $row++, new CFClient::UI::Slider
175 range => [$CFG->{map_scale}, 0.25, 2, 0.05],
176 tooltip => "Enlarge or shrink the displayed map",
177 connect_changed => sub {
178 my ($self, $value) = @_;
179 $CFG->{map_scale} = 0.05 * int $value / 0.05;
180 }
181 );
182
134 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
135 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 184 $table->add (1, $row++, new CFClient::UI::CheckBox
185 state => $CFG->{fow_enable},
186 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
187 connect_changed => sub {
136 my ($self, $value) = @_; 188 my ($self, $value) = @_;
137 $CFG->{fow_enable} = $value; 189 $CFG->{fow_enable} = $value;
190 }
138 }); 191 );
139 192
140 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
141 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 194 $table->add (1, $row++, new CFClient::UI::Slider
195 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
196 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
197 connect_changed => sub {
142 my ($self, $value) = @_; 198 my ($self, $value) = @_;
143 $CFG->{fow_intensity} = $value; 199 $CFG->{fow_intensity} = $value;
200 }
144 }); 201 );
145 202
146 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
147 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 204 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fow_smooth},
206 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
207 connect_changed => sub {
148 my ($self, $value) = @_; 208 my ($self, $value) = @_;
149 $CFG->{fow_smooth} = $value; 209 $CFG->{fow_smooth} = $value;
150 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 210 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
211 }
151 }); 212 );
152 213
153 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 214 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 215 $table->add (1, $row++, new CFClient::UI::Slider
216 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
217 tooltip => "The font size used by most GUI elements",
218 connect_changed => sub {
155 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 219 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
156# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 220# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
221 }
157 }); 222 );
158 223
159 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 224 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
160 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 225 $table->add (1, $row++, new CFClient::UI::Slider
226 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
227 tooltip => "The font size used by the server log window only",
228 connect_changed => sub {
161 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 229 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
230 }
162 }); 231 );
163 232
164 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
234
235 $table->add (1, $row++, new CFClient::UI::Slider
236 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
237 tooltip => "The font size used by the statistics window only",
238 connect_changed => sub {
239 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
240 &set_stats_window_fontsize;
241 }
242 );
243
244 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
245 $table->add (1, $row++, new CFClient::UI::Slider
246 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
247 tooltip => "Adjust the size of the stats gauges at the bottom right",
248 connect_changed => sub {
249 $CFG->{gauge_size} = $_[1];
250 my $h = int $HEIGHT * $CFG->{gauge_size};
251 $GAUGES->{win}->set_size ($WIDTH, $h);
252 $GAUGES->{win}->move (0, $HEIGHT - $h);
253 }
254 );
255
256 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
257 $table->add (1, $row++, new CFClient::UI::Slider
258 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
259 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
260 connect_changed => sub {
261 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
262 &set_gauge_window_fontsize;
263 }
264 );
265
266 $table->add (1, $row++, new CFClient::UI::Button
267 expand => 1, align => 0, text => "Apply",
268 tooltip => "Apply the video settings",
269 connect_activate => sub {
165 video_shutdown (); 270 video_shutdown ();
166 video_init (); 271 video_init ();
272 }
167 }); 273 );
168 274
169 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 275 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
170 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { 276 $table->add (1, $row++, new CFClient::UI::CheckBox
277 state => $CFG->{audio_enable},
278 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
279 connect_changed => sub {
171 $CFG->{audio_enable} = $_[1]; 280 $CFG->{audio_enable} = $_[1];
281 }
172 }); 282 );
173# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 283# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
174# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 284# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
175# $CFG->{effects_volume} = $_[1]; 285# $CFG->{effects_volume} = $_[1];
176# }); 286# });
177 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
178 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 288 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
179 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { 289 $hbox->add (new CFClient::UI::CheckBox
290 expand => 1, state => $CFG->{bgm_enable},
291 tooltip => "Enable background music playing",
292 connect_changed => sub {
180 $CFG->{bgm_enable} = $_[1]; 293 $CFG->{bgm_enable} = $_[1];
294 }
181 }); 295 );
182 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 296 $hbox->add (new CFClient::UI::Slider
297 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
298 tooltip => "The volume of the background music",
299 connect_changed => sub {
183 $CFG->{bgm_volume} = $_[1]; 300 $CFG->{bgm_volume} = $_[1];
184 CFClient::MixMusic::volume $_[1] * 128; 301 CFClient::MixMusic::volume $_[1] * 128;
302 }
185 }); 303 );
186 304
187 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 305 $table->add (1, $row++, new CFClient::UI::Button
306 expand => 1, align => 0, text => "Apply",
307 tooltip => "Apply the audio settings",
308 connect_activate => sub {
188 audio_shutdown (); 309 audio_shutdown ();
189 audio_init (); 310 audio_init ();
311 }
190 }); 312 );
191 313
192 $dialog 314 $dialog
193} 315}
194 316
317sub set_stats_window_fontsize {
318 for (values %{$STATWIDS}) {
319 $_->set_fontsize ($::CFG->{stat_fontsize});
320 }
321}
322
323sub set_gauge_window_fontsize {
324 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
325 $_->set_fontsize ($::CFG->{gauge_fontsize});
326 }
327
328# local $GAUGES->{win}{parent};#d#
329# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
330}
331
332sub make_gauge_window {
333 my $gh = int ($HEIGHT * $CFG->{gauge_size});
334# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
335
336 my $win = new CFClient::UI::Frame (
337 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
338 );
339 $win->add (my $hbox = new CFClient::UI::HBox
340 children => [
341 (new CFClient::UI::HBox expand => 1),
342 ($FLOORBOX = new CFClient::UI::VBox),
343 (my $vbox = new CFClient::UI::VBox),
344 ],
345 );
346
347 $vbox->add (new CFClient::UI::HBox
348 expand => 1,
349 children => [
350 (new CFClient::UI::Empty expand => 1),
351 (my $hb = new CFClient::UI::HBox),
352 ],
353 );
354
355 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
356 tooltip => "Health points - depletes when you get wounded, refills when you heal or idle");
357 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
358 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle");
359 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
360 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray");
361 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
362 tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food");
363
364 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
365 tooltip => "Experience points and level - increases when you kill monsters or successfully use skills");
366 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
367 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
368
369 $GAUGES = {
370 exp => $exp, win => $win, range => $rng,
371 food => $fg, mana => $mg, hp => $hg, grace => $gg
372 };
373
374 &set_gauge_window_fontsize;
375
376 $win
377}
378
195sub make_stats_window { 379sub make_stats_window {
196 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/3, y => 0, title => "Stats"); 380 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
381
197 $tgw->add (my $vb = new CFClient::UI::VBox ()); 382 $tgw->add (my $vb = new CFClient::UI::VBox);
383 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
198 $vb->add ($STATWIDS->{stat} = new CFClient::UI::Label valign => 0, align => -1); 384 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
385
199 $vb->add (my $hb2 = new CFClient::UI::HBox); 386 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
387
200 $hb2->add (my $hg = new CFClient::UI::Gauge (type => 'hp')); 388 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
201 $hb2->add (my $mg = new CFClient::UI::Gauge (type => 'mana')); 389
202 $hb2->add (my $gg = new CFClient::UI::Gauge (type => 'grace')); 390 my $black = [0, 0, 0];
203 $hb2->add (my $fg = new CFClient::UI::Gauge (type => 'food')); 391
204 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg }; 392 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
393 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
394 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
395 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
396 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
397 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
398 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
399
400 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str");
401 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex");
402 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con");
403 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int");
404 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis");
405 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow");
406 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha");
407
408 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
409 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
410 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
411 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
412 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
413 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
414
415 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
416 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
417 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
418 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
419 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
420 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
421
422 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
423
424 my $row = 0;
425 my $col = 0;
426
427 my %resist_names = (
428 slow => "Slow",
429 holyw => "Holy Word",
430 conf => "Confusion",
431 fire => "Fire",
432 depl => "Depletion",
433 magic => "Magic",
434 drain => "Draining",
435 acid => "Acid",
436 pois => "Poison",
437 para => "Paralysation",
438 deat => "Death",
439 phys => "Physical",
440 blind => "Blind",
441 fear => "Fear",
442 tund => "Turn undead",
443 elec => "Electricity",
444 cold => "Cold",
445 ghit => "Ghost hit",
446 );
447 for (qw/slow holyw conf fire depl magic
448 drain acid pois para deat phys
449 blind fear tund elec cold ghit/)
450 {
451 $tbl2->add ($col, $row,
452 $STATWIDS->{"res_$_"} =
453 new CFClient::UI::Label
454 template => "-100%",
455 align => +1,
456 valign => 0,
457 tooltip => $resist_names{$_}
458 );
459 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
460 can_hover => 1,
461 can_events => 1,
462 image => "ui/resist/resist_$_.png",
463 tooltip => $resist_names{$_}
464 );
465
466 $row++;
467 if ($row % 6 == 0) {
468 $col += 2;
469 $row = 0;
470 }
471 }
472
473 &set_stats_window_fontsize;
474 update_stats_window ({});
475
205 $tgw 476 $tgw
477}
478
479sub formsep {
480 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
206} 481}
207 482
208sub update_stats_window { 483sub update_stats_window {
209 my ($stats) = @_; 484 my ($stats) = @_;
210 485
211 $STATWIDS->{stat}->set_text ( 486 # i love text protocols!!!
212 "Title: $stats->{21}\nExp.: " . ($stats->{11} || $stats->{28}) 487 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
213 . " Level: $stats->{12}\n" 488 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
214 . (sprintf "S%d D%d Co%d I%d W%d P%d Ch%2d, Wc%d Ac%d\n", 489 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
215 @$stats{5,8,9,6,7,22,10, 13, 14}) 490 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
216 . (sprintf "Dam %d Arm %d Speed %.2f/%.2f", 491 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
217 @$stats{15,16,17,19}) 492 my $fo_m = 999;
493 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
494 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
495
496 $GAUGES->{hp} ->set_value ($hp, $hp_m);
497 $GAUGES->{mana} ->set_value ($sp, $sp_m);
498 $GAUGES->{food} ->set_value ($fo, $fo_m);
499 $GAUGES->{grace} ->set_value ($gr, $gr_m);
500 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
501 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
502 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
503 $rng =~ s/^Range: //; # thank you so much dear server
504 $GAUGES->{range} ->set_text ("Rng: " . $rng);
505 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
506 $title =~ s/^Player: //;
507 $STATWIDS->{title} ->set_text ("Title: " . $title);
508
509 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
510 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
511 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
512 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
513 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
514 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
515 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
516 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
517 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
518 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
519 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
520 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
521 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
522
523 my %tbl = (
524 phys => 100,
525 magic => 101,
526 fire => 102,
527 elec => 103,
528 cold => 104,
529 conf => 105,
530 acid => 106,
531 drain => 107,
532 ghit => 108,
533 pois => 109,
534 slow => 110,
535 para => 111,
536 tund => 112,
537 fear => 113,
538 depl => 113,
539 deat => 115,
540 holyw => 116,
541 blind => 117
218 ); 542 );
543
544 for (keys %tbl) {
545 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
546 }
547
219} 548}
220 549
221sub metaserver_dialog { 550sub metaserver_dialog {
222 my $dialog = new CFClient::UI::FancyFrame 551 my $dialog = new CFClient::UI::FancyFrame
223 title => "Metaserver", 552 title => "Metaserver",
303 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 632 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
304 633
305 { 634 {
306 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 635 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
307 636
308 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { 637 $vbox->add (
638 my $HOST = new CFClient::UI::Entry
639 expand => 1,
640 text => $CFG->{host},
641 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
642 connect_changed => sub {
643 my ($self, $value) = @_;
644 $CFG->{host} = $value;
645 }
646 );
647
648 $METASERVER = metaserver_dialog;
649
650 $vbox->add (new CFClient::UI::Flopper
651 expand => 1,
652 text => "Metaserver",
653 other => $METASERVER,
654 tooltip => "Show a list of avaible crossfire servers",
655 connect_open => sub {
656 update_metaserver $HOST;
657 }
658 );
659 }
660
661 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
662 $table->add (1, 4, new CFClient::UI::Entry
663 text => $CFG->{user},
664 tooltip => "The name of your character on the server",
665 connect_changed => sub {
309 my ($self, $value) = @_; 666 my ($self, $value) = @_;
310 $CFG->{host} = $value;
311 });
312
313 $METASERVER = metaserver_dialog;
314
315 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
316 update_metaserver $HOST;
317 });
318 }
319
320 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
321 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
322 my ($self, $value) = @_;
323 $CFG->{user} = $value; 667 $CFG->{user} = $value;
668 }
324 }); 669 );
325 670
326 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 671 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
327 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 672 $table->add (1, 5, new CFClient::UI::Entry
673 text => $CFG->{password},
674 hidden => 1,
675 tooltip => "The password for your character",
676 connect_changed => sub {
328 my ($self, $value) = @_; 677 my ($self, $value) = @_;
329 $CFG->{password} = $value; 678 $CFG->{password} = $value;
679 }
330 }); 680 );
331 681
332 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd"); 682 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
333 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 683 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
684 text => $CFG->{say_command},
685 tooltip => "This is the command that will be used if you write a line in the message window entry. "
686 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
687 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.",
688 connect_changed => sub {
334 my ($self, $value) = @_; 689 my ($self, $value) = @_;
335 $CFG->{say_command} = $value; 690 $CFG->{say_command} = $value;
691 }
336 }); 692 );
337 693
338 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 694 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
339 $table->add (1, 7, new CFClient::UI::Slider 695 $table->add (1, 7, new CFClient::UI::Slider
340 req_w => 100, 696 req_w => 100,
341 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 697 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
698 tooltip => "This is the size of the portion of the map update the server sends you. "
699 ."If you set this to a high value you will be able to see further for example.",
342 connect_changed => sub { 700 connect_changed => sub {
343 my ($self, $value) = @_; 701 my ($self, $value) = @_;
344 702
345 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 703 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
346 }, 704 },
362 user_h => int $::HEIGHT / 5, 720 user_h => int $::HEIGHT / 5,
363 child => (my $vbox = new CFClient::UI::VBox); 721 child => (my $vbox = new CFClient::UI::VBox);
364 722
365 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 723 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
366 expand => 1, 724 expand => 1,
725 font => $FONT_FIXED,
367 fontsize => $::CFG->{log_fontsize}, 726 fontsize => $::CFG->{log_fontsize},
368 ); 727 );
369 728
370 $vbox->add (my $input = new CFClient::UI::Entry 729 $vbox->add (my $input = new CFClient::UI::Entry
371 connect_focus_in => sub { 730 connect_focus_in => sub {
465 824
466 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 825 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
467 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 826 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
468 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 827 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
469 828
829 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
830 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
831
470 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 832 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
471 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 833 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
472 status "Configuration Saved"; 834 status "Configuration Saved";
473 }); 835 });
474 836
475 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 837 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
476
477
478 $CFClient::UI::ROOT->add (make_stats_window);
479} 838}
480 839
481sub video_shutdown { 840sub video_shutdown {
482 $CFClient::UI::ROOT->{children} = []; 841 $CFClient::UI::ROOT->{children} = [];
483 undef $SDL_ACTIVE; 842 undef $SDL_ACTIVE;
589@conn::ISA = Crossfire::Protocol::; 948@conn::ISA = Crossfire::Protocol::;
590 949
591sub conn::stats_update { 950sub conn::stats_update {
592 my ($self, $stats) = @_; 951 my ($self, $stats) = @_;
593 952
594 # i love text protocols!!!
595 # FIXME: the stats are somehow weird
596 my $hp = $stats->{1};
597 my $hp_m = $stats->{2};
598 my $sp = $stats->{3};
599 my $sp_m = $stats->{4};
600 my $fo = $stats->{18};
601 my $fo_m = 999;
602 my $gr = $stats->{23};
603 my $gr_m = $stats->{24};
604
605 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
606 $GAUGES->{hp} ->set_value ($hp, $hp_m);
607 $GAUGES->{mana} ->set_value ($sp, $sp_m);
608 $GAUGES->{food} ->set_value ($fo, $fo_m);
609 $GAUGES->{grace}->set_value ($gr, $gr_m);
610
611 update_stats_window ($stats); 953 update_stats_window ($stats);
612} 954}
613 955
614sub conn::user_send { 956sub conn::user_send {
615 my ($self, $command) = @_; 957 my ($self, $command) = @_;
746 1088
747 $x += $ox; 1089 $x += $ox;
748 $y += $oy; 1090 $y += $oy;
749 1091
750 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1092 $self->{map_info} = [$hash, $x, $y, $w, $h];
1093
1094 my $map = $self->{map_info}[0];
1095 $map =~ s/^.*?\/([^\/]+)$/\1/;
1096 $STATWIDS->{map}->set_text ("Map: " . $map);
751 1097
752 $self->load_map ($hash, $x, $y); 1098 $self->load_map ($hash, $x, $y);
753} 1099}
754 1100
755sub conn::face_find { 1101sub conn::face_find {
781 } 1127 }
782 1128
783gotid: 1129gotid:
784 $face->{id} = $id; 1130 $face->{id} = $id;
785 $MAP->set_face ($facenum => $id); 1131 $MAP->set_face ($facenum => $id);
1132 $self->{faceid}[$facenum] = $id;#d#
786 $TILECACHE->get ($id) 1133 $TILECACHE->get ($id)
787} 1134}
788 1135
789sub conn::face_update { 1136sub conn::face_update {
790 my ($self, $facenum, $face) = @_; 1137 my ($self, $facenum, $face) = @_;
798 my ($self, $id, $data) = @_; 1145 my ($self, $id, $data) = @_;
799 1146
800 $self->{texture}[$id] ||= do { 1147 $self->{texture}[$id] ||= do {
801 my $tex = 1148 my $tex =
802 new_from_image CFClient::Texture 1149 new_from_image CFClient::Texture
803 $data, minify => 1; 1150 $data, minify => 1, mipmap => 1;
804 1151
805 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1152 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
806 $MAPWIDGET->update; 1153 $MAPWIDGET->update;
807 1154
808 $tex 1155 $tex
820 1167
821 $chunk->play; 1168 $chunk->play;
822# warn "sound $x,$y,$soundnum,$type\n";#d# 1169# warn "sound $x,$y,$soundnum,$type\n";#d#
823} 1170}
824 1171
1172my $LAST_QUERY; # server is stupid, stupid, stupid
1173
825sub conn::query { 1174sub conn::query {
826 my ($self, $flags, $prompt) = @_; 1175 my ($self, $flags, $prompt) = @_;
827 1176
828 #TODO, display dialog with relevant information 1177 $prompt = $LAST_QUERY unless length $prompt;
829 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1178 $LAST_QUERY = $prompt;
1179
1180 my $dialog = new CFClient::UI::FancyFrame
1181 title => "Query",
1182 child => my $vbox = new CFClient::UI::VBox;
1183
1184 $vbox->add (new CFClient::UI::Label
1185 max_w => $::WIDTH * 0.4,
1186 text => $prompt);
1187
1188 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1189 $vbox->add (my $hbox = new CFClient::HBox);
1190 $hbox->add (new CFClient::Button
1191 text => "No",
1192 connect_activate => sub {
1193 $self->send ("reply n");
1194 $dialog->destroy;
1195 $MAPWIDGET->focus_in;
1196 }
1197 );
1198 $hbox->add (new CFClient::Button
1199 text => "Yes",
1200 connect_activate => sub {
1201 $self->send ("reply y");
1202 $dialog->destroy;
1203 $MAPWIDGET->focus_in;
1204 },
1205 );
1206
1207 $dialog->focus_in;
1208
1209 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1210 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1211 $vbox->add (my $entry = new CFClient::UI::Entry
1212 connect_changed => sub {
1213 $self->send ("reply $_[1]");
1214 $dialog->destroy;
1215 $MAPWIDGET->focus_in;
1216 },
1217 );
1218
1219 $entry->focus_in;
1220
1221 } else {
1222 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1223
1224 $vbox->add (my $entry = new CFClient::UI::Entry
1225 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1226 connect_activate => sub {
1227 $self->send ("reply $_[1]");
1228 $dialog->destroy;
1229 $MAPWIDGET->focus_in;
1230 },
1231 );
1232
1233 $entry->focus_in;
1234 }
1235
1236 $dialog->show;
830} 1237}
831 1238
832sub conn::drawinfo { 1239sub conn::drawinfo {
833 my ($self, $color, $text) = @_; 1240 my ($self, $color, $text) = @_;
834 1241
852} 1259}
853 1260
854sub conn::spell_add { 1261sub conn::spell_add {
855 my ($self, $spell) = @_; 1262 my ($self, $spell) = @_;
856 1263
1264 # TODO
1265 # create a widget dynamically, using spell face (CF::Protocol downloads them)
857 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub { 1266 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
858 });
859 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub { 1267 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
860 });
861} 1268}
862 1269
863sub conn::spell_delete { 1270sub conn::spell_delete {
864 my ($self, $spell) = @_; 1271 my ($self, $spell) = @_;
865} 1272}
866 1273
867sub conn::addme_success { 1274sub conn::addme_success {
868 my ($self) = @_; 1275 my ($self) = @_;
869 1276
870 for my $skill (values %{$self->{skill_info}}) { 1277 for my $skill (values %{$self->{skill_info}}) {
871 $MAPWIDGET->add_command ("ready_skill $skill", "", sub { 1278 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
872 }); 1279 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
873 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
874 });
875 } 1280 }
1281}
1282
1283sub update_floorbox {
1284 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1285 $FLOORBOX->clear;
1286 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1287
1288 my @items = values %{ $CONN->{container}{0} };
1289
1290 # we basically have to use the same sorting as everybody else
1291 @items = sort { $a->{type} <=> $b->{type} } @items;
1292
1293 for my $item (reverse @items) {
1294 my $desc = $item->{nrof} < 2
1295 ? $item->{name}
1296 : "$item->{nrof} $item->{name_pl}";
1297 # todo: animation widget, face widget, weight(?) etc.
1298 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1299 tooltip => (CFClient::UI::Label->escape ($desc)
1300 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1301 can_hover => 1,
1302 can_events => 1,
1303 connect_button_down => sub {
1304 my ($self, $ev, $x, $y) = @_;
1305
1306 # todo: maybe put examine on 1? but should just be a tooltip :(
1307 if ($ev->{button} == 1) {
1308 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1309 } elsif ($ev->{button} == 2) {
1310 $CONN->send ("apply $item->{tag}");
1311 } elsif ($ev->{button} == 3) {
1312 # examine, lock, mark, maybe other things
1313 warn "MENU not implemented yet\n";
1314 }
1315
1316 1
1317 },
1318 );
1319
1320 $hbox->add (new CFClient::UI::Face
1321 can_events => 0,
1322 face => $item->{face},
1323 anim => $item->{anim},
1324 animspeed => $item->{animspeed},
1325 );
1326
1327 $hbox->add (new CFClient::UI::Label
1328 can_events => 0,
1329 text => $desc,
1330 );
1331 }
1332 });
1333 refresh;
1334}
1335
1336sub conn::container_add {
1337 my ($self, $id, $items) = @_;
1338
1339 update_floorbox if $id == 0;
1340 # $self-<{player}{tag} => player inv
1341 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1342}
1343
1344sub conn::container_clear {
1345 my ($self, $id) = @_;
1346
1347 update_floorbox if $id == 0;
1348# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1349}
1350
1351sub conn::item_delete {
1352 my ($self, @items) = @_;
1353
1354 for (@items) {
1355 update_floorbox if $_->{container} == 0;
1356 }
1357}
1358
1359sub conn::item_update {
1360 my ($self, $item) = @_;
1361
1362 update_floorbox if $item->{container} == 0;
876} 1363}
877 1364
878%SDL_CB = ( 1365%SDL_CB = (
879 CFClient::SDL_QUIT => sub { 1366 CFClient::SDL_QUIT => sub {
880 Event::unloop -1; 1367 Event::unloop -1;
915 sdl_mode => 0, 1402 sdl_mode => 0,
916 width => 640, 1403 width => 640,
917 height => 480, 1404 height => 480,
918 fullscreen => 0, 1405 fullscreen => 0,
919 fast => 0, 1406 fast => 0,
1407 map_scale => 0.5,
920 fow_enable => 1, 1408 fow_enable => 1,
921 fow_intensity => 0.45, 1409 fow_intensity => 0.45,
922 fow_smooth => 0, 1410 fow_smooth => 0,
923 gui_fontsize => 1, 1411 gui_fontsize => 1,
924 log_fontsize => 14, 1412 log_fontsize => 1,
1413 gauge_fontsize => 1,
1414 gauge_size => 0.35,
1415 stat_fontsize => 1,
925 mapsize => 100, 1416 mapsize => 100,
926 host => "crossfire.schmorp.de", 1417 host => "crossfire.schmorp.de",
927 say_command => 'say', 1418 say_command => 'say',
928 audio_enable => 1, 1419 audio_enable => 1,
929 bgm_enable => 1, 1420 bgm_enable => 1,
943@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1434@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
944 1435
945$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1436$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
946 1437
947{ 1438{
948 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1439 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1440 DejaVuSans.ttf
1441 DejaVuSansMono.ttf
1442 DejaVuSans-Bold.ttf
1443 DejaVuSansMono-Bold.ttf
1444 DejaVuSans-Oblique.ttf
1445 DejaVuSansMono-Oblique.ttf
1446 DejaVuSans-BoldOblique.ttf
1447 DejaVuSansMono-BoldOblique.ttf
1448 );
949 1449
950 CFClient::add_font $_ for @fonts; 1450 CFClient::add_font $_ for @fonts;
951 CFClient::set_font $fonts[0]; 1451
1452 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1453 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1454
1455 $FONT_PROP->make_default;
952} 1456}
953 1457
954video_init; 1458video_init;
955audio_init; 1459audio_init;
956 1460

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines