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.153 by root, Thu Apr 20 09:13:32 2006 UTC vs.
Revision 1.161 by elmex, Sun Apr 23 00:08:31 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 height");
173 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
174 $CFG->{gauge_size} = $_[1];
175 my $h = int ($HEIGHT * $CFG->{gauge_size});
176 $GAUGES->{win}->set_size ($WIDTH, $h);
177 $GAUGES->{win}->{y} = $HEIGHT - $h;
178 $GAUGES->{win}->{x} = 0;
179 $GAUGES->{win}->update;
180 });
181
182
183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
184 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
185 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
186 &set_gauge_window_fontsize;
187 $GAUGES->{win}->check_size;
188 $GAUGES->{win}->update;
189 });
190
191
192
163 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 193 $table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
164 video_shutdown (); 194 video_shutdown ();
165 video_init (); 195 video_init ();
166 }); 196 });
167 197
168 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 198 $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 { 199 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
170 $CFG->{audio_enable} = $_[1]; 200 $CFG->{audio_enable} = $_[1];
171 }); 201 });
172# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 202# $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 { 203# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
174# $CFG->{effects_volume} = $_[1]; 204# $CFG->{effects_volume} = $_[1];
175# }); 205# });
176 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 206 $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); 207 $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 { 208 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
179 $CFG->{bgm_enable} = $_[1]; 209 $CFG->{bgm_enable} = $_[1];
180 }); 210 });
181 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 211 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
182 $CFG->{bgm_volume} = $_[1]; 212 $CFG->{bgm_volume} = $_[1];
183 CFClient::MixMusic::volume $_[1] * 128; 213 CFClient::MixMusic::volume $_[1] * 128;
184 }); 214 });
185 215
186 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 216 $table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
187 audio_shutdown (); 217 audio_shutdown ();
188 audio_init (); 218 audio_init ();
189 }); 219 });
190 220
191 $dialog 221 $dialog
222}
223
224sub set_stats_window_fontsize {
225 for (values %{$STATWIDS}) {
226 $_->set_fontsize ($::CFG->{stat_fontsize});
227 }
228}
229
230sub set_gauge_window_fontsize {
231 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
232 $_->set_fontsize ($::CFG->{gauge_fontsize});
233 }
234}
235
236sub make_gauge_window {
237 my $gh = int ($HEIGHT * $CFG->{gauge_size});
238# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
239
240 my $win = new CFClient::UI::Frame (
241 y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
242 );
243 $win->add (my $vb = new CFClient::UI::VBox);
244
245 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
246
247
248 $hbg->add (new CFClient::UI::Empty expand => 1);
249 $hbg->add (my $hb = new CFClient::UI::HBox);
250 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp');
251 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana');
252 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace');
253 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food');
254
255 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:");
256# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:");
257 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
258
259
260 $GAUGES = {
261 exp => $exp,# lvl => $lvl,
262 win => $win, range => $rng,
263 food => $fg, mana => $mg, hp => $hg, grace => $gg
264 };
265 $win
266}
267
268sub make_stats_window {
269 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
270
271 $tgw->add (my $vb = new CFClient::UI::VBox);
272 $vb->add (my $uhb = new CFClient::UI::HBox);
273 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
274 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
275
276 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
277
278 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
279
280 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
281 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
282 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
283 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
284 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
285 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
286 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
287
288 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
289 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
290 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
291 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
292 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
293 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
294 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
295
296 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
297 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
298 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
299 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
300 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
301 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
302
303 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
304 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
305 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
306 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
307 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
308 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
309
310 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
311
312 my $row = 0;
313 my $col = 0;
314
315 for (qw/slow holyw conf fire depl magic
316 drain acid pois para deat phys
317 blind fear tund elec cold ghit/)
318 {
319 $tbl2->add ($col , $row,
320 $STATWIDS->{"res_$_"} =
321 new CFClient::UI::Label text => "0", align => +1, valign => 0
322 );
323 $tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
324
325 $row++;
326 if ($row % 6 == 0) {
327 $col += 2;
328 $row = 0;
329 }
330 }
331
332 &set_stats_window_fontsize;
333 update_stats_window ({});
334
335 $tgw
336}
337
338sub update_stats_window {
339 my ($stats) = @_;
340
341 # i love text protocols!!!
342 my $hp = $stats->{1} * 1;
343 my $hp_m = $stats->{2} * 1;
344 my $sp = $stats->{3} * 1;
345 my $sp_m = $stats->{4} * 1;
346 my $fo = $stats->{18} * 1;
347 my $fo_m = 999;
348 my $gr = $stats->{23} * 1;
349 my $gr_m = $stats->{24} * 1;
350
351 $GAUGES->{hp} ->set_value ($hp, $hp_m);
352 $GAUGES->{mana} ->set_value ($sp, $sp_m);
353 $GAUGES->{food} ->set_value ($fo, $fo_m);
354 $GAUGES->{grace} ->set_value ($gr, $gr_m);
355 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1
356 ." LVL: " . $stats->{12} * 1);
357 my $rng = $stats->{20};
358 $rng =~ s/^Range: //; # thank you so much dear server
359 $GAUGES->{range} ->set_text ("Rng: " . $rng);
360# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
361 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
362
363 if (0) { # this code can vanish, just wanted to preserver it for a checkin
364 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
365 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
366 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
367 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
368 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
369 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
370 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
371 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
372 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
373 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
374 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
375 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
376 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
377 } else {
378 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
379 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
380 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
381 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
382 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
383 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
384 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
385 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
386 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
387 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
388 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
389 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
390 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
391 }
392
393 my %tbl = (
394 phys => 100,
395 magic => 101,
396 fire => 102,
397 elec => 103,
398 cold => 104,
399 conf => 105,
400 acid => 106,
401 drain => 107,
402 ghit => 108,
403 pois => 109,
404 slow => 110,
405 para => 111,
406 tund => 112,
407 fear => 113,
408 deat => 115,
409 holyw => 116,
410 blind => 117
411 );
412
413 for (keys %tbl) {
414 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
415 }
416
192} 417}
193 418
194sub metaserver_dialog { 419sub metaserver_dialog {
195 my $dialog = new CFClient::UI::FancyFrame 420 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver", 421 title => "Metaserver",
… …
443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 668 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 669 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445 status "Configuration Saved"; 670 status "Configuration Saved";
446 }); 671 });
447 672
673 $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
674 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
675
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 676 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449 677
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452 678
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} 679}
461 680
462sub video_shutdown { 681sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = []; 682 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE; 683 undef $SDL_ACTIVE;
… …
478} 697}
479 698
480sub audio_init { 699sub audio_init {
481 if ($CFG->{audio_enable}) { 700 if ($CFG->{audio_enable}) {
482 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 701 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
483
484 $SDL_MIXER = !CFClient::Mix_OpenAudio; 702 $SDL_MIXER = !CFClient::Mix_OpenAudio;
485 CFClient::Mix_AllocateChannels 8; 703 CFClient::Mix_AllocateChannels 8;
486 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 704 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
487 705
488 audio_music_finished; 706 audio_music_finished;
… …
571@conn::ISA = Crossfire::Protocol::; 789@conn::ISA = Crossfire::Protocol::;
572 790
573sub conn::stats_update { 791sub conn::stats_update {
574 my ($self, $stats) = @_; 792 my ($self, $stats) = @_;
575 793
576 # i love text protocols!!! 794 update_stats_window ($stats);
577 # FIXME: the stats are somehow weird
578 my $hp = $stats->{1};
579 my $hp_m = $stats->{2};
580 my $sp = $stats->{3};
581 my $sp_m = $stats->{4};
582 my $fo = $stats->{18};
583 my $fo_m = 999;
584 my $gr = $stats->{23};
585 my $gr_m = $stats->{24};
586
587 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
588 $GAUGES->{hp} ->set_value ($hp, $hp_m);
589 $GAUGES->{mana} ->set_value ($sp, $sp_m);
590 $GAUGES->{food} ->set_value ($fo, $fo_m);
591 $GAUGES->{grace}->set_value ($gr, $gr_m);
592} 795}
593 796
594sub conn::user_send { 797sub conn::user_send {
595 my ($self, $command) = @_; 798 my ($self, $command) = @_;
596 799
… …
726 929
727 $x += $ox; 930 $x += $ox;
728 $y += $oy; 931 $y += $oy;
729 932
730 $self->{map_info} = [$hash, $x, $y, $w, $h]; 933 $self->{map_info} = [$hash, $x, $y, $w, $h];
934
935 my $map = $self->{map_info}[0];
936 $map =~ s/^.*?\/([^\/]+)$/\1/;
937 $STATWIDS->{map}->set_text ("Map: " . $map);
731 938
732 $self->load_map ($hash, $x, $y); 939 $self->load_map ($hash, $x, $y);
733} 940}
734 941
735sub conn::face_find { 942sub conn::face_find {
… …
899 fast => 0, 1106 fast => 0,
900 fow_enable => 1, 1107 fow_enable => 1,
901 fow_intensity => 0.45, 1108 fow_intensity => 0.45,
902 fow_smooth => 0, 1109 fow_smooth => 0,
903 gui_fontsize => 1, 1110 gui_fontsize => 1,
904 log_fontsize => 14, 1111 log_fontsize => 1,
1112 gauge_fontsize => 1,
1113 gauge_size => 0.35,
1114 stat_fontsize => 1,
905 mapsize => 100, 1115 mapsize => 100,
906 host => "crossfire.schmorp.de", 1116 host => "crossfire.schmorp.de",
907 say_command => 'say', 1117 say_command => 'say',
908 audio_enable => 1, 1118 audio_enable => 1,
909 bgm_enable => 1, 1119 bgm_enable => 1,

Diff Legend

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