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.151 by root, Thu Apr 20 07:27:11 2006 UTC vs.
Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC

… …
45our $LOGVIEW; 45our $LOGVIEW;
46our $CONSOLE; 46our $CONSOLE;
47our $METASERVER; 47our $METASERVER;
48 48
49our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
50 51
51our $SDL_ACTIVE; 52our $SDL_ACTIVE;
52our %SDL_CB; 53our %SDL_CB;
53 54
54our $SDL_MIXER; 55our $SDL_MIXER;
… …
116 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
117 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
118 }); 119 });
119 $mode_slider->emit (changed => $mode_slider->{range}[0]); 120 $mode_slider->emit (changed => $mode_slider->{range}[0]);
120 121
122 my $row = 1;
123
121 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 124 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
122 $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 {
123 my ($self, $value) = @_; 126 my ($self, $value) = @_;
124 $CFG->{fullscreen} = $value; 127 $CFG->{fullscreen} = $value;
125 }); 128 });
126 129
127 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 130 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
128 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 131 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
129 my ($self, $value) = @_; 132 my ($self, $value) = @_;
130 $CFG->{fast} = $value; 133 $CFG->{fast} = $value;
131 }); 134 });
132 135
133 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 136 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
134 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 137 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
135 my ($self, $value) = @_; 138 my ($self, $value) = @_;
136 $CFG->{fow_enable} = $value; 139 $CFG->{fow_enable} = $value;
137 }); 140 });
138 141
139 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 142 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
140 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 143 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
141 my ($self, $value) = @_; 144 my ($self, $value) = @_;
142 $CFG->{fow_intensity} = $value; 145 $CFG->{fow_intensity} = $value;
143 }); 146 });
144 147
145 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 148 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
146 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 149 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
147 my ($self, $value) = @_; 150 my ($self, $value) = @_;
148 $CFG->{fow_smooth} = $value; 151 $CFG->{fow_smooth} = $value;
149 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 152 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
150 }); 153 });
151 154
152 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 155 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
153 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 156 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
154 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 157 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
155# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 158# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
156 }); 159 });
157 160
158 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 161 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
159 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 162 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
160 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 163 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
161 }); 164 });
162 165
166 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
167 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
168 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
169 &set_stats_window_fontsize;
170 });
171
172 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge width");
173 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_w_size}, 0.1, 0.5, 0.02], connect_changed => sub {
174 $CFG->{gauge_w_size} = $_[1];
175 my $h = int ($HEIGHT * $CFG->{gauge_size});
176 my $w = int ($WIDTH * $CFG->{gauge_w_size});
177 $GAUGES->{win}->set_size ($w, $h);
178 $GAUGES->{win}->{y} = $HEIGHT - $h;
179 $GAUGES->{win}->{x} = $WIDTH - $w;
180 $GAUGES->{win}->update;
181 });
182
183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge height");
184 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
185 $CFG->{gauge_size} = $_[1];
186 my $h = int ($HEIGHT * $CFG->{gauge_size});
187 my $w = int ($WIDTH * $CFG->{gauge_w_size});
188 $GAUGES->{win}->set_size ($w, $h);
189 $GAUGES->{win}->{y} = $HEIGHT - $h;
190 $GAUGES->{win}->{x} = $WIDTH - $w;
191 $GAUGES->{win}->update;
192 });
193
194
195 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
196 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
197 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
198 &set_gauge_window_fontsize;
199 $GAUGES->{win}->check_size;
200 $GAUGES->{win}->update;
201 });
202
203
204
163 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 205 $table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
164 video_shutdown (); 206 video_shutdown ();
165 video_init (); 207 video_init ();
166 }); 208 });
167 209
168 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 210 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
169 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { 211 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
170 $CFG->{audio_enable} = $_[1]; 212 $CFG->{audio_enable} = $_[1];
171 }); 213 });
172# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 214# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
173# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 215# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
174# $CFG->{effects_volume} = $_[1]; 216# $CFG->{effects_volume} = $_[1];
175# }); 217# });
176 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
177 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 219 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
178 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { 220 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
179 $CFG->{bgm_enable} = $_[1]; 221 $CFG->{bgm_enable} = $_[1];
180 }); 222 });
181 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 223 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
182 $CFG->{bgm_volume} = $_[1]; 224 $CFG->{bgm_volume} = $_[1];
183 CFClient::MixMusic::volume $_[1] * 128; 225 CFClient::MixMusic::volume $_[1] * 128;
184 }); 226 });
185 227
186 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 228 $table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
187 audio_shutdown (); 229 audio_shutdown ();
188 audio_init (); 230 audio_init ();
189 }); 231 });
190 232
191 $dialog 233 $dialog
234}
235
236sub set_stats_window_fontsize {
237 for (values %{$STATWIDS}) {
238 $_->set_fontsize ($::CFG->{stat_fontsize});
239 }
240}
241
242sub set_gauge_window_fontsize {
243 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
244 $_->set_fontsize ($::CFG->{gauge_fontsize});
245 }
246}
247
248sub make_gauge_window {
249 my $gh = int ($HEIGHT * $CFG->{gauge_size});
250 my $gw = int ($WIDTH * $CFG->{gauge_w_size});
251
252 my $win = new CFClient::UI::Frame (
253 y => $HEIGHT - $gh, x => $WIDTH - $gw, req_w => $gw, req_h => $gh
254 );
255 $win->add (my $vb = new CFClient::UI::VBox);
256
257 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
258 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
259 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
260 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
261 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
262 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => -1, text => "XP:");
263 $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => -1, text => "Lvl:");
264
265
266 $GAUGES = {
267 exp => $exp, lvl => $lvl, win => $win,
268 food => $fg, mana => $mg, hp => $hg, grace => $gg
269 };
270 $win
271}
272
273sub make_stats_window {
274 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
275
276 $tgw->add (my $vb = new CFClient::UI::VBox);
277 $vb->add (my $uhb = new CFClient::UI::HBox);
278 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
279 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
280
281 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
282
283 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
284
285 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
286 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
287 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
288 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
289 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
290 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
291 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
292
293 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
294 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
295 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
296 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
297 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
298 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
299 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
300
301 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
302 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
303 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
304 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
305 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
306 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
307
308 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
309 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
310 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
311 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
312 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
313 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
314
315 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
316
317 my $row = 0;
318 my $col = 0;
319
320 for (qw/slow holyw conf fire depl magic
321 drain acid pois para deat phys
322 blind fear tund elec cold ghit/)
323 {
324 $tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
325 $tbl2->add ($col + 1, $row,
326 $STATWIDS->{"res_$_"} =
327 new CFClient::UI::Label text => "0", align => -1, valign => 0
328 );
329
330 $row++;
331 if ($row % 6 == 0) {
332 $col += 2;
333 $row = 0;
334 }
335 }
336
337 &set_stats_window_fontsize;
338 update_stats_window ({});
339
340 $tgw
341}
342
343sub update_stats_window {
344 my ($stats) = @_;
345
346 # i love text protocols!!!
347 my $hp = $stats->{1} * 1;
348 my $hp_m = $stats->{2} * 1;
349 my $sp = $stats->{3} * 1;
350 my $sp_m = $stats->{4} * 1;
351 my $fo = $stats->{18} * 1;
352 my $fo_m = 999;
353 my $gr = $stats->{23} * 1;
354 my $gr_m = $stats->{24} * 1;
355
356 $GAUGES->{hp} ->set_value ($hp, $hp_m);
357 $GAUGES->{mana} ->set_value ($sp, $sp_m);
358 $GAUGES->{food} ->set_value ($fo, $fo_m);
359 $GAUGES->{grace} ->set_value ($gr, $gr_m);
360 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}));
361 $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
362 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
363
364 if (0) { # this code can vanish, just wanted to preserver it for a checkin
365 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
366 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
367 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
368 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
369 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
370 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
371 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
372 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
373 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
374 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
375 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
376 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
377 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
378 } else {
379 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
380 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
381 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
382 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
383 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
384 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
385 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
386 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
387 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
388 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
389 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
390 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
391 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
392 }
393
394 my %tbl = (
395 phys => 100,
396 magic => 101,
397 fire => 102,
398 elec => 103,
399 cold => 104,
400 conf => 105,
401 acid => 106,
402 drain => 107,
403 ghit => 108,
404 pois => 109,
405 slow => 110,
406 para => 111,
407 tund => 112,
408 fear => 113,
409 deat => 115,
410 holyw => 116,
411 blind => 117
412 );
413
414 for (keys %tbl) {
415 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
416 }
417
192} 418}
193 419
194sub metaserver_dialog { 420sub metaserver_dialog {
195 my $dialog = new CFClient::UI::FancyFrame 421 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver", 422 title => "Metaserver",
… …
443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 669 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 670 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445 status "Configuration Saved"; 671 status "Configuration Saved";
446 }); 672 });
447 673
674 $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
675 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
676
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 677 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449 678
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452 679
453 $hbox->add (my $hg = new CFClient::UI::Gauge (type => 'hp'));
454 $hbox->add (my $mg = new CFClient::UI::Gauge (type => 'mana'));
455 $hbox->add (my $gg = new CFClient::UI::Gauge (type => 'grace'));
456 $hbox->add (my $fg = new CFClient::UI::Gauge (type => 'food'));
457
458 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459 $CFClient::UI::ROOT->add ($tgw);
460} 680}
461 681
462sub video_shutdown { 682sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = []; 683 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE; 684 undef $SDL_ACTIVE;
465} 685}
466 686
687my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
467my $bgmusic;#TODO#hack#d# 688my $bgmusic;#TODO#hack#d#
689
690sub audio_music_finished {
691 return unless $CFG->{bgm_enable};
692
693 # TODO: hack, do play loop and mood music
694 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
695 $bgmusic->play (0);
696
697 push @bgmusic, shift @bgmusic;
698}
468 699
469sub audio_init { 700sub audio_init {
470 if ($CFG->{audio_enable}) { 701 if ($CFG->{audio_enable}) {
471 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 702 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
472
473 $SDL_MIXER = !CFClient::Mix_OpenAudio; 703 $SDL_MIXER = !CFClient::Mix_OpenAudio;
474 CFClient::Mix_AllocateChannels 8; 704 CFClient::Mix_AllocateChannels 8;
475 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 705 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
476 706
477 # TODO: hack, do play loop and mood music 707 audio_music_finished;
478 if ($CFG->{bgm_enable}) {
479 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
480 $bgmusic->play;
481 }
482 708
483 while (<$fh>) { 709 while (<$fh>) {
484 next if /^\s*#/; 710 next if /^\s*#/;
485 next if /^\s*$/; 711 next if /^\s*$/;
486 712
… …
564@conn::ISA = Crossfire::Protocol::; 790@conn::ISA = Crossfire::Protocol::;
565 791
566sub conn::stats_update { 792sub conn::stats_update {
567 my ($self, $stats) = @_; 793 my ($self, $stats) = @_;
568 794
569 # i love text protocols!!! 795 update_stats_window ($stats);
570 # FIXME: the stats are somehow weird
571 my $hp = $stats->{1};
572 my $hp_m = $stats->{2};
573 my $sp = $stats->{3};
574 my $sp_m = $stats->{4};
575 my $fo = $stats->{18};
576 my $fo_m = 999;
577 my $gr = $stats->{23};
578 my $gr_m = $stats->{24};
579
580 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
581 $GAUGES->{hp} ->set_value ($hp, $hp_m);
582 $GAUGES->{mana} ->set_value ($sp, $sp_m);
583 $GAUGES->{food} ->set_value ($fo, $fo_m);
584 $GAUGES->{grace}->set_value ($gr, $gr_m);
585} 796}
586 797
587sub conn::user_send { 798sub conn::user_send {
588 my ($self, $command) = @_; 799 my ($self, $command) = @_;
589 800
… …
614 825
615 my ($hash, $x, $y, $w, $h) = @$map_info; 826 my ($hash, $x, $y, $w, $h) = @$map_info;
616 827
617 my $data = $MAP->get_rect ($x, $y, $w, $h); 828 my $data = $MAP->get_rect ($x, $y, $w, $h);
618 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 829 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
619
620 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 830 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
621
622} 831}
623 832
624sub conn::map_clear { 833sub conn::map_clear {
625 my ($self) = @_; 834 my ($self) = @_;
626 835
… …
634sub conn::load_map($$$) { 843sub conn::load_map($$$) {
635 my ($self, $hash, $x, $y) = @_; 844 my ($self, $hash, $x, $y) = @_;
636 845
637 if (defined (my $data = $MAPCACHE->get ($hash))) { 846 if (defined (my $data = $MAPCACHE->get ($hash))) {
638 $data = Compress::LZF::decompress $data; 847 $data = Compress::LZF::decompress $data;
639 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 848 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
640 for my $id ($MAP->set_rect ($x, $y, $data)) { 849 for my $id ($MAP->set_rect ($x, $y, $data)) {
641 my $data = $TILECACHE->get ($id) 850 my $data = $TILECACHE->get ($id)
642 or next; 851 or next;
643 852
644 $self->set_texture ($id => $data); 853 $self->set_texture ($id => $data);
645 } 854 }
646 } 855 }
647} 856}
648 857
858# this method does a "flood fill" into every tile direction
859# it assumes that tiles are arranged in a rectangular grid,
860# i.e. a map is the same as the left of the right map etc.
861# failure to comply are harmless and result in display errors
862# at worst.
649sub conn::flood_fill { 863sub conn::flood_fill {
650 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 864 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651 865
652 # the server does not allow map paths > 6 866 # the server does not allow map paths > 6
653 return if 6 <= length $path; 867 return if 6 <= length $path;
… …
705 919
706 my $mapmapw = 250; 920 my $mapmapw = 250;
707 my $mapmaph = 250; 921 my $mapmaph = 250;
708 922
709 $self->{neigh_rect} = [ 923 $self->{neigh_rect} = [
710 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 924 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
711 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5, 925 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
712 ]; 926 ];
713 927
714 delete $self->{neigh_grid}; 928 delete $self->{neigh_grid};
715 $self->flood_fill (0, 0, "", $hash, $flags); 929 $self->flood_fill (0, 0, "", $hash, $flags);
716 930
717 $x += $ox; 931 $x += $ox;
718 $y += $oy; 932 $y += $oy;
719 933
720 $self->{map_info} = [$hash, $x, $y, $w, $h]; 934 $self->{map_info} = [$hash, $x, $y, $w, $h];
935
936 my $map = $self->{map_info}[0];
937 $map =~ s/^.*?\/([^\/]+)$/\1/;
938 $STATWIDS->{map}->set_text ("Map: " . $map);
721 939
722 $self->load_map ($hash, $x, $y); 940 $self->load_map ($hash, $x, $y);
723} 941}
724 942
725sub conn::face_find { 943sub conn::face_find {
… …
849 CFClient::SDL_QUIT => sub { 1067 CFClient::SDL_QUIT => sub {
850 Event::unloop -1; 1068 Event::unloop -1;
851 }, 1069 },
852 CFClient::SDL_VIDEORESIZE => sub { 1070 CFClient::SDL_VIDEORESIZE => sub {
853 }, 1071 },
854 CFClient::SDL_VIDEOEXPOSE => sub { 1072 CFClient::SDL_VIDEOEXPOSE => \&refresh,
855 refresh; 1073 CFClient::SDL_ACTIVEEVENT => sub {
1074# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
856 }, 1075 },
857 CFClient::SDL_KEYDOWN => sub { 1076 CFClient::SDL_KEYDOWN => sub {
858 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1077 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
859 # alt-enter 1078 # alt-enter
860 video_shutdown; 1079 video_shutdown;
… …
862 video_init; 1081 video_init;
863 } else { 1082 } else {
864 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1083 CFClient::UI::feed_sdl_key_down_event ($_[0]);
865 } 1084 }
866 }, 1085 },
867 CFClient::SDL_KEYUP => sub { 1086 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
868 CFClient::UI::feed_sdl_key_up_event ($_[0]); 1087 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
869 }, 1088 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
870 CFClient::SDL_MOUSEMOTION => sub { 1089 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
871 CFClient::UI::feed_sdl_motion_event ($_[0]); 1090 CFClient::SDL_USEREVENT => \&audio_music_finished,
872 },
873 CFClient::SDL_MOUSEBUTTONDOWN => sub {
874 CFClient::UI::feed_sdl_button_down_event ($_[0]);
875 },
876 CFClient::SDL_MOUSEBUTTONUP => sub {
877 CFClient::UI::feed_sdl_button_up_event ($_[0]);
878 },
879 CFClient::SDL_ACTIVEEVENT => sub {
880# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
881 },
882); 1091);
883 1092
884############################################################################# 1093#############################################################################
885 1094
886$SIG{INT} = $SIG{TERM} = sub { exit }; 1095$SIG{INT} = $SIG{TERM} = sub { exit };
… …
898 fast => 0, 1107 fast => 0,
899 fow_enable => 1, 1108 fow_enable => 1,
900 fow_intensity => 0.45, 1109 fow_intensity => 0.45,
901 fow_smooth => 0, 1110 fow_smooth => 0,
902 gui_fontsize => 1, 1111 gui_fontsize => 1,
903 log_fontsize => 14, 1112 log_fontsize => 1,
1113 gauge_fontsize => 1,
1114 gauge_size => 0.35,
1115 gauge_w_size => 0.14,
1116 stat_fontsize => 1,
904 mapsize => 100, 1117 mapsize => 100,
905 host => "crossfire.schmorp.de", 1118 host => "crossfire.schmorp.de",
906 say_command => 'say', 1119 say_command => 'say',
907 audio_enable => 1, 1120 audio_enable => 1,
908 bgm_enable => 1, 1121 bgm_enable => 1,

Diff Legend

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