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.147 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.167 by root, Sun Apr 23 05:33:24 2006 UTC

3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use Time::HiRes 'time'; 6use Time::HiRes 'time';
7use Event; 7use Event;
8
9use SDL::OpenGL;
10 8
11use Crossfire; 9use Crossfire;
12use Crossfire::Protocol; 10use Crossfire::Protocol;
13 11
14use Compress::LZF; 12use Compress::LZF;
47our $LOGVIEW; 45our $LOGVIEW;
48our $CONSOLE; 46our $CONSOLE;
49our $METASERVER; 47our $METASERVER;
50 48
51our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
52 51
53our $SDL_ACTIVE; 52our $SDL_ACTIVE;
54our %SDL_CB; 53our %SDL_CB;
55 54
56our $SDL_MIXER; 55our $SDL_MIXER;
100 undef $CONN; 99 undef $CONN;
101} 100}
102 101
103sub client_setup { 102sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame 103 my $dialog = new CFClient::UI::FancyFrame
104 title => "Client Setup",
105 child => (my $vbox = new CFClient::UI::VBox); 105 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
107 $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]);
108 107
109 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 108 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 109 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111 110
112 $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]);
113 $hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8); 112 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
114 113
115 $mode_slider->connect (changed => sub { 114 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_; 115 my ($self, $value) = @_;
117 116
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 }); 119 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]); 120 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122 121
122 my $row = 1;
123
123 $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");
124 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 125 $table->add (1, $row++, new CFClient::UI::CheckBox
126 state => $CFG->{fullscreen},
127 tooltip => "Bring the client into fullscreen mode",
128 connect_changed => sub {
125 my ($self, $value) = @_; 129 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value; 130 $CFG->{fullscreen} = $value;
131 }
127 }); 132 );
128 133
129 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 134 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
130 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 135 $table->add (1, $row++, new CFClient::UI::CheckBox
136 state => $CFG->{fast},
137 tooltip => "Lower the visual quality considerably to speed up rendering.",
138 connect_changed => sub {
131 my ($self, $value) = @_; 139 my ($self, $value) = @_;
132 $CFG->{fast} = $value; 140 $CFG->{fast} = $value;
141 }
133 }); 142 );
134 143
135 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 144 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
136 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 145 $table->add (1, $row++, new CFClient::UI::CheckBox
146 state => $CFG->{fow_enable},
147 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
148 connect_changed => sub {
137 my ($self, $value) = @_; 149 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value; 150 $CFG->{fow_enable} = $value;
151 }
139 }); 152 );
140 153
141 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 154 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
142 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 155 $table->add (1, $row++, new CFClient::UI::Slider
156 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
157 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
158 connect_changed => sub {
143 my ($self, $value) = @_; 159 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value; 160 $CFG->{fow_intensity} = $value;
161 }
145 }); 162 );
146 163
147 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 164 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 165 $table->add (1, $row++, new CFClient::UI::CheckBox
166 state => $CFG->{fow_smooth},
167 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
168 connect_changed => sub {
149 my ($self, $value) = @_; 169 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value; 170 $CFG->{fow_smooth} = $value;
151 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 171 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
172 }
152 }); 173 );
153 174
154 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 175 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
155 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 176 $table->add (1, $row++, new CFClient::UI::Slider
177 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
178 tooltip => "The font size used by most GUI elements",
179 connect_changed => sub {
156 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 180 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
157# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 181# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
182 }
158 }); 183 );
159 184
160 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 185 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
161 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 186 $table->add (1, $row++, new CFClient::UI::Slider
187 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
188 tooltip => "The font size used by the server log window only",
189 connect_changed => sub {
162 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 190 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
191 }
163 }); 192 );
164 193
165 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 194 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
195
196 $table->add (1, $row++, new CFClient::UI::Slider
197 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
198 tooltip => "The font size used by the statistics window only",
199 connect_changed => sub {
200 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
201 &set_stats_window_fontsize;
202 }
203 );
204
205 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
206 $table->add (1, $row++, new CFClient::UI::Slider
207 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
208 tooltip => "Adjust the size of the stats gauges at the bottom right",
209 connect_changed => sub {
210 $CFG->{gauge_size} = $_[1];
211 my $h = int $HEIGHT * $CFG->{gauge_size};
212 $GAUGES->{win}->set_size ($WIDTH, $h);
213 $GAUGES->{win}->move (0, $HEIGHT - $h);
214 }
215 );
216
217 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
218 $table->add (1, $row++, new CFClient::UI::Slider
219 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
220 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
221 connect_changed => sub {
222 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
223 &set_gauge_window_fontsize;
224 #$GAUGES->{win}->check_size;
225 #$GAUGES->{win}->update;
226 }
227 );
228
229 $table->add (1, $row++, new CFClient::UI::Button
230 expand => 1, align => 0, text => "Apply",
231 tooltip => "Apply the video settings (unless they are auto-apply)",
232 connect_activate => sub {
166 video_shutdown (); 233 video_shutdown ();
167 video_init (); 234 video_init ();
235 }
168 }); 236 );
169 237
170 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 238 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
171 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { 239 $table->add (1, $row++, new CFClient::UI::CheckBox
240 state => $CFG->{audio_enable},
241 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
242 connect_changed => sub {
172 $CFG->{audio_enable} = $_[1]; 243 $CFG->{audio_enable} = $_[1];
244 }
173 }); 245 );
174# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 246# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
175# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 247# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
176# $CFG->{effects_volume} = $_[1]; 248# $CFG->{effects_volume} = $_[1];
177# }); 249# });
178 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 250 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
179 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 251 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
180 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { 252 $hbox->add (new CFClient::UI::CheckBox
253 expand => 1, state => $CFG->{bgm_enable},
254 tooltip => "Enable background music playing",
255 connect_changed => sub {
181 $CFG->{bgm_enable} = $_[1]; 256 $CFG->{bgm_enable} = $_[1];
257 }
182 }); 258 );
183 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 259 $hbox->add (new CFClient::UI::Slider
260 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
261 tooltip => "The volume of the background music",
262 connect_changed => sub {
184 $CFG->{bgm_volume} = $_[1]; 263 $CFG->{bgm_volume} = $_[1];
185 CFClient::Mix_VolumeMusic ($_[1]); 264 CFClient::MixMusic::volume $_[1] * 128;
265 }
186 }); 266 );
187 267
188 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 268 $table->add (1, $row++, new CFClient::UI::Button
269 expand => 1, align => 0, text => "Apply",
270 tooltip => "Apply the audio settings that are not auto-apply",
271 connect_activate => sub {
189 audio_shutdown (); 272 audio_shutdown ();
190 audio_init (); 273 audio_init ();
274 }
191 }); 275 );
192 276
193 $dialog 277 $dialog
278}
279
280sub set_stats_window_fontsize {
281 for (values %{$STATWIDS}) {
282 $_->set_fontsize ($::CFG->{stat_fontsize});
283 }
284}
285
286sub set_gauge_window_fontsize {
287 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
288 $_->set_fontsize ($::CFG->{gauge_fontsize});
289 }
290}
291
292sub make_gauge_window {
293 my $gh = int ($HEIGHT * $CFG->{gauge_size});
294# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
295
296 my $win = new CFClient::UI::Frame (
297 y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
298 );
299 $win->add (my $vb = new CFClient::UI::VBox);
300
301 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
302
303
304 $hbg->add (new CFClient::UI::Empty expand => 1);
305 $hbg->add (my $hb = new CFClient::UI::HBox);
306 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
307 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
308 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
309 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
310
311 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
312 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
313
314 $GAUGES = {
315 exp => $exp, win => $win, range => $rng,
316 food => $fg, mana => $mg, hp => $hg, grace => $gg
317 };
318 $win
319}
320
321sub make_stats_window {
322 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
323
324 $tgw->add (my $vb = new CFClient::UI::VBox);
325 $vb->add (my $uhb = new CFClient::UI::HBox);
326 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
327 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
328
329 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
330
331 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
332
333 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
334 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
335 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
336 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
337 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
338 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
339 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
340
341 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
342 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
343 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
344 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
345 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
346 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
347 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
348
349 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
350 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
351 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
352 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
353 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
354 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
355
356 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
357 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
358 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
359 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
360 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
361 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
362
363 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
364
365 my $row = 0;
366 my $col = 0;
367
368 my %resist_names = (
369 slow => "Slow",
370 holyw => "Holy Word",
371 conf => "Confusion",
372 fire => "Fire",
373 depl => "Depletion",
374 magic => "Magic",
375 drain => "Draining",
376 acid => "Acid",
377 pois => "Poison",
378 para => "Paralysation",
379 deat => "Death",
380 phys => "Physical",
381 blind => "Blind",
382 fear => "Fear",
383 tund => "Turn undead",
384 elec => "Electricity",
385 cold => "Cold",
386 ghit => "Ghost hit",
387 );
388 for (qw/slow holyw conf fire depl magic
389 drain acid pois para deat phys
390 blind fear tund elec cold ghit/)
391 {
392 $tbl2->add ($col, $row,
393 $STATWIDS->{"res_$_"} =
394 new CFClient::UI::Label text => "0", align => +1, valign => 0
395 );
396 $tbl2->add ($col + 1, $row, new CFClient::UI::Image can_hover => 1, can_events => 1, image => "ui/resist/resist_$_.png", tooltip => $resist_names{$_});
397
398 $row++;
399 if ($row % 6 == 0) {
400 $col += 2;
401 $row = 0;
402 }
403 }
404
405 &set_stats_window_fontsize;
406 update_stats_window ({});
407
408 $tgw
409}
410
411sub update_stats_window {
412 my ($stats) = @_;
413
414 # i love text protocols!!!
415 my $hp = $stats->{1} * 1;
416 my $hp_m = $stats->{2} * 1;
417 my $sp = $stats->{3} * 1;
418 my $sp_m = $stats->{4} * 1;
419 my $fo = $stats->{18} * 1;
420 my $fo_m = 999;
421 my $gr = $stats->{23} * 1;
422 my $gr_m = $stats->{24} * 1;
423
424 $GAUGES->{hp} ->set_value ($hp, $hp_m);
425 $GAUGES->{mana} ->set_value ($sp, $sp_m);
426 $GAUGES->{food} ->set_value ($fo, $fo_m);
427 $GAUGES->{grace} ->set_value ($gr, $gr_m);
428 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1
429 ." LVL: " . $stats->{12} * 1);
430 my $rng = $stats->{20};
431 $rng =~ s/^Range: //; # thank you so much dear server
432 $GAUGES->{range} ->set_text ("Rng: " . $rng);
433 my $title = $stats->{21};
434 $title =~ s/^Player: //;
435 $STATWIDS->{title} ->set_text ("Title: " . $title);
436
437 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
438 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
439 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
440 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
441 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
442 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
443 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
444 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
445 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
446 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
447 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
448 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
449 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
450
451 my %tbl = (
452 phys => 100,
453 magic => 101,
454 fire => 102,
455 elec => 103,
456 cold => 104,
457 conf => 105,
458 acid => 106,
459 drain => 107,
460 ghit => 108,
461 pois => 109,
462 slow => 110,
463 para => 111,
464 tund => 112,
465 fear => 113,
466 depl => 113,
467 deat => 115,
468 holyw => 116,
469 blind => 117
470 );
471
472 for (keys %tbl) {
473 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
474 }
475
194} 476}
195 477
196sub metaserver_dialog { 478sub metaserver_dialog {
197 my $dialog = new CFClient::UI::FancyFrame 479 my $dialog = new CFClient::UI::FancyFrame
480 title => "Metaserver",
198 child => (my $vbox = new CFClient::UI::VBox); 481 child => (my $vbox = new CFClient::UI::VBox);
199 482
200 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 483 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
201 484
202 $dialog 485 $dialog
268 }); 551 });
269} 552}
270 553
271sub server_setup { 554sub server_setup {
272 my $dialog = new CFClient::UI::FancyFrame 555 my $dialog = new CFClient::UI::FancyFrame
556 title => "Server Setup",
273 child => (my $vbox = new CFClient::UI::VBox); 557 child => (my $vbox = new CFClient::UI::VBox);
274 558
275 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
276 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 559 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
277 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 560 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
278 561
279 { 562 {
280 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 563 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
281 564
282 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { 565 $vbox->add (
566 my $HOST = new CFClient::UI::Entry
567 expand => 1,
568 text => $CFG->{host},
569 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
570 connect_changed => sub {
571 my ($self, $value) = @_;
572 $CFG->{host} = $value;
573 }
574 );
575
576 $METASERVER = metaserver_dialog;
577
578 $vbox->add (new CFClient::UI::Flopper
579 expand => 1,
580 text => "Metaserver",
581 other => $METASERVER,
582 tooltip => "Show a list of avaible crossfire servers",
583 connect_open => sub {
584 update_metaserver $HOST;
585 }
586 );
587 }
588
589 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
590 $table->add (1, 4, new CFClient::UI::Entry
591 text => $CFG->{user},
592 tooltip => "The name of your character on the server",
593 connect_changed => sub {
283 my ($self, $value) = @_; 594 my ($self, $value) = @_;
284 $CFG->{host} = $value;
285 });
286
287 $METASERVER = metaserver_dialog;
288
289 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
290 update_metaserver $HOST;
291 });
292 }
293
294 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
295 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
296 my ($self, $value) = @_;
297 $CFG->{user} = $value; 595 $CFG->{user} = $value;
596 }
298 }); 597 );
299 598
300 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 599 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
301 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 600 $table->add (1, 5, new CFClient::UI::Entry
601 text => $CFG->{password},
602 hidden => 1,
603 tooltip => "The password for your character",
604 connect_changed => sub {
302 my ($self, $value) = @_; 605 my ($self, $value) = @_;
303 $CFG->{password} = $value; 606 $CFG->{password} = $value;
607 }
304 }); 608 );
305 609
306 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd"); 610 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
307 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 611 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
612 text => $CFG->{say_command},
613 tooltip => "This is the command that will be used if you write a line in the message window entry. "
614 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
615 ."But you could also set it to 'tell <playername>' to only chat with that user.",
616 connect_changed => sub {
308 my ($self, $value) = @_; 617 my ($self, $value) = @_;
309 $CFG->{say_command} = $value; 618 $CFG->{say_command} = $value;
619 }
310 }); 620 );
311 621
312 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 622 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
313 $table->add (1, 7, new CFClient::UI::Slider 623 $table->add (1, 7, new CFClient::UI::Slider
314 req_w => 100, 624 req_w => 100,
315 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 625 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
626 tooltip => "This is the size of the portion of the map update the server sends you. "
627 ."If you set this to a high value you will be able to see further for example.",
316 connect_changed => sub { 628 connect_changed => sub {
317 my ($self, $value) = @_; 629 my ($self, $value) = @_;
318 630
319 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 631 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
320 }, 632 },
327 $dialog 639 $dialog
328} 640}
329 641
330sub message_window { 642sub message_window {
331 my $window = new CFClient::UI::FancyFrame 643 my $window = new CFClient::UI::FancyFrame
644 title => "Messages",
332 border_bg => [1, 1, 1, 0.5], 645 border_bg => [1, 1, 1, 0.5],
333 bg => [0.3, 0.3, 0.3, 0.8], 646 bg => [0.3, 0.3, 0.3, 0.8],
334 user_w => int $::WIDTH / 3, 647 user_w => int $::WIDTH / 3,
335 user_h => int $::HEIGHT / 5, 648 user_h => int $::HEIGHT / 5,
336 child => (my $vbox = new CFClient::UI::VBox); 649 child => (my $vbox = new CFClient::UI::VBox);
438 751
439 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 752 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
440 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 753 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
441 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 754 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
442 755
756 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
757 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
758
443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 759 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 760 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445 status "Configuration Saved"; 761 status "Configuration Saved";
446 }); 762 });
447 763
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 764 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452
453 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
454 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
455 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
456 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
457
458 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459 $CFClient::UI::ROOT->add ($tgw);
460} 765}
461 766
462sub video_shutdown { 767sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = []; 768 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE; 769 undef $SDL_ACTIVE;
465} 770}
466 771
772my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
467my $bgmusic;#TODO#hack#d# 773my $bgmusic;#TODO#hack#d#
774
775sub audio_music_finished {
776 return unless $CFG->{bgm_enable};
777
778 # TODO: hack, do play loop and mood music
779 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
780 $bgmusic->play (0);
781
782 push @bgmusic, shift @bgmusic;
783}
468 784
469sub audio_init { 785sub audio_init {
470 if ($CFG->{audio_enable}) { 786 if ($CFG->{audio_enable}) {
471 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 787 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
472
473 $SDL_MIXER = !CFClient::Mix_OpenAudio; 788 $SDL_MIXER = !CFClient::Mix_OpenAudio;
474 CFClient::Mix_AllocateChannels 8; 789 CFClient::Mix_AllocateChannels 8;
475 CFClient::MixMusic::volume $CFG->{bgm_volume}; 790 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
476 791
477 # TODO: hack, do play loop and mood music 792 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 793
483 while (<$fh>) { 794 while (<$fh>) {
484 next if /^\s*#/; 795 next if /^\s*#/;
485 next if /^\s*$/; 796 next if /^\s*$/;
486 797
522 $want_refresh = 0; 833 $want_refresh = 0;
523 $can_refresh = 0; 834 $can_refresh = 0;
524 835
525 $CFClient::UI::ROOT->draw; 836 $CFClient::UI::ROOT->draw;
526 837
527 SDL::GLSwapBuffers; 838 CFClient::SDL_GL_SwapBuffers;
528 839
529 $LAST_REFRESH = $NOW; 840 $LAST_REFRESH = $NOW;
530} 841}
531 842
532my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 843my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
564@conn::ISA = Crossfire::Protocol::; 875@conn::ISA = Crossfire::Protocol::;
565 876
566sub conn::stats_update { 877sub conn::stats_update {
567 my ($self, $stats) = @_; 878 my ($self, $stats) = @_;
568 879
569 # i love text protocols!!! 880 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 = 1000;
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} 881}
586 882
587sub conn::user_send { 883sub conn::user_send {
588 my ($self, $command) = @_; 884 my ($self, $command) = @_;
589 885
614 910
615 my ($hash, $x, $y, $w, $h) = @$map_info; 911 my ($hash, $x, $y, $w, $h) = @$map_info;
616 912
617 my $data = $MAP->get_rect ($x, $y, $w, $h); 913 my $data = $MAP->get_rect ($x, $y, $w, $h);
618 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 914 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
619
620 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 915 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
621
622} 916}
623 917
624sub conn::map_clear { 918sub conn::map_clear {
625 my ($self) = @_; 919 my ($self) = @_;
626 920
627 $self->flush_map; 921 $self->flush_map;
628 delete $self->{neigh}; 922 delete $self->{neigh_map};
629 923
630 $MAP->clear; 924 $MAP->clear;
631} 925}
632 926
633 927
634sub conn::load_map($$$) { 928sub conn::load_map($$$) {
635 my ($self, $hash, $x, $y) = @_; 929 my ($self, $hash, $x, $y) = @_;
636 930
637 if (defined (my $data = $MAPCACHE->get ($hash))) { 931 if (defined (my $data = $MAPCACHE->get ($hash))) {
638 $data = Compress::LZF::decompress $data; 932 $data = Compress::LZF::decompress $data;
639 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 933 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
640 for my $id ($MAP->set_rect ($x, $y, $data)) { 934 for my $id ($MAP->set_rect ($x, $y, $data)) {
641 my $data = $TILECACHE->get ($id) 935 my $data = $TILECACHE->get ($id)
642 or next; 936 or next;
643 937
644 $self->set_texture ($id => $data); 938 $self->set_texture ($id => $data);
645 } 939 }
646 } 940 }
647} 941}
648 942
943# this method does a "flood fill" into every tile direction
944# it assumes that tiles are arranged in a rectangular grid,
945# i.e. a map is the same as the left of the right map etc.
946# failure to comply are harmless and result in display errors
947# at worst.
649sub conn::flood_fill { 948sub conn::flood_fill {
650 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 949 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651 950
652 # the server does not allow map paths > 6 951 # the server does not allow map paths > 6
653 return if 6 <= length $path; 952 return if 6 <= length $path;
654 953
655 for my $tile (1..4) { 954 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
656 next if $self->{neigh}{$hash}[$tile]; 955
956 for (
957 [1, 0, -1],
958 [2, 1, 0],
959 [3, 0, 1],
960 [4, -1, 0],
961 ) {
962 my ($tile, $dx, $dy) = @$_;
963
964 my $gx = $gx + $dx;
965 my $gy = $gy + $dy;
966
657 next unless $flags & (1 << ($tile - 1)); 967 next unless $flags & (1 << ($tile - 1));
968 next if $self->{neigh_grid}{$gx, $gy}++;
658 969
659 my $neigh = $self->{neigh}{$hash} ||= []; 970 my $neigh = $self->{neigh_map}{$hash} ||= [];
660 971 if (my $info = $neigh->[$tile]) {
661 $self->send_mapinfo ("spatial $path$tile", sub {
662 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 972 my ($flags, $x, $y, $w, $h, $hash) = @$info;
663 973
664 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
665 return if $mode ne "spatial";
666
667 $x += $MAP->ox;
668 $y += $MAP->oy;
669
670 $self->load_map ($hash, $x, $y)
671 unless $self->{neigh}{$hash}[5]++;#d#
672
673 $neigh->[$tile] = [$x, $y, $w, $h];
674
675 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 974 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
676 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 975 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
976
977 } else {
978 $self->send_mapinfo ("spatial $path$tile", sub {
979 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
980
981 return if $mode ne "spatial";
982
983 $x += $MAP->ox;
984 $y += $MAP->oy;
985
986 $self->load_map ($hash, $x, $y)
987 unless $self->{neigh_map}{$hash}[5]++;#d#
988
989 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
990
991 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
992 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
993 });
677 }); 994 }
678 } 995 }
679} 996}
680 997
681sub conn::map_change { 998sub conn::map_change {
682 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 999 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
685 1002
686 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1003 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
687 1004
688 my $mapmapw = 250; 1005 my $mapmapw = 250;
689 my $mapmaph = 250; 1006 my $mapmaph = 250;
1007
1008 $self->{neigh_rect} = [
1009 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1010 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1011 ];
690 1012
1013 delete $self->{neigh_grid};
691 $self->flood_fill ("", $hash, $flags, 1014 $self->flood_fill (0, 0, "", $hash, $flags);
692 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
693 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
694 1015
695 $x += $ox; 1016 $x += $ox;
696 $y += $oy; 1017 $y += $oy;
697 1018
698 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1019 $self->{map_info} = [$hash, $x, $y, $w, $h];
1020
1021 my $map = $self->{map_info}[0];
1022 $map =~ s/^.*?\/([^\/]+)$/\1/;
1023 $STATWIDS->{map}->set_text ("Map: " . $map);
699 1024
700 $self->load_map ($hash, $x, $y); 1025 $self->load_map ($hash, $x, $y);
701} 1026}
702 1027
703sub conn::face_find { 1028sub conn::face_find {
827 CFClient::SDL_QUIT => sub { 1152 CFClient::SDL_QUIT => sub {
828 Event::unloop -1; 1153 Event::unloop -1;
829 }, 1154 },
830 CFClient::SDL_VIDEORESIZE => sub { 1155 CFClient::SDL_VIDEORESIZE => sub {
831 }, 1156 },
832 CFClient::SDL_VIDEOEXPOSE => sub { 1157 CFClient::SDL_VIDEOEXPOSE => \&refresh,
833 refresh; 1158 CFClient::SDL_ACTIVEEVENT => sub {
1159# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
834 }, 1160 },
835 CFClient::SDL_KEYDOWN => sub { 1161 CFClient::SDL_KEYDOWN => sub {
836 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1162 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
837 # alt-enter 1163 # alt-enter
838 video_shutdown; 1164 video_shutdown;
840 video_init; 1166 video_init;
841 } else { 1167 } else {
842 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1168 CFClient::UI::feed_sdl_key_down_event ($_[0]);
843 } 1169 }
844 }, 1170 },
845 CFClient::SDL_KEYUP => sub { 1171 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
846 CFClient::UI::feed_sdl_key_up_event ($_[0]); 1172 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
847 }, 1173 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
848 CFClient::SDL_MOUSEMOTION => sub { 1174 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
849 CFClient::UI::feed_sdl_motion_event ($_[0]); 1175 CFClient::SDL_USEREVENT => \&audio_music_finished,
850 },
851 CFClient::SDL_MOUSEBUTTONDOWN => sub {
852 CFClient::UI::feed_sdl_button_down_event ($_[0]);
853 },
854 CFClient::SDL_MOUSEBUTTONUP => sub {
855 CFClient::UI::feed_sdl_button_up_event ($_[0]);
856 },
857 CFClient::SDL_ACTIVEEVENT => sub {
858# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
859 },
860); 1176);
861 1177
862############################################################################# 1178#############################################################################
863 1179
864$SIG{INT} = $SIG{TERM} = sub { exit }; 1180$SIG{INT} = $SIG{TERM} = sub { exit };
876 fast => 0, 1192 fast => 0,
877 fow_enable => 1, 1193 fow_enable => 1,
878 fow_intensity => 0.45, 1194 fow_intensity => 0.45,
879 fow_smooth => 0, 1195 fow_smooth => 0,
880 gui_fontsize => 1, 1196 gui_fontsize => 1,
881 log_fontsize => 14, 1197 log_fontsize => 1,
1198 gauge_fontsize => 1,
1199 gauge_size => 0.35,
1200 stat_fontsize => 1,
882 mapsize => 100, 1201 mapsize => 100,
883 host => "crossfire.schmorp.de", 1202 host => "crossfire.schmorp.de",
884 say_command => 'say', 1203 say_command => 'say',
885 audio_enable => 1, 1204 audio_enable => 1,
886 bgm_enable => 1, 1205 bgm_enable => 1,
887 bgm_volume => 64, 1206 bgm_volume => 0.25,
888); 1207);
889 1208
890while (my ($k, $v) = each %DEF_CFG) { 1209while (my ($k, $v) = each %DEF_CFG) {
891 $CFG->{$k} = $v unless exists $CFG->{$k}; 1210 $CFG->{$k} = $v unless exists $CFG->{$k};
892} 1211}
911video_init; 1230video_init;
912audio_init; 1231audio_init;
913 1232
914Event::loop; 1233Event::loop;
915 1234
916END { SDL::Quit } 1235END { CFClient::SDL_Quit }
917 1236
918 1237

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines