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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines