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.127 by elmex, Mon Apr 17 21:07:03 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;
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
… …
50our $LOGVIEW; 45our $LOGVIEW;
51our $CONSOLE; 46our $CONSOLE;
52our $METASERVER; 47our $METASERVER;
53 48
54our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
55 51
56our $SDL_ACTIVE; 52our $SDL_ACTIVE;
57our $SDL_EV;
58our %SDL_CB; 53our %SDL_CB;
54
55our $SDL_MIXER;
56our @SOUNDS; # event => file mapping
57our %AUDIO_CHUNKS; # audio files
59 58
60our $ALT_ENTER_MESSAGE; 59our $ALT_ENTER_MESSAGE;
61our $STATUS_LINE; 60our $STATUS_LINE;
62our $DEBUG_STATUS; 61our $DEBUG_STATUS;
63 62
64sub status { 63sub status {
65 $STATUS_LINE->set_text ($_[0]); 64 $STATUS_LINE->set_text ($_[0]);
66 my ($w, $h) = $STATUS_LINE->size_request;
67 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 65 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
68} 66}
69 67
70sub debug { 68sub debug {
71 $DEBUG_STATUS->set_text ($_[0]); 69 $DEBUG_STATUS->set_text ($_[0]);
72 my ($w, $h) = $DEBUG_STATUS->size_request; 70 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
73 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
74} 71}
75 72
76sub start_game { 73sub start_game {
77 status "logging in..."; 74 status "logging in...";
78 75
… …
102 undef $CONN; 99 undef $CONN;
103} 100}
104 101
105sub client_setup { 102sub client_setup {
106 my $dialog = new CFClient::UI::FancyFrame 103 my $dialog = new CFClient::UI::FancyFrame
104 title => "Client Setup",
107 child => (my $vbox = new CFClient::UI::VBox); 105 child => (my $vbox = new CFClient::UI::VBox);
108 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
109 $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]);
110 107
111 $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");
112 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 109 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
113 110
114 $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]);
115 $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");
116 113
117 $mode_slider->connect (changed => sub { 114 $mode_slider->connect (changed => sub {
118 my ($self, $value) = @_; 115 my ($self, $value) = @_;
119 116
120 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
121 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
122 }); 119 });
123 $mode_slider->emit (changed => $mode_slider->{range}[0]); 120 $mode_slider->emit (changed => $mode_slider->{range}[0]);
124 121
122 my $row = 1;
123
125 $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");
126 $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 {
127 my ($self, $value) = @_; 129 my ($self, $value) = @_;
128 $CFG->{fullscreen} = $value; 130 $CFG->{fullscreen} = $value;
131 }
129 }); 132 );
130 133
131 $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");
132 $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 {
133 my ($self, $value) = @_; 139 my ($self, $value) = @_;
134 $CFG->{fast} = $value; 140 $CFG->{fast} = $value;
141 }
135 }); 142 );
136 143
137 $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");
138 $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 {
139 my ($self, $value) = @_; 149 my ($self, $value) = @_;
140 $CFG->{fow_enable} = $value; 150 $CFG->{fow_enable} = $value;
151 }
141 }); 152 );
142 153
143 $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");
144 $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 {
145 my ($self, $value) = @_; 159 my ($self, $value) = @_;
146 $CFG->{fow_intensity} = $value; 160 $CFG->{fow_intensity} = $value;
161 }
147 }); 162 );
148 163
149 $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");
150 $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 {
151 my ($self, $value) = @_; 169 my ($self, $value) = @_;
152 $CFG->{fow_smooth} = $value; 170 $CFG->{fow_smooth} = $value;
171 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
172 }
173 );
174
175 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
176 $table->add (1, $row++, new CFClient::UI::Slider
177 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
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 }
183 );
184
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 {
233 video_shutdown ();
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];
153 }); 249# });
154
155 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 250 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
156 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 251 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
157 my ($self, $value) = @_; 252 $hbox->add (new CFClient::UI::CheckBox
158 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 253 expand => 1, state => $CFG->{bgm_enable},
254 tooltip => "Enable background music playing",
255 connect_changed => sub {
256 $CFG->{bgm_enable} = $_[1];
257 }
159 }); 258 );
160 259 $hbox->add (new CFClient::UI::Slider
161 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 260 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
162 destroy_screen (); 261 tooltip => "The volume of the background music",
163 init_screen (); 262 connect_changed => sub {
263 $CFG->{bgm_volume} = $_[1];
264 CFClient::MixMusic::volume $_[1] * 128;
265 }
164 }); 266 );
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 {
272 audio_shutdown ();
273 audio_init ();
274 }
275 );
165 276
166 $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
167} 476}
168 477
169sub metaserver_dialog { 478sub metaserver_dialog {
170 my $dialog = new CFClient::UI::FancyFrame 479 my $dialog = new CFClient::UI::FancyFrame
480 title => "Metaserver",
171 child => (my $vbox = new CFClient::UI::VBox); 481 child => (my $vbox = new CFClient::UI::VBox);
172 482
173 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 483 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
174 484
175 $dialog 485 $dialog
… …
232 $HOST->set_text ($CFG->{host} = $host); 542 $HOST->set_text ($CFG->{host} = $host);
233 }), 543 }),
234 (new CFClient::UI::Empty expand => 1), 544 (new CFClient::UI::Empty expand => 1),
235 ]); 545 ]);
236 546
237 $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)
238 for 0 .. $#$m; 548 for 0 .. $#$m;
239 } 549 }
240 } 550 }
241 }); 551 });
242} 552}
243 553
244sub server_setup { 554sub server_setup {
245 my $dialog = new CFClient::UI::FancyFrame 555 my $dialog = new CFClient::UI::FancyFrame
556 title => "Server Setup",
246 child => (my $vbox = new CFClient::UI::VBox); 557 child => (my $vbox = new CFClient::UI::VBox);
247 558
248 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
249 $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]);
250 $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");
251 561
252 { 562 {
253 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 563 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
254 564
255 $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 {
256 my ($self, $value) = @_; 594 my ($self, $value) = @_;
257 $CFG->{host} = $value; 595 $CFG->{user} = $value;
258 }); 596 }
597 );
259 598
260 $METASERVER = metaserver_dialog;
261
262 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
263 update_metaserver $HOST;
264 });
265 }
266
267 $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");
268 $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 {
269 my ($self, $value) = @_; 605 my ($self, $value) = @_;
270 $CFG->{user} = $value;
271 });
272
273 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
274 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
275 my ($self, $value) = @_;
276 $CFG->{password} = $value; 606 $CFG->{password} = $value;
607 }
277 }); 608 );
278 609
279 $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");
280 $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 {
281 my ($self, $value) = @_; 617 my ($self, $value) = @_;
282 $CFG->{say_command} = $value; 618 $CFG->{say_command} = $value;
619 }
283 }); 620 );
284 621
285 $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");
286 $table->add (1, 7, new CFClient::UI::Slider 623 $table->add (1, 7, new CFClient::UI::Slider
287 req_w => 100, 624 req_w => 100,
288 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.",
289 connect_changed => sub { 628 connect_changed => sub {
290 my ($self, $value) = @_; 629 my ($self, $value) = @_;
291 630
292 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 631 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
293 }, 632 },
… …
300 $dialog 639 $dialog
301} 640}
302 641
303sub message_window { 642sub message_window {
304 my $window = new CFClient::UI::FancyFrame 643 my $window = new CFClient::UI::FancyFrame
644 title => "Messages",
305 border_bg => [1, 1, 1, 0.5], 645 border_bg => [1, 1, 1, 0.5],
306 bg => [0.3, 0.3, 0.3, 0.8], 646 bg => [0.3, 0.3, 0.3, 0.8],
307 user_w => int $::WIDTH / 3, 647 user_w => int $::WIDTH / 3,
308 user_h => int $::HEIGHT / 5, 648 user_h => int $::HEIGHT / 5,
309 child => (my $vbox = new CFClient::UI::VBox); 649 child => (my $vbox = new CFClient::UI::VBox);
… …
351 691
352 $window 692 $window
353} 693}
354 694
355sub sdl_init { 695sub sdl_init {
356 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 696 CFClient::SDL_Init
357 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
358 and die "SDL::Init failed!\n"; 697 and die "SDL::Init failed!\n";
359} 698}
360 699
361sub init_screen { 700sub video_init {
362 sdl_init; 701 sdl_init;
363 702
364 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 703 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
365 $FULLSCREEN = $CFG->{fullscreen}; 704 $FULLSCREEN = $CFG->{fullscreen};
366 $FAST = $CFG->{fast}; 705 $FAST = $CFG->{fast};
367 706
368 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 707 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
369 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
370 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
371 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
372
373 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
374 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
375 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
376 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
377
378 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
379 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
380 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
381
382 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
383 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
384 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
385 or die "SDL::SetVideoMode failed!\n"; 708 or die "SDL_SetVideoMode failed!\n";
386
387 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
388
389 $SDL_EV = new SDL::Event;
390 $SDL_EV->set_unicode (1);
391 709
392 $SDL_ACTIVE = 1; 710 $SDL_ACTIVE = 1;
393 711
394 $LAST_REFRESH = time - 0.01; 712 $LAST_REFRESH = time - 0.01;
395 713
396 CFClient::gl_init; 714 CFClient::gl_init;
397 715
398 $FONTSIZE = int $HEIGHT / 40; 716 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
399 717
400 ############################################################################# 718 #############################################################################
401 719
402 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 720 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
403 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 721 $DEBUG_STATUS->show;
404 722
405 $STATUS_LINE = new CFClient::UI::Label 723 $STATUS_LINE = new CFClient::UI::Label
406 padding => 0, 724 padding => 0,
407 y => $HEIGHT * 44 / 45 - $FONTSIZE; 725 y => $HEIGHT - $FONTSIZE * 1.8;
408 $CFClient::UI::ROOT->add ($STATUS_LINE); 726 $STATUS_LINE->show;
409 727
410 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 728 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
411 padding => 0, 729 padding => 0,
412 y => $HEIGHT * 44 / 45,
413 fontsize => $HEIGHT / 45, 730 fontsize => 0.8,
414 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 731 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
415 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 732 $ALT_ENTER_MESSAGE->show;
733 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
416 734
417 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 735 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
418 $MAPWIDGET->focus_in; 736 $MAPWIDGET->focus_in;
419 $MAPWIDGET->connect (activate_console => sub { 737 $MAPWIDGET->connect (activate_console => sub {
420 my ($mapwidget, $preset) = @_; 738 my ($mapwidget, $preset) = @_;
421 739
422 if ($CONSOLE) { 740 if ($CONSOLE) {
… …
432 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 750 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
433 751
434 $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);
435 $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);
436 $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);
437 758
438 $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 {
439 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 760 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
440 status "Configuration Saved"; 761 status "Configuration Saved";
441 }); 762 });
442 763
443 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 764 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
444
445 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
446 $tgw->add (my $hbox = new CFClient::UI::HBox ());
447
448 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food', expand => 1));
449 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana', expand => 1));
450 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp', expand => 1));
451 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace', expand => 1));
452
453 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
454 $CFClient::UI::ROOT->add ($tgw);
455} 765}
456 766
457sub destroy_screen { 767sub video_shutdown {
458 $CFClient::UI::ROOT->{children} = []; 768 $CFClient::UI::ROOT->{children} = [];
459 undef $SDL_ACTIVE; 769 undef $SDL_ACTIVE;
770}
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#
773my $bgmusic;#TODO#hack#d#
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
785sub audio_init {
786 if ($CFG->{audio_enable}) {
787 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
788 $SDL_MIXER = !CFClient::Mix_OpenAudio;
789 CFClient::Mix_AllocateChannels 8;
790 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
791
792 audio_music_finished;
793
794 while (<$fh>) {
795 next if /^\s*#/;
796 next if /^\s*$/;
797
798 my ($file, $volume, $event) = split /\s+/, $_, 3;
799
800 push @SOUNDS, "$volume,$file";
801
802 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
803 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
804 $chunk->volume ($volume * 128 / 100);
805 $chunk
806 };
807 }
808 } else {
809 status "unable to open sound config: $!";
810 }
811 }
812}
813
814sub audio_shutdown {
815 CFClient::Mix_CloseAudio if $SDL_MIXER;
460 undef $SDL_EV; 816 undef $SDL_MIXER;
461 SDL::Quit; 817 @SOUNDS = ();
818 %AUDIO_CHUNKS = ();
462} 819}
463 820
464my %animate_object; 821my %animate_object;
465my $animate_timer; 822my $animate_timer;
466 823
… …
476 $want_refresh = 0; 833 $want_refresh = 0;
477 $can_refresh = 0; 834 $can_refresh = 0;
478 835
479 $CFClient::UI::ROOT->draw; 836 $CFClient::UI::ROOT->draw;
480 837
481 SDL::GLSwapBuffers; 838 CFClient::SDL_GL_SwapBuffers;
482 839
483 $LAST_REFRESH = $NOW; 840 $LAST_REFRESH = $NOW;
484} 841}
485 842
486my $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 {
487 $NOW = time; 844 $NOW = time;
488 845
489 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 846 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
490 while $SDL_EV->poll; 847 for CFClient::SDL_PollEvent;
491 848
492 if (%animate_object) { 849 if (%animate_object) {
493 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 850 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
494 $want_refresh++; 851 $want_refresh++;
495 } 852 }
… …
518@conn::ISA = Crossfire::Protocol::; 875@conn::ISA = Crossfire::Protocol::;
519 876
520sub conn::stats_update { 877sub conn::stats_update {
521 my ($self, $stats) = @_; 878 my ($self, $stats) = @_;
522 879
523 # i love text protocols!!! 880 update_stats_window ($stats);
524 # FIXME: the stats are somehow weird
525 my $hp = $stats->{1};
526 my $hp_m = $stats->{2};
527 my $sp = $stats->{3};
528 my $sp_m = $stats->{4};
529 my $fo = $stats->{18};
530 my $fo_m = 1000;
531 my $gr = $stats->{23};
532 my $gr_m = $stats->{24};
533
534 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
535 $GAUGES->{hp}->set_value ($hp, $hp_m);
536 $GAUGES->{mana}->set_value ($sp, $sp_m);
537 $GAUGES->{food}->set_value ($fo, $fo_m);
538 $GAUGES->{grace}->set_value ($gr, $gr_m);
539} 881}
540 882
541sub conn::user_send { 883sub conn::user_send {
542 my ($self, $command) = @_; 884 my ($self, $command) = @_;
543 885
… …
568 910
569 my ($hash, $x, $y, $w, $h) = @$map_info; 911 my ($hash, $x, $y, $w, $h) = @$map_info;
570 912
571 my $data = $MAP->get_rect ($x, $y, $w, $h); 913 my $data = $MAP->get_rect ($x, $y, $w, $h);
572 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 914 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
573
574 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 915 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
575
576} 916}
577 917
578sub conn::map_clear { 918sub conn::map_clear {
579 my ($self) = @_; 919 my ($self) = @_;
580 920
581 $self->flush_map; 921 $self->flush_map;
582 delete $self->{neigh}; 922 delete $self->{neigh_map};
583 923
584 $MAP->clear; 924 $MAP->clear;
585} 925}
586 926
587 927
588sub conn::load_map($$$) { 928sub conn::load_map($$$) {
589 my ($self, $hash, $x, $y) = @_; 929 my ($self, $hash, $x, $y) = @_;
590 930
591 if (defined (my $data = $MAPCACHE->get ($hash))) { 931 if (defined (my $data = $MAPCACHE->get ($hash))) {
592 $data = Compress::LZF::decompress $data; 932 $data = Compress::LZF::decompress $data;
593 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#
594 for my $id ($MAP->set_rect ($x, $y, $data)) { 934 for my $id ($MAP->set_rect ($x, $y, $data)) {
595 my $data = $TILECACHE->get ($id) 935 my $data = $TILECACHE->get ($id)
596 or next; 936 or next;
597 937
598 $self->set_texture ($id => $data); 938 $self->set_texture ($id => $data);
599 } 939 }
600 } 940 }
601} 941}
602 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.
603sub conn::flood_fill { 948sub conn::flood_fill {
604 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 949 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
605 950
606 # the server does not allow map paths > 6 951 # the server does not allow map paths > 6
607 return if 6 <= length $path; 952 return if 6 <= length $path;
608 953
609 for my $tile (1..4) { 954 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
610 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
611 next unless $flags & (1 << ($tile - 1)); 967 next unless $flags & (1 << ($tile - 1));
968 next if $self->{neigh_grid}{$gx, $gy}++;
612 969
613 my $neigh = $self->{neigh}{$hash} ||= []; 970 my $neigh = $self->{neigh_map}{$hash} ||= [];
614 971 if (my $info = $neigh->[$tile]) {
615 $self->send_mapinfo ("spatial $path$tile", sub {
616 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 972 my ($flags, $x, $y, $w, $h, $hash) = @$info;
617 973
618 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
619 return if $mode ne "spatial";
620
621 $x += $MAP->ox;
622 $y += $MAP->oy;
623
624 $self->load_map ($hash, $x, $y)
625 unless $self->{neigh}{$hash}[5]++;#d#
626
627 $neigh->[$tile] = [$x, $y, $w, $h];
628
629 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 974 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
630 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 });
631 }); 994 }
632 } 995 }
633} 996}
634 997
635sub conn::map_change { 998sub conn::map_change {
636 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 999 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
637 1000
638 $self->flush_map; 1001 $self->flush_map;
639 1002
640 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1003 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
641 1004
642 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
643
644 my $mapmapw = 250; 1005 my $mapmapw = 250;
645 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 ];
646 1012
1013 delete $self->{neigh_grid};
647 $self->flood_fill ("", $hash, $flags, 1014 $self->flood_fill (0, 0, "", $hash, $flags);
648 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
649 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
650 1015
651 $x += $ox; 1016 $x += $ox;
652 $y += $oy; 1017 $y += $oy;
653 1018
654 $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);
655 1024
656 $self->load_map ($hash, $x, $y); 1025 $self->load_map ($hash, $x, $y);
657} 1026}
658 1027
659sub conn::face_find { 1028sub conn::face_find {
… …
711 1080
712 $tex 1081 $tex
713 }; 1082 };
714} 1083}
715 1084
1085sub conn::sound_play {
1086 my ($self, $x, $y, $soundnum, $type) = @_;
1087
1088 $SDL_MIXER
1089 or return;
1090
1091 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1092 or return;
1093
1094 $chunk->play;
1095# warn "sound $x,$y,$soundnum,$type\n";#d#
1096}
1097
716sub conn::query { 1098sub conn::query {
717 my ($self, $flags, $prompt) = @_; 1099 my ($self, $flags, $prompt) = @_;
718 1100
719 #TODO 1101 #TODO, display dialog with relevant information
720 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1102 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
721} 1103}
722 1104
723sub conn::drawinfo { 1105sub conn::drawinfo {
724 my ($self, $color, $text) = @_; 1106 my ($self, $color, $text) = @_;
… …
740 ); 1122 );
741 1123
742 $LOGVIEW->add_paragraph ($color[$color], $text); 1124 $LOGVIEW->add_paragraph ($color[$color], $text);
743} 1125}
744 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
745%SDL_CB = ( 1151%SDL_CB = (
746 SDL_QUIT() => sub { 1152 CFClient::SDL_QUIT => sub {
747 Event::unloop -1; 1153 Event::unloop -1;
748 }, 1154 },
749 SDL_VIDEORESIZE() => sub { 1155 CFClient::SDL_VIDEORESIZE => sub {
750 }, 1156 },
751 SDL_VIDEOEXPOSE() => sub { 1157 CFClient::SDL_VIDEOEXPOSE => \&refresh,
752 refresh;
753 },
754 SDL_KEYDOWN() => sub {
755 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
756 # alt-enter
757 destroy_screen;
758 $CFG->{fullscreen} = !$CFG->{fullscreen};
759 init_screen;
760 } else {
761 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
762 }
763 },
764 SDL_KEYUP() => sub {
765 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
766 },
767 SDL_MOUSEMOTION() => sub {
768 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
769 },
770 SDL_MOUSEBUTTONDOWN() => sub {
771 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
772 },
773 SDL_MOUSEBUTTONUP() => sub {
774 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
775 },
776 SDL_ACTIVEEVENT() => sub { 1158 CFClient::SDL_ACTIVEEVENT => sub {
777# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1159# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
778 }, 1160 },
1161 CFClient::SDL_KEYDOWN => sub {
1162 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1163 # alt-enter
1164 video_shutdown;
1165 $CFG->{fullscreen} = !$CFG->{fullscreen};
1166 video_init;
1167 } else {
1168 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1169 }
1170 },
1171 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1172 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1173 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1174 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1175 CFClient::SDL_USEREVENT => \&audio_music_finished,
779); 1176);
780 1177
781############################################################################# 1178#############################################################################
1179
1180$SIG{INT} = $SIG{TERM} = sub { exit };
782 1181
783$TILECACHE = CFClient::db_table "tilecache"; 1182$TILECACHE = CFClient::db_table "tilecache";
784$FACEMAP = CFClient::db_table "facemap"; 1183$FACEMAP = CFClient::db_table "facemap";
785 1184
786CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1185CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
792 fullscreen => 0, 1191 fullscreen => 0,
793 fast => 0, 1192 fast => 0,
794 fow_enable => 1, 1193 fow_enable => 1,
795 fow_intensity => 0.45, 1194 fow_intensity => 0.45,
796 fow_smooth => 0, 1195 fow_smooth => 0,
1196 gui_fontsize => 1,
797 log_fontsize => 14, 1197 log_fontsize => 1,
1198 gauge_fontsize => 1,
1199 gauge_size => 0.35,
1200 stat_fontsize => 1,
798 mapsize => 100, 1201 mapsize => 100,
799 host => "crossfire.schmorp.de", 1202 host => "crossfire.schmorp.de",
800 say_command => 'say', 1203 say_command => 'say',
1204 audio_enable => 1,
1205 bgm_enable => 1,
1206 bgm_volume => 0.25,
801); 1207);
802 1208
803while (my ($k, $v) = each %DEF_CFG) { 1209while (my ($k, $v) = each %DEF_CFG) {
804 $CFG->{$k} = $v unless exists $CFG->{$k}; 1210 $CFG->{$k} = $v unless exists $CFG->{$k};
805} 1211}
806 1212
807sdl_init; 1213sdl_init;
808 1214
809@SDL_MODES = reverse 1215@SDL_MODES = reverse
810 grep $_->[0] >= 640 && $_->[1] >= 480, 1216 grep $_->[0] >= 640 && $_->[1] >= 480,
811 map [SDL::RectW ($_), SDL::RectH ($_)], 1217 CFClient::SDL_ListModes;
812 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
813 1218
814@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)";
815 1220
816$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1221$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
817 1222
… …
820 1225
821 CFClient::add_font $_ for @fonts; 1226 CFClient::add_font $_ for @fonts;
822 CFClient::set_font $fonts[0]; 1227 CFClient::set_font $fonts[0];
823} 1228}
824 1229
825init_screen; 1230video_init;
1231audio_init;
826 1232
827Event::loop; 1233Event::loop;
828 1234
1235END { CFClient::SDL_Quit }
829 1236
1237

Diff Legend

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