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.159 by elmex, Sat Apr 22 22:13:16 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 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => -1, text => "Rng:");
265
266
267 $GAUGES = {
268 exp => $exp, lvl => $lvl, win => $win, range => $rng,
269 food => $fg, mana => $mg, hp => $hg, grace => $gg
270 };
271 $win
272}
273
274sub make_stats_window {
275 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
276
277 $tgw->add (my $vb = new CFClient::UI::VBox);
278 $vb->add (my $uhb = new CFClient::UI::HBox);
279 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
280 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
281
282 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
283
284 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
285
286 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
287 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
288 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
289 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
290 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
291 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
292 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
293
294 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
295 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
296 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
297 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
298 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
299 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
300 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
301
302 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
303 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
304 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
305 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
306 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
307 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
308
309 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
310 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
311 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
312 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
313 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
314 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
315
316 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
317
318 my $row = 0;
319 my $col = 0;
320
321 for (qw/slow holyw conf fire depl magic
322 drain acid pois para deat phys
323 blind fear tund elec cold ghit/)
324 {
325 $tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
326 $tbl2->add ($col + 1, $row,
327 $STATWIDS->{"res_$_"} =
328 new CFClient::UI::Label text => "0", align => -1, valign => 0
329 );
330
331 $row++;
332 if ($row % 6 == 0) {
333 $col += 2;
334 $row = 0;
335 }
336 }
337
338 &set_stats_window_fontsize;
339 update_stats_window ({});
340
341 $tgw
342}
343
344sub update_stats_window {
345 my ($stats) = @_;
346
347 # i love text protocols!!!
348 my $hp = $stats->{1} * 1;
349 my $hp_m = $stats->{2} * 1;
350 my $sp = $stats->{3} * 1;
351 my $sp_m = $stats->{4} * 1;
352 my $fo = $stats->{18} * 1;
353 my $fo_m = 999;
354 my $gr = $stats->{23} * 1;
355 my $gr_m = $stats->{24} * 1;
356
357 $GAUGES->{hp} ->set_value ($hp, $hp_m);
358 $GAUGES->{mana} ->set_value ($sp, $sp_m);
359 $GAUGES->{food} ->set_value ($fo, $fo_m);
360 $GAUGES->{grace} ->set_value ($gr, $gr_m);
361 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}));
362 my $rng = $stats->{20};
363 $rng =~ s/^Range: //; # thank you so much dear server
364 $GAUGES->{range} ->set_text ("Rng: " . $rng);
365 $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
366 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
367
368 if (0) { # this code can vanish, just wanted to preserver it for a checkin
369 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
370 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
371 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
372 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
373 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
374 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
375 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
376 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
377 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
378 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
379 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
380 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
381 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
382 } else {
383 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
384 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
385 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
386 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
387 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
388 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
389 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
390 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
391 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
392 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
393 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
394 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
395 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
396 }
397
398 my %tbl = (
399 phys => 100,
400 magic => 101,
401 fire => 102,
402 elec => 103,
403 cold => 104,
404 conf => 105,
405 acid => 106,
406 drain => 107,
407 ghit => 108,
408 pois => 109,
409 slow => 110,
410 para => 111,
411 tund => 112,
412 fear => 113,
413 deat => 115,
414 holyw => 116,
415 blind => 117
416 );
417
418 for (keys %tbl) {
419 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
420 }
421
192} 422}
193 423
194sub metaserver_dialog { 424sub metaserver_dialog {
195 my $dialog = new CFClient::UI::FancyFrame 425 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver", 426 title => "Metaserver",
… …
443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 673 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 674 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445 status "Configuration Saved"; 675 status "Configuration Saved";
446 }); 676 });
447 677
678 $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
679 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
680
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 681 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449 682
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452 683
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} 684}
461 685
462sub video_shutdown { 686sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = []; 687 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE; 688 undef $SDL_ACTIVE;
… …
478} 702}
479 703
480sub audio_init { 704sub audio_init {
481 if ($CFG->{audio_enable}) { 705 if ($CFG->{audio_enable}) {
482 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 706 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
483
484 $SDL_MIXER = !CFClient::Mix_OpenAudio; 707 $SDL_MIXER = !CFClient::Mix_OpenAudio;
485 CFClient::Mix_AllocateChannels 8; 708 CFClient::Mix_AllocateChannels 8;
486 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 709 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
487 710
488 audio_music_finished; 711 audio_music_finished;
… …
571@conn::ISA = Crossfire::Protocol::; 794@conn::ISA = Crossfire::Protocol::;
572 795
573sub conn::stats_update { 796sub conn::stats_update {
574 my ($self, $stats) = @_; 797 my ($self, $stats) = @_;
575 798
576 # i love text protocols!!! 799 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} 800}
593 801
594sub conn::user_send { 802sub conn::user_send {
595 my ($self, $command) = @_; 803 my ($self, $command) = @_;
596 804
… …
726 934
727 $x += $ox; 935 $x += $ox;
728 $y += $oy; 936 $y += $oy;
729 937
730 $self->{map_info} = [$hash, $x, $y, $w, $h]; 938 $self->{map_info} = [$hash, $x, $y, $w, $h];
939
940 my $map = $self->{map_info}[0];
941 $map =~ s/^.*?\/([^\/]+)$/\1/;
942 $STATWIDS->{map}->set_text ("Map: " . $map);
731 943
732 $self->load_map ($hash, $x, $y); 944 $self->load_map ($hash, $x, $y);
733} 945}
734 946
735sub conn::face_find { 947sub conn::face_find {
… …
899 fast => 0, 1111 fast => 0,
900 fow_enable => 1, 1112 fow_enable => 1,
901 fow_intensity => 0.45, 1113 fow_intensity => 0.45,
902 fow_smooth => 0, 1114 fow_smooth => 0,
903 gui_fontsize => 1, 1115 gui_fontsize => 1,
904 log_fontsize => 14, 1116 log_fontsize => 1,
1117 gauge_fontsize => 1,
1118 gauge_size => 0.35,
1119 gauge_w_size => 0.14,
1120 stat_fontsize => 1,
905 mapsize => 100, 1121 mapsize => 100,
906 host => "crossfire.schmorp.de", 1122 host => "crossfire.schmorp.de",
907 say_command => 'say', 1123 say_command => 'say',
908 audio_enable => 1, 1124 audio_enable => 1,
909 bgm_enable => 1, 1125 bgm_enable => 1,

Diff Legend

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