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.125 by elmex, Mon Apr 17 20:29:37 2006 UTC vs.
Revision 1.164 by root, Sun Apr 23 01:05:04 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 state => $CFG->{fullscreen}, connect_changed => sub {
127 my ($self, $value) = @_; 126 my ($self, $value) = @_;
128 $CFG->{fullscreen} = $value; 127 $CFG->{fullscreen} = $value;
129 }); 128 });
130 129
131 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 130 $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 { 131 $table->add (1, $row++, new CFClient::UI::CheckBox
132 state => $CFG->{fast},
133 tooltip => "Lower the visual quality considerably to speed up rendering.",
134 connect_changed => sub {
133 my ($self, $value) = @_; 135 my ($self, $value) = @_;
134 $CFG->{fast} = $value; 136 $CFG->{fast} = $value;
137 }
135 }); 138 );
136 139
137 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 140 $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 { 141 $table->add (1, $row++, new CFClient::UI::CheckBox
142 state => $CFG->{fow_enable},
143 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
144 connect_changed => sub {
139 my ($self, $value) = @_; 145 my ($self, $value) = @_;
140 $CFG->{fow_enable} = $value; 146 $CFG->{fow_enable} = $value;
147 }
141 }); 148 );
142 149
143 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 150 $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 { 151 $table->add (1, $row++, new CFClient::UI::Slider
152 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
153 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
154 connect_changed => sub {
145 my ($self, $value) = @_; 155 my ($self, $value) = @_;
146 $CFG->{fow_intensity} = $value; 156 $CFG->{fow_intensity} = $value;
157 }
147 }); 158 );
148 159
149 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 160 $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 { 161 $table->add (1, $row++, new CFClient::UI::CheckBox
162 state => $CFG->{fow_smooth},
163 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
164 connect_changed => sub {
151 my ($self, $value) = @_; 165 my ($self, $value) = @_;
152 $CFG->{fow_smooth} = $value; 166 $CFG->{fow_smooth} = $value;
167 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
168 }
169 );
170
171 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
172 $table->add (1, $row++, new CFClient::UI::Slider
173 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
174 tooltip => "The font size used by most GUI elements",
175 connect_changed => sub {
176 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
177# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
178 }
179 );
180
181 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
182 $table->add (1, $row++, new CFClient::UI::Slider
183 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
184 tooltip => "The font size used by the server log window only",
185 connect_changed => sub {
186 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
187 }
188 );
189
190 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
191
192 $table->add (1, $row++, new CFClient::UI::Slider
193 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
194 tooltip => "The font size used by the statistics window only",
195 connect_changed => sub {
196 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
197 &set_stats_window_fontsize;
198 }
199 );
200
201 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
202 $table->add (1, $row++, new CFClient::UI::Slider
203 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
204 tooltip => "Adjust the size of the stats gauges at the bottom right",
205 connect_changed => sub {
206 $CFG->{gauge_size} = $_[1];
207 my $h = int $HEIGHT * $CFG->{gauge_size};
208 $GAUGES->{win}->set_size ($WIDTH, $h);
209 $GAUGES->{win}->move (0, $HEIGHT - $h);
210 }
211 );
212
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
214 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
216 connect_changed => sub {
217 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
218 &set_gauge_window_fontsize;
219 #$GAUGES->{win}->check_size;
220 #$GAUGES->{win}->update;
221 }
222 );
223
224 $table->add (1, $row++, new CFClient::UI::Button
225 expand => 1, align => 0, text => "Apply",
226 tooltip => "Apply the video settings (unless they are auto-apply)",
227 connect_activate => sub {
228 video_shutdown ();
229 video_init ();
230 }
231 );
232
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
234 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{audio_enable},
236 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
237 connect_changed => sub {
238 $CFG->{audio_enable} = $_[1];
239 }
240 );
241# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
242# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
243# $CFG->{effects_volume} = $_[1];
153 }); 244# });
154
155 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 245 $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 { 246 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
157 my ($self, $value) = @_; 247 $hbox->add (new CFClient::UI::CheckBox
158 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 248 expand => 1, state => $CFG->{bgm_enable},
249 tooltip => "Enable background music playing",
250 connect_changed => sub {
251 $CFG->{bgm_enable} = $_[1];
252 }
159 }); 253 );
160 254 $hbox->add (new CFClient::UI::Slider
161 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 255 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
162 destroy_screen (); 256 tooltip => "The volume of the background music",
163 init_screen (); 257 connect_changed => sub {
258 $CFG->{bgm_volume} = $_[1];
259 CFClient::MixMusic::volume $_[1] * 128;
260 }
164 }); 261 );
262
263 $table->add (1, $row++, new CFClient::UI::Button
264 expand => 1, align => 0, text => "Apply",
265 tooltip => "Apply the audio settings that are not auto-apply",
266 connect_activate => sub {
267 audio_shutdown ();
268 audio_init ();
269 }
270 );
165 271
166 $dialog 272 $dialog
273}
274
275sub set_stats_window_fontsize {
276 for (values %{$STATWIDS}) {
277 $_->set_fontsize ($::CFG->{stat_fontsize});
278 }
279}
280
281sub set_gauge_window_fontsize {
282 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
283 $_->set_fontsize ($::CFG->{gauge_fontsize});
284 }
285}
286
287sub make_gauge_window {
288 my $gh = int ($HEIGHT * $CFG->{gauge_size});
289# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
290
291 my $win = new CFClient::UI::Frame (
292 y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
293 );
294 $win->add (my $vb = new CFClient::UI::VBox);
295
296 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
297
298
299 $hbg->add (new CFClient::UI::Empty expand => 1);
300 $hbg->add (my $hb = new CFClient::UI::HBox);
301 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp');
302 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana');
303 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace');
304 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food');
305
306 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:");
307# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:");
308 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
309
310
311 $GAUGES = {
312 exp => $exp,# lvl => $lvl,
313 win => $win, range => $rng,
314 food => $fg, mana => $mg, hp => $hg, grace => $gg
315 };
316 $win
317}
318
319sub make_stats_window {
320 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
321
322 $tgw->add (my $vb = new CFClient::UI::VBox);
323 $vb->add (my $uhb = new CFClient::UI::HBox);
324 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
325 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
326
327 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
328
329 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
330
331 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
332 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
333 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
334 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
335 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
336 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
337 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
338
339 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
340 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
341 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
342 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
343 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
344 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
345 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
346
347 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
348 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
349 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
350 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
351 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
352 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
353
354 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
355 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
356 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
357 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
358 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
359 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
360
361 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
362
363 my $row = 0;
364 my $col = 0;
365
366 for (qw/slow holyw conf fire depl magic
367 drain acid pois para deat phys
368 blind fear tund elec cold ghit/)
369 {
370 $tbl2->add ($col, $row,
371 $STATWIDS->{"res_$_"} =
372 new CFClient::UI::Label text => "0", align => +1, valign => 0
373 );
374 $tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
375
376 $row++;
377 if ($row % 6 == 0) {
378 $col += 2;
379 $row = 0;
380 }
381 }
382
383 &set_stats_window_fontsize;
384 update_stats_window ({});
385
386 $tgw
387}
388
389sub update_stats_window {
390 my ($stats) = @_;
391
392 # i love text protocols!!!
393 my $hp = $stats->{1} * 1;
394 my $hp_m = $stats->{2} * 1;
395 my $sp = $stats->{3} * 1;
396 my $sp_m = $stats->{4} * 1;
397 my $fo = $stats->{18} * 1;
398 my $fo_m = 999;
399 my $gr = $stats->{23} * 1;
400 my $gr_m = $stats->{24} * 1;
401
402 $GAUGES->{hp} ->set_value ($hp, $hp_m);
403 $GAUGES->{mana} ->set_value ($sp, $sp_m);
404 $GAUGES->{food} ->set_value ($fo, $fo_m);
405 $GAUGES->{grace} ->set_value ($gr, $gr_m);
406 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1
407 ." LVL: " . $stats->{12} * 1);
408 my $rng = $stats->{20};
409 $rng =~ s/^Range: //; # thank you so much dear server
410 $GAUGES->{range} ->set_text ("Rng: " . $rng);
411# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
412 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
413
414 if (0) { # this code can vanish, just wanted to preserver it for a checkin
415 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
416 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
417 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
418 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
419 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
420 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
421 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
422 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
423 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
424 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
425 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
426 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
427 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
428 } else {
429 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
430 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
431 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
432 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
433 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
434 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
435 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
436 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
437 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
438 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
439 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
440 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
441 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
442 }
443
444 my %tbl = (
445 phys => 100,
446 magic => 101,
447 fire => 102,
448 elec => 103,
449 cold => 104,
450 conf => 105,
451 acid => 106,
452 drain => 107,
453 ghit => 108,
454 pois => 109,
455 slow => 110,
456 para => 111,
457 tund => 112,
458 fear => 113,
459 deat => 115,
460 holyw => 116,
461 blind => 117
462 );
463
464 for (keys %tbl) {
465 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
466 }
467
167} 468}
168 469
169sub metaserver_dialog { 470sub metaserver_dialog {
170 my $dialog = new CFClient::UI::FancyFrame 471 my $dialog = new CFClient::UI::FancyFrame
472 title => "Metaserver",
171 child => (my $vbox = new CFClient::UI::VBox); 473 child => (my $vbox = new CFClient::UI::VBox);
172 474
173 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 475 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
174 476
175 $dialog 477 $dialog
… …
232 $HOST->set_text ($CFG->{host} = $host); 534 $HOST->set_text ($CFG->{host} = $host);
233 }), 535 }),
234 (new CFClient::UI::Empty expand => 1), 536 (new CFClient::UI::Empty expand => 1),
235 ]); 537 ]);
236 538
237 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 539 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
238 for 0 .. $#$m; 540 for 0 .. $#$m;
239 } 541 }
240 } 542 }
241 }); 543 });
242} 544}
243 545
244sub server_setup { 546sub server_setup {
245 my $dialog = new CFClient::UI::FancyFrame 547 my $dialog = new CFClient::UI::FancyFrame
548 title => "Server Setup",
246 child => (my $vbox = new CFClient::UI::VBox); 549 child => (my $vbox = new CFClient::UI::VBox);
247 550
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]); 551 $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"); 552 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
251 553
252 { 554 {
253 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 555 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
254 556
255 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 557 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
256 my ($self, $value) = @_; 558 my ($self, $value) = @_;
257 $CFG->{host} = $value; 559 $CFG->{host} = $value;
258 }); 560 });
259 561
260 $METASERVER = metaserver_dialog; 562 $METASERVER = metaserver_dialog;
261 563
262 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 564 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
263 update_metaserver $HOST; 565 update_metaserver $HOST;
264 }); 566 });
265 } 567 }
266 568
267 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 569 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
268 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 570 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
269 my ($self, $value) = @_; 571 my ($self, $value) = @_;
270 $CFG->{user} = $value; 572 $CFG->{user} = $value;
271 }); 573 });
272 574
273 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 575 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
274 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 576 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
275 my ($self, $value) = @_; 577 my ($self, $value) = @_;
276 $CFG->{password} = $value; 578 $CFG->{password} = $value;
277 }); 579 });
278 580
279 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 581 $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 { 582 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
281 my ($self, $value) = @_; 583 my ($self, $value) = @_;
282 $CFG->{say_command} = $value; 584 $CFG->{say_command} = $value;
283 }); 585 });
284 586
285 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 587 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
286 $table->add (1, 7, new CFClient::UI::Slider 588 $table->add (1, 7, new CFClient::UI::Slider
287 req_w => 100, 589 req_w => 100,
288 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 590 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
289 connect_changed => sub { 591 connect_changed => sub {
290 my ($self, $value) = @_; 592 my ($self, $value) = @_;
… …
300 $dialog 602 $dialog
301} 603}
302 604
303sub message_window { 605sub message_window {
304 my $window = new CFClient::UI::FancyFrame 606 my $window = new CFClient::UI::FancyFrame
607 title => "Messages",
305 border_bg => [1, 1, 1, 0.5], 608 border_bg => [1, 1, 1, 0.5],
306 bg => [0.3, 0.3, 0.3, 0.8], 609 bg => [0.3, 0.3, 0.3, 0.8],
307 user_w => int $::WIDTH / 3, 610 user_w => int $::WIDTH / 3,
308 user_h => int $::HEIGHT / 5, 611 user_h => int $::HEIGHT / 5,
309 child => (my $vbox = new CFClient::UI::VBox); 612 child => (my $vbox = new CFClient::UI::VBox);
… …
351 654
352 $window 655 $window
353} 656}
354 657
355sub sdl_init { 658sub sdl_init {
356 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 659 CFClient::SDL_Init
357 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
358 and die "SDL::Init failed!\n"; 660 and die "SDL::Init failed!\n";
359} 661}
360 662
361sub init_screen { 663sub video_init {
362 sdl_init; 664 sdl_init;
363 665
364 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 666 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
365 $FULLSCREEN = $CFG->{fullscreen}; 667 $FULLSCREEN = $CFG->{fullscreen};
366 $FAST = $CFG->{fast}; 668 $FAST = $CFG->{fast};
367 669
368 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 670 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"; 671 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 672
392 $SDL_ACTIVE = 1; 673 $SDL_ACTIVE = 1;
393 674
394 $LAST_REFRESH = time - 0.01; 675 $LAST_REFRESH = time - 0.01;
395 676
396 CFClient::gl_init; 677 CFClient::gl_init;
397 678
398 $FONTSIZE = int $HEIGHT / 40; 679 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
399 680
400 ############################################################################# 681 #############################################################################
401 682
402 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 683 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
403 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 684 $DEBUG_STATUS->show;
404 685
405 $STATUS_LINE = new CFClient::UI::Label 686 $STATUS_LINE = new CFClient::UI::Label
406 padding => 0, 687 padding => 0,
407 y => $HEIGHT * 44 / 45 - $FONTSIZE; 688 y => $HEIGHT - $FONTSIZE * 1.8;
408 $CFClient::UI::ROOT->add ($STATUS_LINE); 689 $STATUS_LINE->show;
409 690
410 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 691 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
411 padding => 0, 692 padding => 0,
412 y => $HEIGHT * 44 / 45,
413 fontsize => $HEIGHT / 45, 693 fontsize => 0.8,
414 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 694 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
415 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 695 $ALT_ENTER_MESSAGE->show;
696 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
416 697
417 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 698 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
418 $MAPWIDGET->focus_in; 699 $MAPWIDGET->focus_in;
419 $MAPWIDGET->connect (activate_console => sub { 700 $MAPWIDGET->connect (activate_console => sub {
420 my ($mapwidget, $preset) = @_; 701 my ($mapwidget, $preset) = @_;
421 702
422 if ($CONSOLE) { 703 if ($CONSOLE) {
… …
438 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 719 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
439 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 720 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
440 status "Configuration Saved"; 721 status "Configuration Saved";
441 }); 722 });
442 723
724 $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
725 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
726
443 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 727 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
444 728
445 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 150, y => 0);
446 $tgw->add (my $hb = new CFClient::UI::HBox (req_w => 60, req_h => 150));
447 $hb->add (my $fg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'food', expand => 1));
448 $hb->add (my $mg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'mana', expand => 1));
449 $hb->add (my $hg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'hp', expand => 1));
450 $hb->add (my $gg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'grace', expand => 1));
451 729
452 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
453 $CFClient::UI::ROOT->add ($tgw);
454} 730}
455 731
456sub destroy_screen { 732sub video_shutdown {
457 $CFClient::UI::ROOT->{children} = []; 733 $CFClient::UI::ROOT->{children} = [];
458 undef $SDL_ACTIVE; 734 undef $SDL_ACTIVE;
735}
736
737my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
738my $bgmusic;#TODO#hack#d#
739
740sub audio_music_finished {
741 return unless $CFG->{bgm_enable};
742
743 # TODO: hack, do play loop and mood music
744 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
745 $bgmusic->play (0);
746
747 push @bgmusic, shift @bgmusic;
748}
749
750sub audio_init {
751 if ($CFG->{audio_enable}) {
752 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
753 $SDL_MIXER = !CFClient::Mix_OpenAudio;
754 CFClient::Mix_AllocateChannels 8;
755 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
756
757 audio_music_finished;
758
759 while (<$fh>) {
760 next if /^\s*#/;
761 next if /^\s*$/;
762
763 my ($file, $volume, $event) = split /\s+/, $_, 3;
764
765 push @SOUNDS, "$volume,$file";
766
767 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
768 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
769 $chunk->volume ($volume * 128 / 100);
770 $chunk
771 };
772 }
773 } else {
774 status "unable to open sound config: $!";
775 }
776 }
777}
778
779sub audio_shutdown {
780 CFClient::Mix_CloseAudio if $SDL_MIXER;
459 undef $SDL_EV; 781 undef $SDL_MIXER;
460 SDL::Quit; 782 @SOUNDS = ();
783 %AUDIO_CHUNKS = ();
461} 784}
462 785
463my %animate_object; 786my %animate_object;
464my $animate_timer; 787my $animate_timer;
465 788
… …
475 $want_refresh = 0; 798 $want_refresh = 0;
476 $can_refresh = 0; 799 $can_refresh = 0;
477 800
478 $CFClient::UI::ROOT->draw; 801 $CFClient::UI::ROOT->draw;
479 802
480 SDL::GLSwapBuffers; 803 CFClient::SDL_GL_SwapBuffers;
481 804
482 $LAST_REFRESH = $NOW; 805 $LAST_REFRESH = $NOW;
483} 806}
484 807
485my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 808my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
486 $NOW = time; 809 $NOW = time;
487 810
488 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 811 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
489 while $SDL_EV->poll; 812 for CFClient::SDL_PollEvent;
490 813
491 if (%animate_object) { 814 if (%animate_object) {
492 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 815 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
493 $want_refresh++; 816 $want_refresh++;
494 } 817 }
… …
517@conn::ISA = Crossfire::Protocol::; 840@conn::ISA = Crossfire::Protocol::;
518 841
519sub conn::stats_update { 842sub conn::stats_update {
520 my ($self, $stats) = @_; 843 my ($self, $stats) = @_;
521 844
522 # i love text protocols!!! 845 update_stats_window ($stats);
523 # FIXME: the stats are somehow weird
524 my $hp = $stats->{1};
525 my $hp_m = $stats->{2};
526 my $sp = $stats->{3};
527 my $sp_m = $stats->{4};
528 my $fo = $stats->{18};
529 my $fo_m = 1000;
530 my $gr = $stats->{23};
531 my $gr_m = $stats->{24};
532
533 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
534 $GAUGES->{hp}->set_value ($hp, $hp_m);
535 $GAUGES->{mana}->set_value ($sp, $sp_m);
536 $GAUGES->{food}->set_value ($fo, $fo_m);
537 $GAUGES->{grace}->set_value ($gr, $gr_m);
538} 846}
539 847
540sub conn::user_send { 848sub conn::user_send {
541 my ($self, $command) = @_; 849 my ($self, $command) = @_;
542 850
… …
567 875
568 my ($hash, $x, $y, $w, $h) = @$map_info; 876 my ($hash, $x, $y, $w, $h) = @$map_info;
569 877
570 my $data = $MAP->get_rect ($x, $y, $w, $h); 878 my $data = $MAP->get_rect ($x, $y, $w, $h);
571 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 879 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
572
573 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 880 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574
575} 881}
576 882
577sub conn::map_clear { 883sub conn::map_clear {
578 my ($self) = @_; 884 my ($self) = @_;
579 885
580 $self->flush_map; 886 $self->flush_map;
581 delete $self->{neigh}; 887 delete $self->{neigh_map};
582 888
583 $MAP->clear; 889 $MAP->clear;
584} 890}
585 891
586 892
587sub conn::load_map($$$) { 893sub conn::load_map($$$) {
588 my ($self, $hash, $x, $y) = @_; 894 my ($self, $hash, $x, $y) = @_;
589 895
590 if (defined (my $data = $MAPCACHE->get ($hash))) { 896 if (defined (my $data = $MAPCACHE->get ($hash))) {
591 $data = Compress::LZF::decompress $data; 897 $data = Compress::LZF::decompress $data;
592 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 898 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
593 for my $id ($MAP->set_rect ($x, $y, $data)) { 899 for my $id ($MAP->set_rect ($x, $y, $data)) {
594 my $data = $TILECACHE->get ($id) 900 my $data = $TILECACHE->get ($id)
595 or next; 901 or next;
596 902
597 $self->set_texture ($id => $data); 903 $self->set_texture ($id => $data);
598 } 904 }
599 } 905 }
600} 906}
601 907
908# this method does a "flood fill" into every tile direction
909# it assumes that tiles are arranged in a rectangular grid,
910# i.e. a map is the same as the left of the right map etc.
911# failure to comply are harmless and result in display errors
912# at worst.
602sub conn::flood_fill { 913sub conn::flood_fill {
603 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 914 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
604 915
605 # the server does not allow map paths > 6 916 # the server does not allow map paths > 6
606 return if 6 <= length $path; 917 return if 6 <= length $path;
607 918
608 for my $tile (1..4) { 919 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
609 next if $self->{neigh}{$hash}[$tile]; 920
921 for (
922 [1, 0, -1],
923 [2, 1, 0],
924 [3, 0, 1],
925 [4, -1, 0],
926 ) {
927 my ($tile, $dx, $dy) = @$_;
928
929 my $gx = $gx + $dx;
930 my $gy = $gy + $dy;
931
610 next unless $flags & (1 << ($tile - 1)); 932 next unless $flags & (1 << ($tile - 1));
933 next if $self->{neigh_grid}{$gx, $gy}++;
611 934
612 my $neigh = $self->{neigh}{$hash} ||= []; 935 my $neigh = $self->{neigh_map}{$hash} ||= [];
613 936 if (my $info = $neigh->[$tile]) {
614 $self->send_mapinfo ("spatial $path$tile", sub {
615 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 937 my ($flags, $x, $y, $w, $h, $hash) = @$info;
616 938
617 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
618 return if $mode ne "spatial";
619
620 $x += $MAP->ox;
621 $y += $MAP->oy;
622
623 $self->load_map ($hash, $x, $y)
624 unless $self->{neigh}{$hash}[5]++;#d#
625
626 $neigh->[$tile] = [$x, $y, $w, $h];
627
628 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 939 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
629 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 940 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
941
942 } else {
943 $self->send_mapinfo ("spatial $path$tile", sub {
944 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
945
946 return if $mode ne "spatial";
947
948 $x += $MAP->ox;
949 $y += $MAP->oy;
950
951 $self->load_map ($hash, $x, $y)
952 unless $self->{neigh_map}{$hash}[5]++;#d#
953
954 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
955
956 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
957 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
958 });
630 }); 959 }
631 } 960 }
632} 961}
633 962
634sub conn::map_change { 963sub conn::map_change {
635 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 964 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
636 965
637 $self->flush_map; 966 $self->flush_map;
638 967
639 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 968 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
640 969
641 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
642
643 my $mapmapw = 250; 970 my $mapmapw = 250;
644 my $mapmaph = 250; 971 my $mapmaph = 250;
972
973 $self->{neigh_rect} = [
974 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
975 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
976 ];
645 977
978 delete $self->{neigh_grid};
646 $self->flood_fill ("", $hash, $flags, 979 $self->flood_fill (0, 0, "", $hash, $flags);
647 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
648 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
649 980
650 $x += $ox; 981 $x += $ox;
651 $y += $oy; 982 $y += $oy;
652 983
653 $self->{map_info} = [$hash, $x, $y, $w, $h]; 984 $self->{map_info} = [$hash, $x, $y, $w, $h];
985
986 my $map = $self->{map_info}[0];
987 $map =~ s/^.*?\/([^\/]+)$/\1/;
988 $STATWIDS->{map}->set_text ("Map: " . $map);
654 989
655 $self->load_map ($hash, $x, $y); 990 $self->load_map ($hash, $x, $y);
656} 991}
657 992
658sub conn::face_find { 993sub conn::face_find {
… …
710 1045
711 $tex 1046 $tex
712 }; 1047 };
713} 1048}
714 1049
1050sub conn::sound_play {
1051 my ($self, $x, $y, $soundnum, $type) = @_;
1052
1053 $SDL_MIXER
1054 or return;
1055
1056 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1057 or return;
1058
1059 $chunk->play;
1060# warn "sound $x,$y,$soundnum,$type\n";#d#
1061}
1062
715sub conn::query { 1063sub conn::query {
716 my ($self, $flags, $prompt) = @_; 1064 my ($self, $flags, $prompt) = @_;
717 1065
718 #TODO 1066 #TODO, display dialog with relevant information
719 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1067 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
720} 1068}
721 1069
722sub conn::drawinfo { 1070sub conn::drawinfo {
723 my ($self, $color, $text) = @_; 1071 my ($self, $color, $text) = @_;
… …
739 ); 1087 );
740 1088
741 $LOGVIEW->add_paragraph ($color[$color], $text); 1089 $LOGVIEW->add_paragraph ($color[$color], $text);
742} 1090}
743 1091
1092sub conn::spell_add {
1093 my ($self, $spell) = @_;
1094
1095 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
1096 });
1097 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
1098 });
1099}
1100
1101sub conn::spell_delete {
1102 my ($self, $spell) = @_;
1103}
1104
1105sub conn::addme_success {
1106 my ($self) = @_;
1107
1108 for my $skill (values %{$self->{skill_info}}) {
1109 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1110 });
1111 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
1112 });
1113 }
1114}
1115
744%SDL_CB = ( 1116%SDL_CB = (
745 SDL_QUIT() => sub { 1117 CFClient::SDL_QUIT => sub {
746 Event::unloop -1; 1118 Event::unloop -1;
747 }, 1119 },
748 SDL_VIDEORESIZE() => sub { 1120 CFClient::SDL_VIDEORESIZE => sub {
749 }, 1121 },
750 SDL_VIDEOEXPOSE() => sub { 1122 CFClient::SDL_VIDEOEXPOSE => \&refresh,
751 refresh;
752 },
753 SDL_KEYDOWN() => sub {
754 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
755 # alt-enter
756 destroy_screen;
757 $CFG->{fullscreen} = !$CFG->{fullscreen};
758 init_screen;
759 } else {
760 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
761 }
762 },
763 SDL_KEYUP() => sub {
764 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
765 },
766 SDL_MOUSEMOTION() => sub {
767 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
768 },
769 SDL_MOUSEBUTTONDOWN() => sub {
770 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
771 },
772 SDL_MOUSEBUTTONUP() => sub {
773 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
774 },
775 SDL_ACTIVEEVENT() => sub { 1123 CFClient::SDL_ACTIVEEVENT => sub {
776# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1124# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
777 }, 1125 },
1126 CFClient::SDL_KEYDOWN => sub {
1127 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1128 # alt-enter
1129 video_shutdown;
1130 $CFG->{fullscreen} = !$CFG->{fullscreen};
1131 video_init;
1132 } else {
1133 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1134 }
1135 },
1136 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1137 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1138 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1139 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1140 CFClient::SDL_USEREVENT => \&audio_music_finished,
778); 1141);
779 1142
780############################################################################# 1143#############################################################################
1144
1145$SIG{INT} = $SIG{TERM} = sub { exit };
781 1146
782$TILECACHE = CFClient::db_table "tilecache"; 1147$TILECACHE = CFClient::db_table "tilecache";
783$FACEMAP = CFClient::db_table "facemap"; 1148$FACEMAP = CFClient::db_table "facemap";
784 1149
785CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1150CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
791 fullscreen => 0, 1156 fullscreen => 0,
792 fast => 0, 1157 fast => 0,
793 fow_enable => 1, 1158 fow_enable => 1,
794 fow_intensity => 0.45, 1159 fow_intensity => 0.45,
795 fow_smooth => 0, 1160 fow_smooth => 0,
1161 gui_fontsize => 1,
796 log_fontsize => 14, 1162 log_fontsize => 1,
1163 gauge_fontsize => 1,
1164 gauge_size => 0.35,
1165 stat_fontsize => 1,
797 mapsize => 100, 1166 mapsize => 100,
798 host => "crossfire.schmorp.de", 1167 host => "crossfire.schmorp.de",
799 say_command => 'say', 1168 say_command => 'say',
1169 audio_enable => 1,
1170 bgm_enable => 1,
1171 bgm_volume => 0.25,
800); 1172);
801 1173
802while (my ($k, $v) = each %DEF_CFG) { 1174while (my ($k, $v) = each %DEF_CFG) {
803 $CFG->{$k} = $v unless exists $CFG->{$k}; 1175 $CFG->{$k} = $v unless exists $CFG->{$k};
804} 1176}
805 1177
806sdl_init; 1178sdl_init;
807 1179
808@SDL_MODES = reverse 1180@SDL_MODES = reverse
809 grep $_->[0] >= 640 && $_->[1] >= 480, 1181 grep $_->[0] >= 640 && $_->[1] >= 480,
810 map [SDL::RectW ($_), SDL::RectH ($_)], 1182 CFClient::SDL_ListModes;
811 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
812 1183
813@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1184@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
814 1185
815$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1186$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
816 1187
… …
819 1190
820 CFClient::add_font $_ for @fonts; 1191 CFClient::add_font $_ for @fonts;
821 CFClient::set_font $fonts[0]; 1192 CFClient::set_font $fonts[0];
822} 1193}
823 1194
824init_screen; 1195video_init;
1196audio_init;
825 1197
826Event::loop; 1198Event::loop;
827 1199
1200END { CFClient::SDL_Quit }
828 1201
1202

Diff Legend

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