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.118 by elmex, Sun Apr 16 17:43:17 2006 UTC vs.
Revision 1.168 by root, Sun Apr 23 21:47:32 2006 UTC

… …
4use utf8; 4use utf8;
5 5
6use Time::HiRes 'time'; 6use Time::HiRes 'time';
7use Event; 7use Event;
8 8
9use SDL;
10use SDL::App;
11use SDL::Event;
12use SDL::Surface;
13use SDL::OpenGL;
14
15use Crossfire; 9use Crossfire;
16use Crossfire::Protocol; 10use Crossfire::Protocol;
17 11
18use Compress::LZF; 12use Compress::LZF;
19 13
20use CFClient; 14use CFClient;
21use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
22 17
23our $VERSION = '0.1'; 18our $VERSION = '0.1';
24 19
25my $MAX_FPS = 60; 20my $MAX_FPS = 60;
26my $MIN_FPS = 5; # unused as of yet 21my $MIN_FPS = 5; # unused as of yet
… …
41our @SDL_MODES; 36our @SDL_MODES;
42our $WIDTH; 37our $WIDTH;
43our $HEIGHT; 38our $HEIGHT;
44our $FULLSCREEN; 39our $FULLSCREEN;
45our $FONTSIZE; 40our $FONTSIZE;
41
42our $FONT_PROP;
43our $FONT_FIXED;
46 44
47our $MAP; 45our $MAP;
48our $MAPWIDGET; 46our $MAPWIDGET;
49our $BUTTONBAR; 47our $BUTTONBAR;
50our $LOGVIEW; 48our $LOGVIEW;
51our $CONSOLE; 49our $CONSOLE;
52our $METASERVER; 50our $METASERVER;
53 51
52our $GAUGES;
53our $STATWIDS;
54
54our $SDL_ACTIVE; 55our $SDL_ACTIVE;
55our $SDL_EV;
56our %SDL_CB; 56our %SDL_CB;
57
58our $SDL_MIXER;
59our @SOUNDS; # event => file mapping
60our %AUDIO_CHUNKS; # audio files
57 61
58our $ALT_ENTER_MESSAGE; 62our $ALT_ENTER_MESSAGE;
59our $STATUS_LINE; 63our $STATUS_LINE;
60our $DEBUG_STATUS; 64our $DEBUG_STATUS;
61 65
62sub status { 66sub status {
63 $STATUS_LINE->set_text ($_[0]); 67 $STATUS_LINE->set_text ($_[0]);
64 my ($w, $h) = $STATUS_LINE->size_request;
65 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 68 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
66} 69}
67 70
68sub debug { 71sub debug {
69 $DEBUG_STATUS->set_text ($_[0]); 72 $DEBUG_STATUS->set_text ($_[0]);
70 my ($w, $h) = $DEBUG_STATUS->size_request; 73 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
71 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
72} 74}
73 75
74sub start_game { 76sub start_game {
75 status "logging in..."; 77 status "logging in...";
76 78
… …
100 undef $CONN; 102 undef $CONN;
101} 103}
102 104
103sub client_setup { 105sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame 106 my $dialog = new CFClient::UI::FancyFrame
107 title => "Client Setup",
105 child => (my $vbox = new CFClient::UI::VBox); 108 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
107 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 109 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
108 110
109 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 111 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 112 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111 113
112 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 114 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
113 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 115 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
114 116
115 $mode_slider->connect (changed => sub { 117 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_; 118 my ($self, $value) = @_;
117 119
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 120 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 121 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 }); 122 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]); 123 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122 124
125 my $row = 1;
126
123 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 127 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
124 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 128 $table->add (1, $row++, new CFClient::UI::CheckBox
129 state => $CFG->{fullscreen},
130 tooltip => "Bring the client into fullscreen mode",
131 connect_changed => sub {
125 my ($self, $value) = @_; 132 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value; 133 $CFG->{fullscreen} = $value;
134 }
127 }); 135 );
128 136
129 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 137 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
130 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 138 $table->add (1, $row++, new CFClient::UI::CheckBox
139 state => $CFG->{fast},
140 tooltip => "Lower the visual quality considerably to speed up rendering.",
141 connect_changed => sub {
131 my ($self, $value) = @_; 142 my ($self, $value) = @_;
132 $CFG->{fast} = $value; 143 $CFG->{fast} = $value;
144 }
133 }); 145 );
134 146
135 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 147 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
136 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 148 $table->add (1, $row++, new CFClient::UI::CheckBox
149 state => $CFG->{fow_enable},
150 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
151 connect_changed => sub {
137 my ($self, $value) = @_; 152 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value; 153 $CFG->{fow_enable} = $value;
154 }
139 }); 155 );
140 156
141 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 157 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
142 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 158 $table->add (1, $row++, new CFClient::UI::Slider
159 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
160 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
161 connect_changed => sub {
143 my ($self, $value) = @_; 162 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value; 163 $CFG->{fow_intensity} = $value;
164 }
145 }); 165 );
146 166
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 167 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 168 $table->add (1, $row++, new CFClient::UI::CheckBox
169 state => $CFG->{fow_smooth},
170 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
171 connect_changed => sub {
149 my ($self, $value) = @_; 172 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value; 173 $CFG->{fow_smooth} = $value;
174 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
175 }
176 );
177
178 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
179 $table->add (1, $row++, new CFClient::UI::Slider
180 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
181 tooltip => "The font size used by most GUI elements",
182 connect_changed => sub {
183 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
184# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
185 }
186 );
187
188 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
189 $table->add (1, $row++, new CFClient::UI::Slider
190 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
191 tooltip => "The font size used by the server log window only",
192 connect_changed => sub {
193 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
194 }
195 );
196
197 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
198
199 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
201 tooltip => "The font size used by the statistics window only",
202 connect_changed => sub {
203 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
204 &set_stats_window_fontsize;
205 }
206 );
207
208 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
209 $table->add (1, $row++, new CFClient::UI::Slider
210 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
211 tooltip => "Adjust the size of the stats gauges at the bottom right",
212 connect_changed => sub {
213 $CFG->{gauge_size} = $_[1];
214 my $h = int $HEIGHT * $CFG->{gauge_size};
215 $GAUGES->{win}->set_size ($WIDTH, $h);
216 $GAUGES->{win}->move (0, $HEIGHT - $h);
217 }
218 );
219
220 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
221 $table->add (1, $row++, new CFClient::UI::Slider
222 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
223 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
224 connect_changed => sub {
225 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
226 &set_gauge_window_fontsize;
227 #$GAUGES->{win}->check_size;
228 #$GAUGES->{win}->update;
229 }
230 );
231
232 $table->add (1, $row++, new CFClient::UI::Button
233 expand => 1, align => 0, text => "Apply",
234 tooltip => "Apply the video settings",
235 connect_activate => sub {
236 video_shutdown ();
237 video_init ();
238 }
239 );
240
241 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
242 $table->add (1, $row++, new CFClient::UI::CheckBox
243 state => $CFG->{audio_enable},
244 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
245 connect_changed => sub {
246 $CFG->{audio_enable} = $_[1];
247 }
248 );
249# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
250# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
251# $CFG->{effects_volume} = $_[1];
151 }); 252# });
152
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 254 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
155 my ($self, $value) = @_; 255 $hbox->add (new CFClient::UI::CheckBox
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 256 expand => 1, state => $CFG->{bgm_enable},
257 tooltip => "Enable background music playing",
258 connect_changed => sub {
259 $CFG->{bgm_enable} = $_[1];
260 }
157 }); 261 );
158 262 $hbox->add (new CFClient::UI::Slider
159 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 263 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
160 destroy_screen (); 264 tooltip => "The volume of the background music",
161 init_screen (); 265 connect_changed => sub {
266 $CFG->{bgm_volume} = $_[1];
267 CFClient::MixMusic::volume $_[1] * 128;
268 }
162 }); 269 );
270
271 $table->add (1, $row++, new CFClient::UI::Button
272 expand => 1, align => 0, text => "Apply",
273 tooltip => "Apply the audio settings",
274 connect_activate => sub {
275 audio_shutdown ();
276 audio_init ();
277 }
278 );
163 279
164 $dialog 280 $dialog
281}
282
283sub set_stats_window_fontsize {
284 for (values %{$STATWIDS}) {
285 $_->set_fontsize ($::CFG->{stat_fontsize});
286 }
287}
288
289sub set_gauge_window_fontsize {
290 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
291 $_->set_fontsize ($::CFG->{gauge_fontsize});
292 }
293}
294
295sub make_gauge_window {
296 my $gh = int ($HEIGHT * $CFG->{gauge_size});
297# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
298
299 my $win = new CFClient::UI::Frame (
300 y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
301 );
302 $win->add (my $vb = new CFClient::UI::VBox);
303
304 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
305
306
307 $hbg->add (new CFClient::UI::Empty expand => 1);
308 $hbg->add (my $hb = new CFClient::UI::HBox);
309 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
310 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
311 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
312 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
313
314 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
315 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
316
317 $GAUGES = {
318 exp => $exp, win => $win, range => $rng,
319 food => $fg, mana => $mg, hp => $hg, grace => $gg
320 };
321 $win
322}
323
324sub make_stats_window {
325 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
326
327 $tgw->add (my $vb = new CFClient::UI::VBox);
328 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
329 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
330
331 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
332
333 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
334
335 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
336 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
337 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
338 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
339 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
340 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
341 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
342
343 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
344 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
345 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
346 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
347 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
348 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
349 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
350
351 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
352 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
353 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
354 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
355 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
356 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
357
358 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
359 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
360 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
361 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
362 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
363 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
364
365 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
366
367 my $row = 0;
368 my $col = 0;
369
370 my %resist_names = (
371 slow => "Slow",
372 holyw => "Holy Word",
373 conf => "Confusion",
374 fire => "Fire",
375 depl => "Depletion",
376 magic => "Magic",
377 drain => "Draining",
378 acid => "Acid",
379 pois => "Poison",
380 para => "Paralysation",
381 deat => "Death",
382 phys => "Physical",
383 blind => "Blind",
384 fear => "Fear",
385 tund => "Turn undead",
386 elec => "Electricity",
387 cold => "Cold",
388 ghit => "Ghost hit",
389 );
390 for (qw/slow holyw conf fire depl magic
391 drain acid pois para deat phys
392 blind fear tund elec cold ghit/)
393 {
394 $tbl2->add ($col, $row,
395 $STATWIDS->{"res_$_"} =
396 new CFClient::UI::Label
397 template => "-100%",
398 align => +1,
399 valign => 0,
400 tooltip => $resist_names{$_}
401 );
402 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
403 can_hover => 1,
404 can_events => 1,
405 image => "ui/resist/resist_$_.png",
406 tooltip => $resist_names{$_}
407 );
408
409 $row++;
410 if ($row % 6 == 0) {
411 $col += 2;
412 $row = 0;
413 }
414 }
415
416 &set_stats_window_fontsize;
417 update_stats_window ({});
418
419 $tgw
420}
421
422sub update_stats_window {
423 my ($stats) = @_;
424
425 # i love text protocols!!!
426 my $hp = $stats->{1} * 1;
427 my $hp_m = $stats->{2} * 1;
428 my $sp = $stats->{3} * 1;
429 my $sp_m = $stats->{4} * 1;
430 my $fo = $stats->{18} * 1;
431 my $fo_m = 999;
432 my $gr = $stats->{23} * 1;
433 my $gr_m = $stats->{24} * 1;
434
435 $GAUGES->{hp} ->set_value ($hp, $hp_m);
436 $GAUGES->{mana} ->set_value ($sp, $sp_m);
437 $GAUGES->{food} ->set_value ($fo, $fo_m);
438 $GAUGES->{grace} ->set_value ($gr, $gr_m);
439 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1
440 ." LVL: " . $stats->{12} * 1);
441 my $rng = $stats->{20};
442 $rng =~ s/^Range: //; # thank you so much dear server
443 $GAUGES->{range} ->set_text ("Rng: " . $rng);
444 my $title = $stats->{21};
445 $title =~ s/^Player: //;
446 $STATWIDS->{title} ->set_text ("Title: " . $title);
447
448 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
449 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
450 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
451 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
452 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
453 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
454 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
455 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
456 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
457 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
458 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
459 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
460 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
461
462 my %tbl = (
463 phys => 100,
464 magic => 101,
465 fire => 102,
466 elec => 103,
467 cold => 104,
468 conf => 105,
469 acid => 106,
470 drain => 107,
471 ghit => 108,
472 pois => 109,
473 slow => 110,
474 para => 111,
475 tund => 112,
476 fear => 113,
477 depl => 113,
478 deat => 115,
479 holyw => 116,
480 blind => 117
481 );
482
483 for (keys %tbl) {
484 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
485 }
486
165} 487}
166 488
167sub metaserver_dialog { 489sub metaserver_dialog {
168 my $dialog = new CFClient::UI::FancyFrame 490 my $dialog = new CFClient::UI::FancyFrame
491 title => "Metaserver",
169 child => (my $vbox = new CFClient::UI::VBox); 492 child => (my $vbox = new CFClient::UI::VBox);
170 493
171 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 494 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
172 495
173 $dialog 496 $dialog
… …
230 $HOST->set_text ($CFG->{host} = $host); 553 $HOST->set_text ($CFG->{host} = $host);
231 }), 554 }),
232 (new CFClient::UI::Empty expand => 1), 555 (new CFClient::UI::Empty expand => 1),
233 ]); 556 ]);
234 557
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 558 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
236 for 0 .. $#$m; 559 for 0 .. $#$m;
237 } 560 }
238 } 561 }
239 }); 562 });
240} 563}
241 564
242sub server_setup { 565sub server_setup {
243 my $dialog = new CFClient::UI::FancyFrame 566 my $dialog = new CFClient::UI::FancyFrame
567 title => "Server Setup",
244 child => (my $vbox = new CFClient::UI::VBox); 568 child => (my $vbox = new CFClient::UI::VBox);
245 569
246 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
247 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 570 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
248 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 571 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
249 572
250 { 573 {
251 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 574 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252 575
253 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 576 $vbox->add (
577 my $HOST = new CFClient::UI::Entry
578 expand => 1,
579 text => $CFG->{host},
580 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
581 connect_changed => sub {
582 my ($self, $value) = @_;
583 $CFG->{host} = $value;
584 }
585 );
586
587 $METASERVER = metaserver_dialog;
588
589 $vbox->add (new CFClient::UI::Flopper
590 expand => 1,
591 text => "Metaserver",
592 other => $METASERVER,
593 tooltip => "Show a list of avaible crossfire servers",
594 connect_open => sub {
595 update_metaserver $HOST;
596 }
597 );
598 }
599
600 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
601 $table->add (1, 4, new CFClient::UI::Entry
602 text => $CFG->{user},
603 tooltip => "The name of your character on the server",
604 connect_changed => sub {
254 my ($self, $value) = @_; 605 my ($self, $value) = @_;
255 $CFG->{host} = $value; 606 $CFG->{user} = $value;
256 }); 607 }
608 );
257 609
258 $METASERVER = metaserver_dialog;
259
260 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
261 update_metaserver $HOST;
262 });
263 }
264
265 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 610 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
266 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 611 $table->add (1, 5, new CFClient::UI::Entry
612 text => $CFG->{password},
613 hidden => 1,
614 tooltip => "The password for your character",
615 connect_changed => sub {
267 my ($self, $value) = @_; 616 my ($self, $value) = @_;
268 $CFG->{user} = $value;
269 });
270
271 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
272 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
273 my ($self, $value) = @_;
274 $CFG->{password} = $value; 617 $CFG->{password} = $value;
618 }
275 }); 619 );
276 620
277 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 621 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
278 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 622 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
623 text => $CFG->{say_command},
624 tooltip => "This is the command that will be used if you write a line in the message window entry. "
625 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
626 ."But you could also set it to 'tell <playername>' to only chat with that user.",
627 connect_changed => sub {
279 my ($self, $value) = @_; 628 my ($self, $value) = @_;
280 $CFG->{say_command} = $value; 629 $CFG->{say_command} = $value;
630 }
281 }); 631 );
282 632
283 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 633 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
284 $table->add (1, 7, new CFClient::UI::Slider 634 $table->add (1, 7, new CFClient::UI::Slider
285 req_w => 100, 635 req_w => 100,
286 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 636 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
637 tooltip => "This is the size of the portion of the map update the server sends you. "
638 ."If you set this to a high value you will be able to see further for example.",
287 connect_changed => sub { 639 connect_changed => sub {
288 my ($self, $value) = @_; 640 my ($self, $value) = @_;
289 641
290 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 642 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
291 }, 643 },
… …
298 $dialog 650 $dialog
299} 651}
300 652
301sub message_window { 653sub message_window {
302 my $window = new CFClient::UI::FancyFrame 654 my $window = new CFClient::UI::FancyFrame
655 title => "Messages",
303 border_bg => [1, 1, 1, 0.5], 656 border_bg => [1, 1, 1, 0.5],
304 bg => [0.3, 0.3, 0.3, 0.8], 657 bg => [0.3, 0.3, 0.3, 0.8],
305 user_w => $::WIDTH/4, 658 user_w => int $::WIDTH / 3,
306 user_h => $::HEIGHT, 659 user_h => int $::HEIGHT / 5,
307 child => (my $vbox = new CFClient::UI::VBox); 660 child => (my $vbox = new CFClient::UI::VBox);
308 661
309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 662 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
310 expand => 1, 663 expand => 1,
664 font => $FONT_FIXED,
311 fontsize => $::CFG->{log_fontsize}, 665 fontsize => $::CFG->{log_fontsize},
312 ); 666 );
313 667
314 $vbox->add (my $input = new CFClient::UI::LineEntry 668 $vbox->add (my $input = new CFClient::UI::Entry
315 connect_focus_in => sub { 669 connect_focus_in => sub {
316 my ($input, $prev_focus) = @_; 670 my ($input, $prev_focus) = @_;
317 671
318 delete $input->{refocus_map}; 672 delete $input->{refocus_map};
319 673
… …
325 connect_activate => sub { 679 connect_activate => sub {
326 my ($input, $text) = @_; 680 my ($input, $text) = @_;
327 $input->set_text (''); 681 $input->set_text ('');
328 682
329 if ($text =~ /^\/(.*)/) { 683 if ($text =~ /^\/(.*)/) {
330 $::CONN->user_send ("command $1"); 684 $::CONN->user_send ($1);
331 } else { 685 } else {
332 my $say_cmd = $::CFG->{say_command} || 'say'; 686 my $say_cmd = $::CFG->{say_command} || 'say';
333 $::CONN->user_send ("command $say_cmd $text"); 687 $::CONN->user_send ("$say_cmd $text");
334 } 688 }
335 if ($input->{refocus_map}) { 689 if ($input->{refocus_map}) {
336 delete $input->{refocus_map}; 690 delete $input->{refocus_map};
337 $MAPWIDGET->focus_in 691 $MAPWIDGET->focus_in
338 } 692 }
… …
349 703
350 $window 704 $window
351} 705}
352 706
353sub sdl_init { 707sub sdl_init {
354 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 708 CFClient::SDL_Init
355 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
356 and die "SDL::Init failed!\n"; 709 and die "SDL::Init failed!\n";
357} 710}
358 711
359sub init_screen { 712sub video_init {
360 sdl_init; 713 sdl_init;
361 714
362 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 715 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
363 $FULLSCREEN = $CFG->{fullscreen}; 716 $FULLSCREEN = $CFG->{fullscreen};
364 $FAST = $CFG->{fast}; 717 $FAST = $CFG->{fast};
365 718
366 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 719 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
367 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
368 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
369 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
370
371 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
372 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
373 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
374 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
375
376 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
377 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
378 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
379
380 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
381 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
382 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
383 or die "SDL::SetVideoMode failed!\n"; 720 or die "SDL_SetVideoMode failed!\n";
384
385 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
386
387 $SDL_EV = new SDL::Event;
388 $SDL_EV->set_unicode (1);
389 721
390 $SDL_ACTIVE = 1; 722 $SDL_ACTIVE = 1;
391 723
392 $LAST_REFRESH = time - 0.01; 724 $LAST_REFRESH = time - 0.01;
393 725
394 CFClient::gl_init; 726 CFClient::gl_init;
395 727
396 $FONTSIZE = int $HEIGHT / 40; 728 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
397 729
398 ############################################################################# 730 #############################################################################
399 731
400 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 732 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
401 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 733 $DEBUG_STATUS->show;
402 734
403 $STATUS_LINE = new CFClient::UI::Label 735 $STATUS_LINE = new CFClient::UI::Label
404 padding => 0, 736 padding => 0,
405 y => $HEIGHT * 44 / 45 - $FONTSIZE; 737 y => $HEIGHT - $FONTSIZE * 1.8;
406 $CFClient::UI::ROOT->add ($STATUS_LINE); 738 $STATUS_LINE->show;
407 739
408 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 740 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
409 padding => 0, 741 padding => 0,
410 y => $HEIGHT * 44 / 45, 742 fontsize => 0.8,
411 height => $HEIGHT / 45,
412 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 743 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
413 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 744 $ALT_ENTER_MESSAGE->show;
745 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
414 746
415 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 747 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
416 $MAPWIDGET->focus_in; 748 $MAPWIDGET->focus_in;
417 $MAPWIDGET->connect (activate_console => sub { 749 $MAPWIDGET->connect (activate_console => sub {
418 my ($mapwidget, $preset) = @_; 750 my ($mapwidget, $preset) = @_;
419 751
420 if ($CONSOLE) { 752 if ($CONSOLE) {
… …
430 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 762 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
431 763
432 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 764 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
433 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 765 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
434 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 766 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
767
768 $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
769 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
435 770
436 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 771 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
437 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 772 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
438 status "Configuration Saved"; 773 status "Configuration Saved";
439 }); 774 });
440 775
441 $BUTTONBAR->{children}[0]->emit ("activate"); 776 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
442} 777}
443 778
444sub destroy_screen { 779sub video_shutdown {
445 $CFClient::UI::ROOT->{children} = []; 780 $CFClient::UI::ROOT->{children} = [];
446 undef $SDL_ACTIVE; 781 undef $SDL_ACTIVE;
782}
783
784my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
785my $bgmusic;#TODO#hack#d#
786
787sub audio_music_finished {
788 return unless $CFG->{bgm_enable};
789
790 # TODO: hack, do play loop and mood music
791 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
792 $bgmusic->play (0);
793
794 push @bgmusic, shift @bgmusic;
795}
796
797sub audio_init {
798 if ($CFG->{audio_enable}) {
799 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
800 $SDL_MIXER = !CFClient::Mix_OpenAudio;
801 CFClient::Mix_AllocateChannels 8;
802 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
803
804 audio_music_finished;
805
806 while (<$fh>) {
807 next if /^\s*#/;
808 next if /^\s*$/;
809
810 my ($file, $volume, $event) = split /\s+/, $_, 3;
811
812 push @SOUNDS, "$volume,$file";
813
814 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
815 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
816 $chunk->volume ($volume * 128 / 100);
817 $chunk
818 };
819 }
820 } else {
821 status "unable to open sound config: $!";
822 }
823 }
824}
825
826sub audio_shutdown {
827 CFClient::Mix_CloseAudio if $SDL_MIXER;
447 undef $SDL_EV; 828 undef $SDL_MIXER;
448 SDL::Quit; 829 @SOUNDS = ();
830 %AUDIO_CHUNKS = ();
449} 831}
450 832
451my %animate_object; 833my %animate_object;
452my $animate_timer; 834my $animate_timer;
453 835
… …
463 $want_refresh = 0; 845 $want_refresh = 0;
464 $can_refresh = 0; 846 $can_refresh = 0;
465 847
466 $CFClient::UI::ROOT->draw; 848 $CFClient::UI::ROOT->draw;
467 849
468 SDL::GLSwapBuffers; 850 CFClient::SDL_GL_SwapBuffers;
469 851
470 $LAST_REFRESH = $NOW; 852 $LAST_REFRESH = $NOW;
471} 853}
472 854
473my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 855my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
474 $NOW = time; 856 $NOW = time;
475 857
476 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 858 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
477 while $SDL_EV->poll; 859 for CFClient::SDL_PollEvent;
478 860
479 if (%animate_object) { 861 if (%animate_object) {
480 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 862 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
481 $want_refresh++; 863 $want_refresh++;
482 } 864 }
… …
502 delete $animate_object{$widget}; 884 delete $animate_object{$widget};
503} 885}
504 886
505@conn::ISA = Crossfire::Protocol::; 887@conn::ISA = Crossfire::Protocol::;
506 888
889sub conn::stats_update {
890 my ($self, $stats) = @_;
891
892 update_stats_window ($stats);
893}
894
507sub conn::user_send { 895sub conn::user_send {
508 my ($self, $command) = @_; 896 my ($self, $command) = @_;
509 897
510 $self->send ($command); 898 $self->send_command ($command);
511 status $command; 899 status $command;
900}
901
902sub conn::map_scroll {
903 my ($self, $dx, $dy) = @_;
904
905 $MAP->scroll ($dx, $dy);
512} 906}
513 907
514sub conn::feed_map1a { 908sub conn::feed_map1a {
515 my ($self, $data) = @_; 909 my ($self, $data) = @_;
516 910
517# $self->Crossfire::Protocol::feed_map1a ($data); 911# $self->Crossfire::Protocol::feed_map1a ($data);
518 912
519 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
520 $MAP->map1a_update ($data); 913 $MAP->map1a_update ($data);
521 $MAPWIDGET->update; 914 $MAPWIDGET->update;
522} 915}
523 916
524sub conn::flush_map { 917sub conn::flush_map {
… …
529 922
530 my ($hash, $x, $y, $w, $h) = @$map_info; 923 my ($hash, $x, $y, $w, $h) = @$map_info;
531 924
532 my $data = $MAP->get_rect ($x, $y, $w, $h); 925 my $data = $MAP->get_rect ($x, $y, $w, $h);
533 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 926 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
534
535 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 927 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
536
537} 928}
538 929
539sub conn::map_clear { 930sub conn::map_clear {
540 my ($self) = @_; 931 my ($self) = @_;
541 932
542 $self->flush_map; 933 $self->flush_map;
934 delete $self->{neigh_map};
543 935
544 $MAP->clear; 936 $MAP->clear;
545} 937}
546 938
547sub conn::map_info {
548 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
549 939
550 $self->flush_map; 940sub conn::load_map($$$) {
551 941 my ($self, $hash, $x, $y) = @_;
552 $x = $::MAP->ox - $x;
553 $y = $::MAP->oy - $y;
554
555 $self->{map_info} = [$hash, $x, $y, $w, $h];
556 942
557 if (defined (my $data = $MAPCACHE->get ($hash))) { 943 if (defined (my $data = $MAPCACHE->get ($hash))) {
558 $data = Compress::LZF::decompress $data; 944 $data = Compress::LZF::decompress $data;
559 warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d# 945 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
560 for my $id ($MAP->set_rect ($x, $y, $data)) { 946 for my $id ($MAP->set_rect ($x, $y, $data)) {
561 my $data = $TILECACHE->get ($id) 947 my $data = $TILECACHE->get ($id)
562 or next; 948 or next;
563 949
564 $self->set_texture ($id => $data); 950 $self->set_texture ($id => $data);
565 } 951 }
566 } 952 }
953}
954
955# this method does a "flood fill" into every tile direction
956# it assumes that tiles are arranged in a rectangular grid,
957# i.e. a map is the same as the left of the right map etc.
958# failure to comply are harmless and result in display errors
959# at worst.
960sub conn::flood_fill {
961 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
962
963 # the server does not allow map paths > 6
964 return if 6 <= length $path;
965
966 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
967
968 for (
969 [1, 0, -1],
970 [2, 1, 0],
971 [3, 0, 1],
972 [4, -1, 0],
973 ) {
974 my ($tile, $dx, $dy) = @$_;
975
976 my $gx = $gx + $dx;
977 my $gy = $gy + $dy;
978
979 next unless $flags & (1 << ($tile - 1));
980 next if $self->{neigh_grid}{$gx, $gy}++;
981
982 my $neigh = $self->{neigh_map}{$hash} ||= [];
983 if (my $info = $neigh->[$tile]) {
984 my ($flags, $x, $y, $w, $h, $hash) = @$info;
985
986 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
987 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
988
989 } else {
990 $self->send_mapinfo ("spatial $path$tile", sub {
991 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
992
993 return if $mode ne "spatial";
994
995 $x += $MAP->ox;
996 $y += $MAP->oy;
997
998 $self->load_map ($hash, $x, $y)
999 unless $self->{neigh_map}{$hash}[5]++;#d#
1000
1001 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1002
1003 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1004 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1005 });
1006 }
1007 }
1008}
1009
1010sub conn::map_change {
1011 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1012
1013 $self->flush_map;
1014
1015 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1016
1017 my $mapmapw = 250;
1018 my $mapmaph = 250;
1019
1020 $self->{neigh_rect} = [
1021 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1022 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1023 ];
1024
1025 delete $self->{neigh_grid};
1026 $self->flood_fill (0, 0, "", $hash, $flags);
1027
1028 $x += $ox;
1029 $y += $oy;
1030
1031 $self->{map_info} = [$hash, $x, $y, $w, $h];
1032
1033 my $map = $self->{map_info}[0];
1034 $map =~ s/^.*?\/([^\/]+)$/\1/;
1035 $STATWIDS->{map}->set_text ("Map: " . $map);
1036
1037 $self->load_map ($hash, $x, $y);
567} 1038}
568 1039
569sub conn::face_find { 1040sub conn::face_find {
570 my ($self, $facenum, $face) = @_; 1041 my ($self, $facenum, $face) = @_;
571 1042
… …
621 1092
622 $tex 1093 $tex
623 }; 1094 };
624} 1095}
625 1096
1097sub conn::sound_play {
1098 my ($self, $x, $y, $soundnum, $type) = @_;
1099
1100 $SDL_MIXER
1101 or return;
1102
1103 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1104 or return;
1105
1106 $chunk->play;
1107# warn "sound $x,$y,$soundnum,$type\n";#d#
1108}
1109
626sub conn::query { 1110sub conn::query {
627 my ($self, $flags, $prompt) = @_; 1111 my ($self, $flags, $prompt) = @_;
628 1112
629 #TODO 1113 #TODO, display dialog with relevant information
630 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1114 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
631} 1115}
632 1116
633sub conn::drawinfo { 1117sub conn::drawinfo {
634 my ($self, $color, $text) = @_; 1118 my ($self, $color, $text) = @_;
… …
650 ); 1134 );
651 1135
652 $LOGVIEW->add_paragraph ($color[$color], $text); 1136 $LOGVIEW->add_paragraph ($color[$color], $text);
653} 1137}
654 1138
1139sub conn::spell_add {
1140 my ($self, $spell) = @_;
1141
1142 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
1143 });
1144 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
1145 });
1146}
1147
1148sub conn::spell_delete {
1149 my ($self, $spell) = @_;
1150}
1151
1152sub conn::addme_success {
1153 my ($self) = @_;
1154
1155 for my $skill (values %{$self->{skill_info}}) {
1156 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1157 });
1158 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
1159 });
1160 }
1161}
1162
655%SDL_CB = ( 1163%SDL_CB = (
656 SDL_QUIT() => sub { 1164 CFClient::SDL_QUIT => sub {
657 Event::unloop -1; 1165 Event::unloop -1;
658 }, 1166 },
659 SDL_VIDEORESIZE() => sub { 1167 CFClient::SDL_VIDEORESIZE => sub {
660 }, 1168 },
661 SDL_VIDEOEXPOSE() => sub { 1169 CFClient::SDL_VIDEOEXPOSE => \&refresh,
662 refresh;
663 },
664 SDL_KEYDOWN() => sub {
665 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
666 # alt-enter
667 destroy_screen;
668 $CFG->{fullscreen} = !$CFG->{fullscreen};
669 init_screen;
670 } else {
671 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
672 }
673 },
674 SDL_KEYUP() => sub {
675 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
676 },
677 SDL_MOUSEMOTION() => sub {
678 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
679 },
680 SDL_MOUSEBUTTONDOWN() => sub {
681 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
682 },
683 SDL_MOUSEBUTTONUP() => sub {
684 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
685 },
686 SDL_ACTIVEEVENT() => sub { 1170 CFClient::SDL_ACTIVEEVENT => sub {
687# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1171# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
688 }, 1172 },
1173 CFClient::SDL_KEYDOWN => sub {
1174 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1175 # alt-enter
1176 video_shutdown;
1177 $CFG->{fullscreen} = !$CFG->{fullscreen};
1178 video_init;
1179 } else {
1180 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1181 }
1182 },
1183 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1184 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1185 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1186 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1187 CFClient::SDL_USEREVENT => \&audio_music_finished,
689); 1188);
690 1189
691############################################################################# 1190#############################################################################
1191
1192$SIG{INT} = $SIG{TERM} = sub { exit };
692 1193
693$TILECACHE = CFClient::db_table "tilecache"; 1194$TILECACHE = CFClient::db_table "tilecache";
694$FACEMAP = CFClient::db_table "facemap"; 1195$FACEMAP = CFClient::db_table "facemap";
695 1196
696CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1197CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
702 fullscreen => 0, 1203 fullscreen => 0,
703 fast => 0, 1204 fast => 0,
704 fow_enable => 1, 1205 fow_enable => 1,
705 fow_intensity => 0.45, 1206 fow_intensity => 0.45,
706 fow_smooth => 0, 1207 fow_smooth => 0,
1208 gui_fontsize => 1,
707 log_fontsize => 14, 1209 log_fontsize => 1,
1210 gauge_fontsize => 1,
1211 gauge_size => 0.35,
1212 stat_fontsize => 1,
708 mapsize => 100, 1213 mapsize => 100,
709 host => "crossfire.schmorp.de", 1214 host => "crossfire.schmorp.de",
710 say_command => 'say', 1215 say_command => 'say',
1216 audio_enable => 1,
1217 bgm_enable => 1,
1218 bgm_volume => 0.25,
711); 1219);
712 1220
713while (my ($k, $v) = each %DEF_CFG) { 1221while (my ($k, $v) = each %DEF_CFG) {
714 $CFG->{$k} = $v unless exists $CFG->{$k}; 1222 $CFG->{$k} = $v unless exists $CFG->{$k};
715} 1223}
716 1224
717sdl_init; 1225sdl_init;
718 1226
719@SDL_MODES = reverse 1227@SDL_MODES = reverse
720 grep $_->[0] >= 640 && $_->[1] >= 480, 1228 grep $_->[0] >= 640 && $_->[1] >= 480,
721 map [SDL::RectW ($_), SDL::RectH ($_)], 1229 CFClient::SDL_ListModes;
722 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
723 1230
724@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1231@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
725 1232
726$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1233$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
727 1234
728init_screen;
729
730{ 1235{
731 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1236 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1237 DejaVuSans.ttf
1238 DejaVuSansMono.ttf
1239 DejaVuSans-Bold.ttf
1240 DejaVuSansMono-Bold.ttf
1241 DejaVuSans-Oblique.ttf
1242 DejaVuSansMono-Oblique.ttf
1243 DejaVuSans-BoldOblique.ttf
1244 DejaVuSansMono-BoldOblique.ttf
1245 );
732 1246
733 CFClient::add_font $_ for @fonts; 1247 CFClient::add_font $_ for @fonts;
734 CFClient::set_font $fonts[0]; 1248
1249 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1250 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1251
1252 $FONT_PROP->make_default;
735} 1253}
1254
1255video_init;
1256audio_init;
736 1257
737Event::loop; 1258Event::loop;
738 1259
1260END { CFClient::SDL_Quit }
739 1261
1262

Diff Legend

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