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.113 by root, Sat Apr 15 19:35:22 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 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};
28
6use Time::HiRes 'time'; 29use Time::HiRes 'time';
7use Event; 30use Event;
8 31
9use SDL;
10use SDL::App;
11use SDL::Event;
12use SDL::Surface;
13use SDL::OpenGL;
14
15use Crossfire; 32use Crossfire;
16use Crossfire::Protocol; 33use Crossfire::Protocol;
17 34
35use Compress::LZF;
36
18use CFClient; 37use CFClient;
19use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget;
40
41$SIG{__DIE__} = sub { CFClient::fatal "$_[0]"; exit 1 };
20 42
21our $VERSION = '0.1'; 43our $VERSION = '0.1';
22 44
23my $MAX_FPS = 60; 45my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused as of yet 46my $MIN_FPS = 5; # unused as of yet
25 47
26our $META_SERVER = "crossfire.real-time.com:13326"; 48our $META_SERVER = "crossfire.real-time.com:13326";
27 49
50our $FACEMAP;
51our $TILECACHE;
28our $FACECACHE; 52our $MAPCACHE;
29 53
30our $LAST_REFRESH; 54our $LAST_REFRESH;
31our $NOW; 55our $NOW;
32 56
33our $CFG; 57our $CFG;
… …
37our @SDL_MODES; 61our @SDL_MODES;
38our $WIDTH; 62our $WIDTH;
39our $HEIGHT; 63our $HEIGHT;
40our $FULLSCREEN; 64our $FULLSCREEN;
41our $FONTSIZE; 65our $FONTSIZE;
66
67our $FONT_PROP;
68our $FONT_FIXED;
42 69
43our $MAP; 70our $MAP;
44our $MAPWIDGET; 71our $MAPWIDGET;
45our $BUTTONBAR; 72our $BUTTONBAR;
46our $LOGVIEW; 73our $LOGVIEW;
47our $CONSOLE; 74our $CONSOLE;
48our $METASERVER; 75our $METASERVER;
49 76
77our $FLOORBOX;
78our $GAUGES;
79our $STATWIDS;
80
50our $SDL_ACTIVE; 81our $SDL_ACTIVE;
51our $SDL_EV;
52our %SDL_CB; 82our %SDL_CB;
83
84our $SDL_MIXER;
85our @SOUNDS; # event => file mapping
86our %AUDIO_CHUNKS; # audio files
53 87
54our $ALT_ENTER_MESSAGE; 88our $ALT_ENTER_MESSAGE;
55our $STATUS_LINE; 89our $STATUS_LINE;
56our $DEBUG_STATUS; 90our $DEBUG_STATUS;
57 91
58sub status { 92sub status {
59 $STATUS_LINE->set_text ($_[0]); 93 $STATUS_LINE->set_text ($_[0]);
60 my ($w, $h) = $STATUS_LINE->size_request;
61 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 94 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
62} 95}
63 96
64sub debug { 97sub debug {
65 $DEBUG_STATUS->set_text ($_[0]); 98 $DEBUG_STATUS->set_text ($_[0]);
66 my ($w, $h) = $DEBUG_STATUS->size_request; 99 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
67 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
68} 100}
69 101
70sub start_game { 102sub start_game {
71 status "logging in..."; 103 status "logging in...";
72 104
73 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 105 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
106
107 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
74 108
75 $MAP = new CFClient::Map $mapsize, $mapsize; 109 $MAP = new CFClient::Map $mapsize, $mapsize;
76 110
77 my ($host, $port) = split /:/, $CFG->{host}; 111 my ($host, $port) = split /:/, $CFG->{host};
78 112
… …
94 undef $CONN; 128 undef $CONN;
95} 129}
96 130
97sub client_setup { 131sub client_setup {
98 my $dialog = new CFClient::UI::FancyFrame 132 my $dialog = new CFClient::UI::FancyFrame
133 title => "Client Setup",
99 child => (my $vbox = new CFClient::UI::VBox); 134 child => (my $vbox = new CFClient::UI::VBox);
100 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
101 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 135 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
102 136
103 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 137 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
104 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 138 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
105 139
106 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 140 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
107 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 141 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
108 142
109 $mode_slider->connect (changed => sub { 143 $mode_slider->connect (changed => sub {
110 my ($self, $value) = @_; 144 my ($self, $value) = @_;
111 145
112 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 146 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
113 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 147 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
114 }); 148 });
115 $mode_slider->emit (changed => $mode_slider->{range}[0]); 149 $mode_slider->emit (changed => $mode_slider->{range}[0]);
116 150
151 my $row = 1;
152
117 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 153 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
118 $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 {
119 my ($self, $value) = @_; 158 my ($self, $value) = @_;
120 $CFG->{fullscreen} = $value; 159 $CFG->{fullscreen} = $value;
160 }
121 }); 161 );
122 162
123 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 163 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
124 $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 {
125 my ($self, $value) = @_; 168 my ($self, $value) = @_;
126 $CFG->{fast} = $value; 169 $CFG->{fast} = $value;
170 }
127 }); 171 );
128 172
129 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 173 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
130 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 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 {
131 my ($self, $value) = @_; 178 my ($self, $value) = @_;
179 $CFG->{map_scale} = 0.05 * int $value / 0.05;
180 }
181 );
182
183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
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 {
188 my ($self, $value) = @_;
132 $CFG->{fow_enable} = $value; 189 $CFG->{fow_enable} = $value;
190 }
133 }); 191 );
134 192
135 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
136 $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 {
137 my ($self, $value) = @_; 198 my ($self, $value) = @_;
138 $CFG->{fow_intensity} = $value; 199 $CFG->{fow_intensity} = $value;
200 }
139 }); 201 );
140 202
141 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
142 $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 {
143 my ($self, $value) = @_; 208 my ($self, $value) = @_;
144 $CFG->{fow_smooth} = $value; 209 $CFG->{fow_smooth} = $value;
210 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
211 }
212 );
213
214 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
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 {
219 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
220# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
221 }
222 );
223
224 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
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 {
229 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
230 }
231 );
232
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 {
270 video_shutdown ();
271 video_init ();
272 }
273 );
274
275 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
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 {
280 $CFG->{audio_enable} = $_[1];
281 }
282 );
283# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
284# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
285# $CFG->{effects_volume} = $_[1];
145 }); 286# });
146
147 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
148 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 288 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
149 my ($self, $value) = @_; 289 $hbox->add (new CFClient::UI::CheckBox
150 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 290 expand => 1, state => $CFG->{bgm_enable},
291 tooltip => "Enable background music playing",
292 connect_changed => sub {
293 $CFG->{bgm_enable} = $_[1];
294 }
151 }); 295 );
152 296 $hbox->add (new CFClient::UI::Slider
153 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 297 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
154 destroy_screen (); 298 tooltip => "The volume of the background music",
155 init_screen (); 299 connect_changed => sub {
300 $CFG->{bgm_volume} = $_[1];
301 CFClient::MixMusic::volume $_[1] * 128;
302 }
156 }); 303 );
304
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 {
309 audio_shutdown ();
310 audio_init ();
311 }
312 );
157 313
158 $dialog 314 $dialog
315}
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
379sub make_stats_window {
380 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
381
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);
384 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
385
386 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
387
388 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
389
390 my $black = [0, 0, 0];
391
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
476 $tgw
477}
478
479sub formsep {
480 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
481}
482
483sub update_stats_window {
484 my ($stats) = @_;
485
486 # i love text protocols!!!
487 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
488 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
489 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
490 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
491 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
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
542 );
543
544 for (keys %tbl) {
545 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
546 }
547
159} 548}
160 549
161sub metaserver_dialog { 550sub metaserver_dialog {
162 my $dialog = new CFClient::UI::FancyFrame 551 my $dialog = new CFClient::UI::FancyFrame
552 title => "Metaserver",
163 child => (my $vbox = new CFClient::UI::VBox); 553 child => (my $vbox = new CFClient::UI::VBox);
164 554
165 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 555 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
166 556
167 $dialog 557 $dialog
168} 558}
169 559
170sub update_metaserver { 560sub update_metaserver {
561 my ($HOST) = @_;
562
171 status "fetching metaserver list..."; 563 status "fetching metaserver list...";
172 564
173 my $buf; 565 my $buf;
174 566
175 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 567 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
… …
186 578
187 my $table = $METASERVER->{table}; 579 my $table = $METASERVER->{table};
188 580
189 $table->clear; 581 $table->clear;
190 582
191 my @col = qw(#Users Host Uptime Version Description); 583 my @col = qw(Use #Users Host Uptime Version Description);
192 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 584 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
193 for 0 .. $#col; 585 for 0 .. $#col;
194 586
195 my @align = qw(1 0 1 1 -1); 587 my @align = qw(1 0 1 1 -1);
196 588
197 my $y = 0; 589 my $y = 0;
198 for my $m (map [split /\|/], split /\015?\012/, $buf) { 590 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
199 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 591 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
200 592
201 for ($desc) { 593 for ($desc) {
202 s/<br>/\n/gi; 594 s/<br>/\n/gi;
203 s/<li>/\n· /gi; 595 s/<li>/\n· /gi;
… …
214 $m->[8] % 60; 606 $m->[8] % 60;
215 607
216 $m = [$users, $host, $uptime, $version, $desc]; 608 $m = [$users, $host, $uptime, $version, $desc];
217 609
218 $y++; 610 $y++;
611
612 $table->add (0, $y, new CFClient::UI::VBox children => [
613 (new CFClient::UI::Button text => " ", connect_activate => sub {
614 $HOST->set_text ($CFG->{host} = $host);
615 }),
616 (new CFClient::UI::Empty expand => 1),
617 ]);
618
219 $table->add ($_, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 619 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
220 for 0 .. $#$m; 620 for 0 .. $#$m;
221 } 621 }
222 } 622 }
223 }); 623 });
224} 624}
225 625
226sub server_setup { 626sub server_setup {
227 my $dialog = new CFClient::UI::FancyFrame 627 my $dialog = new CFClient::UI::FancyFrame
628 title => "Server Setup",
228 child => (my $vbox = new CFClient::UI::VBox); 629 child => (my $vbox = new CFClient::UI::VBox);
229 630
230 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
231 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 631 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
232 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 632 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
233 633
234 { 634 {
235 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 635 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
236 636
237 $vbox->add (new CFClient::UI::Entry 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 {
238 my ($self, $value) = @_; 666 my ($self, $value) = @_;
239 $CFG->{host} = $value; 667 $CFG->{user} = $value;
240 }); 668 }
669 );
241 670
242 $METASERVER = metaserver_dialog;
243
244 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
245 update_metaserver;
246 });
247 }
248
249 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 671 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
250 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, 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 {
251 my ($self, $value) = @_; 677 my ($self, $value) = @_;
252 $CFG->{user} = $value;
253 });
254
255 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
256 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
257 my ($self, $value) = @_;
258 $CFG->{password} = $value; 678 $CFG->{password} = $value;
679 }
259 }); 680 );
260 681
261 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 682 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
262 $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 {
263 my ($self, $value) = @_; 689 my ($self, $value) = @_;
264 $CFG->{say_command} = $value; 690 $CFG->{say_command} = $value;
691 }
265 }); 692 );
266 693
267 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 694 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
268 $table->add (1, 7, new CFClient::UI::Slider 695 $table->add (1, 7, new CFClient::UI::Slider
269 req_w => 100, 696 req_w => 100,
270 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.",
271 connect_changed => sub { 700 connect_changed => sub {
272 my ($self, $value) = @_; 701 my ($self, $value) = @_;
273 702
274 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 703 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
275 }, 704 },
… …
282 $dialog 711 $dialog
283} 712}
284 713
285sub message_window { 714sub message_window {
286 my $window = new CFClient::UI::FancyFrame 715 my $window = new CFClient::UI::FancyFrame
716 title => "Messages",
287 border_bg => [1, 1, 1, 0.5], 717 border_bg => [1, 1, 1, 0.5],
288 bg => [0.3, 0.3, 0.3, 0.8], 718 bg => [0.3, 0.3, 0.3, 0.8],
289 user_w => $::WIDTH/4, 719 user_w => int $::WIDTH / 3,
290 user_h => $::HEIGHT, 720 user_h => int $::HEIGHT / 5,
291 child => (my $vbox = new CFClient::UI::VBox); 721 child => (my $vbox = new CFClient::UI::VBox);
292 722
293 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 723 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
294 expand => 1, 724 expand => 1,
725 font => $FONT_FIXED,
295 fontsize => $::CFG->{log_fontsize}, 726 fontsize => $::CFG->{log_fontsize},
296 ); 727 );
297 728
298 $vbox->add (my $input = new CFClient::UI::LineEntry); 729 $vbox->add (my $input = new CFClient::UI::Entry
730 connect_focus_in => sub {
731 my ($input, $prev_focus) = @_;
732
733 delete $input->{refocus_map};
734
735 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
736 $input->{refocus_map} = 1;
737 }
738 delete $input->{auto_activated};
739 },
299 $input->connect (activate => sub { 740 connect_activate => sub {
300 my ($input, $text) = @_; 741 my ($input, $text) = @_;
301 $input->set_text (''); 742 $input->set_text ('');
302 743
303 if ($text =~ /^\/(.*)/) { 744 if ($text =~ /^\/(.*)/) {
304 $::CONN->user_send ("command $1"); 745 $::CONN->user_send ($1);
305 } else { 746 } else {
306 my $say_cmd = $::CFG->{say_command} || 'say'; 747 my $say_cmd = $::CFG->{say_command} || 'say';
307 $::CONN->user_send ("command $say_cmd $text"); 748 $::CONN->user_send ("$say_cmd $text");
308 } 749 }
750 if ($input->{refocus_map}) {
751 delete $input->{refocus_map};
752 $MAPWIDGET->focus_in
309 1 753 }
310 }); 754 },
311 $input->connect (escape => sub { 755 connect_escape => sub {
312 $MAPWIDGET->focus_in 756 $MAPWIDGET->focus_in
313 }); 757 },
314 $input->focus_in; 758 );
315 759
316 $CONSOLE = { 760 $CONSOLE = {
317 window => $window, 761 window => $window,
318 input => $input 762 input => $input
319 }; 763 };
320 764
321 $window 765 $window
322} 766}
323 767
324sub sdl_init { 768sub sdl_init {
325 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 769 CFClient::SDL_Init
326 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
327 and die "SDL::Init failed!\n"; 770 and die "SDL::Init failed!\n";
328} 771}
329 772
330sub init_screen { 773sub video_init {
331 sdl_init; 774 sdl_init;
332 775
333 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 776 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
334 $FULLSCREEN = $CFG->{fullscreen}; 777 $FULLSCREEN = $CFG->{fullscreen};
335 $FAST = $CFG->{fast}; 778 $FAST = $CFG->{fast};
336 779
337 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 780 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
338 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
339 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
340 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
341
342 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
343 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
344 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
345 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
346
347 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
348 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
349 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
350
351 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
352 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
353 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
354 or die "SDL::SetVideoMode failed!\n"; 781 or die "SDL_SetVideoMode failed!\n";
355
356 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
357
358 $SDL_EV = new SDL::Event;
359 $SDL_EV->set_unicode (1);
360 782
361 $SDL_ACTIVE = 1; 783 $SDL_ACTIVE = 1;
362 784
363 $LAST_REFRESH = time - 0.01; 785 $LAST_REFRESH = time - 0.01;
364 786
365 CFClient::gl_init; 787 CFClient::gl_init;
366 788
367 $FONTSIZE = int $HEIGHT / 40; 789 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
368 790
369 ############################################################################# 791 #############################################################################
370 792
371 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 793 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
372 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 794 $DEBUG_STATUS->show;
373 795
374 $STATUS_LINE = new CFClient::UI::Label 796 $STATUS_LINE = new CFClient::UI::Label
375 padding => 0, 797 padding => 0,
376 y => $HEIGHT * 44 / 45 - $FONTSIZE; 798 y => $HEIGHT - $FONTSIZE * 1.8;
377 $CFClient::UI::ROOT->add ($STATUS_LINE); 799 $STATUS_LINE->show;
378 800
379 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 801 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
380 padding => 0, 802 padding => 0,
381 y => $HEIGHT * 44 / 45, 803 fontsize => 0.8,
382 height => $HEIGHT / 45,
383 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 804 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
384 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 805 $ALT_ENTER_MESSAGE->show;
806 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
385 807
386 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 808 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
387 $MAPWIDGET->focus_in; 809 $MAPWIDGET->focus_in;
388 $MAPWIDGET->connect (activate_console => sub { 810 $MAPWIDGET->connect (activate_console => sub {
389 my ($mapwidget, $preset) = @_; 811 my ($mapwidget, $preset) = @_;
390 812
391 if ($CONSOLE) { 813 if ($CONSOLE) {
814 $CONSOLE->{input}->{auto_activated} = 1;
392 $CONSOLE->{input}->focus_in; 815 $CONSOLE->{input}->focus_in;
393 816
394 if ($preset && $CONSOLE->{input}->get_text eq '') { 817 if ($preset && $CONSOLE->{input}->get_text eq '') {
395 $CONSOLE->{input}->set_text ($preset); 818 $CONSOLE->{input}->set_text ($preset);
396 } 819 }
… …
400 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 823 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
401 824
402 $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);
403 $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);
404 $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);
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);
405 831
406 $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 {
407 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 833 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
408 status "Configuration Saved"; 834 status "Configuration Saved";
409 }); 835 });
410 836
411 $BUTTONBAR->{children}[0]->emit ("activate"); 837 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
412} 838}
413 839
414sub destroy_screen { 840sub video_shutdown {
415 $CFClient::UI::ROOT->{children} = []; 841 $CFClient::UI::ROOT->{children} = [];
416 undef $SDL_ACTIVE; 842 undef $SDL_ACTIVE;
843}
844
845my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
846my $bgmusic;#TODO#hack#d#
847
848sub audio_music_finished {
849 return unless $CFG->{bgm_enable};
850
851 # TODO: hack, do play loop and mood music
852 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
853 $bgmusic->play (0);
854
855 push @bgmusic, shift @bgmusic;
856}
857
858sub audio_init {
859 if ($CFG->{audio_enable}) {
860 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
861 $SDL_MIXER = !CFClient::Mix_OpenAudio;
862 CFClient::Mix_AllocateChannels 8;
863 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
864
865 audio_music_finished;
866
867 while (<$fh>) {
868 next if /^\s*#/;
869 next if /^\s*$/;
870
871 my ($file, $volume, $event) = split /\s+/, $_, 3;
872
873 push @SOUNDS, "$volume,$file";
874
875 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
876 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
877 $chunk->volume ($volume * 128 / 100);
878 $chunk
879 };
880 }
881 } else {
882 status "unable to open sound config: $!";
883 }
884 }
885}
886
887sub audio_shutdown {
888 CFClient::Mix_CloseAudio if $SDL_MIXER;
417 undef $SDL_EV; 889 undef $SDL_MIXER;
418 SDL::Quit; 890 @SOUNDS = ();
891 %AUDIO_CHUNKS = ();
419} 892}
420 893
421my %animate_object; 894my %animate_object;
422my $animate_timer; 895my $animate_timer;
423 896
… …
433 $want_refresh = 0; 906 $want_refresh = 0;
434 $can_refresh = 0; 907 $can_refresh = 0;
435 908
436 $CFClient::UI::ROOT->draw; 909 $CFClient::UI::ROOT->draw;
437 910
438 SDL::GLSwapBuffers; 911 CFClient::SDL_GL_SwapBuffers;
439 912
440 $LAST_REFRESH = $NOW; 913 $LAST_REFRESH = $NOW;
441} 914}
442 915
443my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 916my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
444 $NOW = time; 917 $NOW = time;
445 918
446 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 919 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
447 while $SDL_EV->poll; 920 for CFClient::SDL_PollEvent;
448 921
449 if (%animate_object) { 922 if (%animate_object) {
450 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 923 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
451 $want_refresh++; 924 $want_refresh++;
452 } 925 }
… …
472 delete $animate_object{$widget}; 945 delete $animate_object{$widget};
473} 946}
474 947
475@conn::ISA = Crossfire::Protocol::; 948@conn::ISA = Crossfire::Protocol::;
476 949
950sub conn::stats_update {
951 my ($self, $stats) = @_;
952
953 update_stats_window ($stats);
954}
955
477sub conn::user_send { 956sub conn::user_send {
478 my ($self, $command) = @_; 957 my ($self, $command) = @_;
479 958
480 $self->send ($command); 959 $self->send_command ($command);
481 status $command; 960 status $command;
961}
962
963sub conn::map_scroll {
964 my ($self, $dx, $dy) = @_;
965
966 $MAP->scroll ($dx, $dy);
482} 967}
483 968
484sub conn::feed_map1a { 969sub conn::feed_map1a {
485 my ($self, $data) = @_; 970 my ($self, $data) = @_;
486 971
487# $self->Crossfire::Protocol::feed_map1a ($data); 972# $self->Crossfire::Protocol::feed_map1a ($data);
488 973
489 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
490 $MAP->map1a_update ($data); 974 $MAP->map1a_update ($data);
491 $MAPWIDGET->update; 975 $MAPWIDGET->update;
492} 976}
493 977
494#sub conn::map_update { 978sub conn::flush_map {
495# my ($self, $dirty) = @_; 979 my ($self) = @_;
496# 980
497# $MAPWIDGET->update; 981 my $map_info = delete $self->{map_info}
498#} 982 or return;
983
984 my ($hash, $x, $y, $w, $h) = @$map_info;
985
986 my $data = $MAP->get_rect ($x, $y, $w, $h);
987 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
988 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
989}
499 990
500sub conn::map_clear { 991sub conn::map_clear {
501 my ($self) = @_; 992 my ($self) = @_;
502 993
994 $self->flush_map;
995 delete $self->{neigh_map};
996
503 $MAP->clear; 997 $MAP->clear;
998}
504 999
505# refresh; 1000
1001sub conn::load_map($$$) {
1002 my ($self, $hash, $x, $y) = @_;
1003
1004 if (defined (my $data = $MAPCACHE->get ($hash))) {
1005 $data = Compress::LZF::decompress $data;
1006 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1007 for my $id ($MAP->set_rect ($x, $y, $data)) {
1008 my $data = $TILECACHE->get ($id)
1009 or next;
1010
1011 $self->set_texture ($id => $data);
1012 }
1013 }
1014}
1015
1016# this method does a "flood fill" into every tile direction
1017# it assumes that tiles are arranged in a rectangular grid,
1018# i.e. a map is the same as the left of the right map etc.
1019# failure to comply are harmless and result in display errors
1020# at worst.
1021sub conn::flood_fill {
1022 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1023
1024 # the server does not allow map paths > 6
1025 return if 6 <= length $path;
1026
1027 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1028
1029 for (
1030 [1, 0, -1],
1031 [2, 1, 0],
1032 [3, 0, 1],
1033 [4, -1, 0],
1034 ) {
1035 my ($tile, $dx, $dy) = @$_;
1036
1037 my $gx = $gx + $dx;
1038 my $gy = $gy + $dy;
1039
1040 next unless $flags & (1 << ($tile - 1));
1041 next if $self->{neigh_grid}{$gx, $gy}++;
1042
1043 my $neigh = $self->{neigh_map}{$hash} ||= [];
1044 if (my $info = $neigh->[$tile]) {
1045 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1046
1047 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1048 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1049
1050 } else {
1051 $self->send_mapinfo ("spatial $path$tile", sub {
1052 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1053
1054 return if $mode ne "spatial";
1055
1056 $x += $MAP->ox;
1057 $y += $MAP->oy;
1058
1059 $self->load_map ($hash, $x, $y)
1060 unless $self->{neigh_map}{$hash}[5]++;#d#
1061
1062 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1063
1064 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1065 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1066 });
1067 }
1068 }
1069}
1070
1071sub conn::map_change {
1072 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1073
1074 $self->flush_map;
1075
1076 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1077
1078 my $mapmapw = 250;
1079 my $mapmaph = 250;
1080
1081 $self->{neigh_rect} = [
1082 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1083 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1084 ];
1085
1086 delete $self->{neigh_grid};
1087 $self->flood_fill (0, 0, "", $hash, $flags);
1088
1089 $x += $ox;
1090 $y += $oy;
1091
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);
1097
1098 $self->load_map ($hash, $x, $y);
506} 1099}
507 1100
508sub conn::face_find { 1101sub conn::face_find {
509 my ($self, $face) = @_; 1102 my ($self, $facenum, $face) = @_;
510 1103
511 $FACECACHE->{"$face->{chksum},$face->{name}"} 1104 my $hash = "$face->{chksum},$face->{name}";
1105
1106 my $id = $FACEMAP->get ($hash);
1107
1108 unless ($id) {
1109 # create new id for face
1110 # i love transactions
1111 for (1..100) {
1112 my $txn = $CFClient::DB_ENV->txn_begin;
1113 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1114 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1115 $id++;
1116 if ($FACEMAP->put (id => $id) == 0
1117 && $FACEMAP->put ($hash => $id) == 0) {
1118 $txn->txn_commit;
1119
1120 goto gotid;
1121 }
1122 }
1123 $txn->abort;
1124 }
1125
1126 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1127 }
1128
1129gotid:
1130 $face->{id} = $id;
1131 $MAP->set_face ($facenum => $id);
1132 $self->{faceid}[$facenum] = $id;#d#
1133 $TILECACHE->get ($id)
512} 1134}
513 1135
514sub conn::face_update { 1136sub conn::face_update {
515 my ($self, $facenum, $face) = @_; 1137 my ($self, $facenum, $face) = @_;
516 1138
517 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 1139 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
518 1140
519 my $tex = $face->{texture} = 1141 $self->set_texture ($face->{id} => delete $face->{image});
1142}
1143
1144sub conn::set_texture {
1145 my ($self, $id, $data) = @_;
1146
1147 $self->{texture}[$id] ||= do {
1148 my $tex =
520 new_from_image CFClient::Texture 1149 new_from_image CFClient::Texture
521 delete $face->{image}, minify => 1; 1150 $data, minify => 1, mipmap => 1;
522 1151
523 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1152 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
524 $MAPWIDGET->update; 1153 $MAPWIDGET->update;
1154
1155 $tex
1156 };
525} 1157}
1158
1159sub conn::sound_play {
1160 my ($self, $x, $y, $soundnum, $type) = @_;
1161
1162 $SDL_MIXER
1163 or return;
1164
1165 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1166 or return;
1167
1168 $chunk->play;
1169# warn "sound $x,$y,$soundnum,$type\n";#d#
1170}
1171
1172my $LAST_QUERY; # server is stupid, stupid, stupid
526 1173
527sub conn::query { 1174sub conn::query {
528 my ($self, $flags, $prompt) = @_; 1175 my ($self, $flags, $prompt) = @_;
529 1176
530 #TODO 1177 $prompt = $LAST_QUERY unless length $prompt;
531 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;
532} 1237}
533 1238
534sub conn::drawinfo { 1239sub conn::drawinfo {
535 my ($self, $color, $text) = @_; 1240 my ($self, $color, $text) = @_;
536 1241
537 my @color = ( 1242 my @color = (
538 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1243 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
539 [1.00, 1.00, 1.00], 1244 [1.00, 1.00, 1.00],
540 [0.00, 0.00, 0.55], 1245 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
541 [1.00, 0.00, 0.00], 1246 [1.00, 0.00, 0.00],
542 [1.00, 0.54, 0.00], 1247 [1.00, 0.54, 0.00],
543 [0.11, 0.56, 1.00], 1248 [0.11, 0.56, 1.00],
544 [0.93, 0.46, 0.00], 1249 [0.93, 0.46, 0.00],
545 [0.18, 0.54, 0.34], 1250 [0.18, 0.54, 0.34],
… …
551 ); 1256 );
552 1257
553 $LOGVIEW->add_paragraph ($color[$color], $text); 1258 $LOGVIEW->add_paragraph ($color[$color], $text);
554} 1259}
555 1260
1261sub conn::spell_add {
1262 my ($self, $spell) = @_;
1263
1264 # TODO
1265 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1266 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
1267 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
1268}
1269
1270sub conn::spell_delete {
1271 my ($self, $spell) = @_;
1272}
1273
1274sub conn::addme_success {
1275 my ($self) = @_;
1276
1277 for my $skill (values %{$self->{skill_info}}) {
1278 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1279 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
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;
1363}
1364
556%SDL_CB = ( 1365%SDL_CB = (
557 SDL_QUIT() => sub { 1366 CFClient::SDL_QUIT => sub {
558 Event::unloop -1; 1367 Event::unloop -1;
559 }, 1368 },
560 SDL_VIDEORESIZE() => sub { 1369 CFClient::SDL_VIDEORESIZE => sub {
561 }, 1370 },
562 SDL_VIDEOEXPOSE() => sub { 1371 CFClient::SDL_VIDEOEXPOSE => \&refresh,
563 refresh;
564 },
565 SDL_KEYDOWN() => sub {
566 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
567 # alt-enter
568 destroy_screen;
569 $CFG->{fullscreen} = !$CFG->{fullscreen};
570 init_screen;
571 } else {
572 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
573 }
574 },
575 SDL_KEYUP() => sub {
576 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
577 },
578 SDL_MOUSEMOTION() => sub {
579 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
580 },
581 SDL_MOUSEBUTTONDOWN() => sub {
582 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
583 },
584 SDL_MOUSEBUTTONUP() => sub {
585 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
586 },
587 SDL_ACTIVEEVENT() => sub { 1372 CFClient::SDL_ACTIVEEVENT => sub {
588# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1373# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
589 }, 1374 },
1375 CFClient::SDL_KEYDOWN => sub {
1376 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1377 # alt-enter
1378 video_shutdown;
1379 $CFG->{fullscreen} = !$CFG->{fullscreen};
1380 video_init;
1381 } else {
1382 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1383 }
1384 },
1385 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1386 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1387 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1388 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1389 CFClient::SDL_USEREVENT => \&audio_music_finished,
590); 1390);
591 1391
592############################################################################# 1392#############################################################################
1393
1394$SIG{INT} = $SIG{TERM} = sub { exit };
1395
1396$TILECACHE = CFClient::db_table "tilecache";
1397$FACEMAP = CFClient::db_table "facemap";
593 1398
594CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1399CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
595 1400
596my %DEF_CFG = ( 1401my %DEF_CFG = (
597 sdl_mode => 0, 1402 sdl_mode => 0,
598 width => 640, 1403 width => 640,
599 height => 480, 1404 height => 480,
600 fullscreen => 0, 1405 fullscreen => 0,
601 fast => 0, 1406 fast => 0,
1407 map_scale => 0.5,
602 fow_enable => 1, 1408 fow_enable => 1,
603 fow_intensity => 0.45, 1409 fow_intensity => 0.45,
604 fow_smooth => 0, 1410 fow_smooth => 0,
1411 gui_fontsize => 1,
605 log_fontsize => 14, 1412 log_fontsize => 1,
1413 gauge_fontsize => 1,
1414 gauge_size => 0.35,
1415 stat_fontsize => 1,
606 mapsize => 100, 1416 mapsize => 100,
607 host => "crossfire.schmorp.de", 1417 host => "crossfire.schmorp.de",
608 say_command => 'say', 1418 say_command => 'say',
1419 audio_enable => 1,
1420 bgm_enable => 1,
1421 bgm_volume => 0.25,
609); 1422);
610 1423
611while (my ($k, $v) = each %DEF_CFG) { 1424while (my ($k, $v) = each %DEF_CFG) {
612 $CFG->{$k} = $v unless exists $CFG->{$k}; 1425 $CFG->{$k} = $v unless exists $CFG->{$k};
613} 1426}
614 1427
615sdl_init; 1428sdl_init;
616 1429
617@SDL_MODES = reverse 1430@SDL_MODES = reverse
618 grep $_->[0] >= 640 && $_->[1] >= 480, 1431 grep $_->[0] >= 640 && $_->[1] >= 480,
619 map [SDL::RectW ($_), SDL::RectH ($_)], 1432 CFClient::SDL_ListModes;
620 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
621 1433
622@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)";
623 1435
624$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1436$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
625 1437
626init_screen;
627
628{ 1438{
629 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 );
630 1449
631 CFClient::add_font $_ for @fonts; 1450 CFClient::add_font $_ for @fonts;
632 CFClient::set_font $fonts[0]; 1451
633} 1452 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1453 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
634 1454
635$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 1455 $FONT_PROP->make_default;
1456}
1457
1458video_init;
1459audio_init;
636 1460
637Event::loop; 1461Event::loop;
638 1462
639Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 1463END { CFClient::SDL_Quit }
640 1464
1465

Diff Legend

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