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.142 by root, Wed Apr 19 07:30:33 2006 UTC vs.
Revision 1.160 by root, Sat Apr 22 23:11:34 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;
10use SDL::App;
11use SDL::Event;
12use SDL::Surface;
13
14use SDL::Mixer;
15use SDL::Sound;
16use SDL::Music;
17
18use SDL::OpenGL;
19 8
20use Crossfire; 9use Crossfire;
21use Crossfire::Protocol; 10use Crossfire::Protocol;
22 11
23use Compress::LZF; 12use Compress::LZF;
56our $LOGVIEW; 45our $LOGVIEW;
57our $CONSOLE; 46our $CONSOLE;
58our $METASERVER; 47our $METASERVER;
59 48
60our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
61 51
62our $SDL_ACTIVE; 52our $SDL_ACTIVE;
63our $SDL_EV;
64our %SDL_CB; 53our %SDL_CB;
65 54
66our $SDL_MIXER; 55our $SDL_MIXER;
67our @SOUNDS; # event => file mapping 56our @SOUNDS; # event => file mapping
68our %AUDIO_CHUNKS; # audio files 57our %AUDIO_CHUNKS; # audio files
110 undef $CONN; 99 undef $CONN;
111} 100}
112 101
113sub client_setup { 102sub client_setup {
114 my $dialog = new CFClient::UI::FancyFrame 103 my $dialog = new CFClient::UI::FancyFrame
104 title => "Client Setup",
115 child => (my $vbox = new CFClient::UI::VBox); 105 child => (my $vbox = new CFClient::UI::VBox);
116 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
117 $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]);
118 107
119 $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");
120 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 109 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
121 110
122 $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]);
123 $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");
124 113
125 $mode_slider->connect (changed => sub { 114 $mode_slider->connect (changed => sub {
126 my ($self, $value) = @_; 115 my ($self, $value) = @_;
127 116
128 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
129 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
130 }); 119 });
131 $mode_slider->emit (changed => $mode_slider->{range}[0]); 120 $mode_slider->emit (changed => $mode_slider->{range}[0]);
132 121
122 my $row = 1;
123
133 $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");
134 $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 {
135 my ($self, $value) = @_; 126 my ($self, $value) = @_;
136 $CFG->{fullscreen} = $value; 127 $CFG->{fullscreen} = $value;
137 }); 128 });
138 129
139 $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");
140 $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 {
141 my ($self, $value) = @_; 132 my ($self, $value) = @_;
142 $CFG->{fast} = $value; 133 $CFG->{fast} = $value;
143 }); 134 });
144 135
145 $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");
146 $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 {
147 my ($self, $value) = @_; 138 my ($self, $value) = @_;
148 $CFG->{fow_enable} = $value; 139 $CFG->{fow_enable} = $value;
149 }); 140 });
150 141
151 $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");
152 $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 {
153 my ($self, $value) = @_; 144 my ($self, $value) = @_;
154 $CFG->{fow_intensity} = $value; 145 $CFG->{fow_intensity} = $value;
155 }); 146 });
156 147
157 $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");
158 $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 {
159 my ($self, $value) = @_; 150 my ($self, $value) = @_;
160 $CFG->{fow_smooth} = $value; 151 $CFG->{fow_smooth} = $value;
161 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;
162 }); 153 });
163 154
164 $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");
165 $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 {
166 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 157 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
167# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 158# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
168 }); 159 });
169 160
170 $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");
171 $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 {
172 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 163 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
173 }); 164 });
174 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
175 $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 {
176 video_shutdown (); 206 video_shutdown ();
177 video_init (); 207 video_init ();
178 }); 208 });
179 209
180 $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");
181 $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 {
182 $CFG->{audio_enable} = $_[1]; 212 $CFG->{audio_enable} = $_[1];
183 }); 213 });
184# $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");
185# $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 {
186# $CFG->{effects_volume} = $_[1]; 216# $CFG->{effects_volume} = $_[1];
187# }); 217# });
188 $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");
189 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 219 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
190 $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 {
191 $CFG->{bgm_enable} = $_[1]; 221 $CFG->{bgm_enable} = $_[1];
192 }); 222 });
193 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub { 223 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
194 $CFG->{bgm_volume} = $_[1]; 224 $CFG->{bgm_volume} = $_[1];
195 $SDL_MIXER->music_volume ($_[1]); 225 CFClient::MixMusic::volume $_[1] * 128;
196 }); 226 });
197 227
198 $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 {
199 audio_shutdown (); 229 audio_shutdown ();
200 audio_init (); 230 audio_init ();
201 }); 231 });
202 232
203 $dialog 233 $dialog
204} 234}
205 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 => "Str");
287 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
288 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
289 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
290 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
291 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
292 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
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,
326 $STATWIDS->{"res_$_"} =
327 new CFClient::UI::Label text => "0", align => +1, valign => 0
328 );
329 $tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
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
422}
423
206sub metaserver_dialog { 424sub metaserver_dialog {
207 my $dialog = new CFClient::UI::FancyFrame 425 my $dialog = new CFClient::UI::FancyFrame
426 title => "Metaserver",
208 child => (my $vbox = new CFClient::UI::VBox); 427 child => (my $vbox = new CFClient::UI::VBox);
209 428
210 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 429 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
211 430
212 $dialog 431 $dialog
278 }); 497 });
279} 498}
280 499
281sub server_setup { 500sub server_setup {
282 my $dialog = new CFClient::UI::FancyFrame 501 my $dialog = new CFClient::UI::FancyFrame
502 title => "Server Setup",
283 child => (my $vbox = new CFClient::UI::VBox); 503 child => (my $vbox = new CFClient::UI::VBox);
284 504
285 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
286 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 505 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
287 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 506 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
288 507
289 { 508 {
290 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 509 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
337 $dialog 556 $dialog
338} 557}
339 558
340sub message_window { 559sub message_window {
341 my $window = new CFClient::UI::FancyFrame 560 my $window = new CFClient::UI::FancyFrame
561 title => "Messages",
342 border_bg => [1, 1, 1, 0.5], 562 border_bg => [1, 1, 1, 0.5],
343 bg => [0.3, 0.3, 0.3, 0.8], 563 bg => [0.3, 0.3, 0.3, 0.8],
344 user_w => int $::WIDTH / 3, 564 user_w => int $::WIDTH / 3,
345 user_h => int $::HEIGHT / 5, 565 user_h => int $::HEIGHT / 5,
346 child => (my $vbox = new CFClient::UI::VBox); 566 child => (my $vbox = new CFClient::UI::VBox);
388 608
389 $window 609 $window
390} 610}
391 611
392sub sdl_init { 612sub sdl_init {
393 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 613 CFClient::SDL_Init
394 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
395 and die "SDL::Init failed!\n"; 614 and die "SDL::Init failed!\n";
396} 615}
397 616
398sub video_init { 617sub video_init {
399 sdl_init; 618 sdl_init;
400 619
401 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 620 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
402 $FULLSCREEN = $CFG->{fullscreen}; 621 $FULLSCREEN = $CFG->{fullscreen};
403 $FAST = $CFG->{fast}; 622 $FAST = $CFG->{fast};
404 623
405 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 624 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
406 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
407 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
408 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
409
410 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
411 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
412 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
413 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
414
415 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
416 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
417 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
418
419 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
420 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
421 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
422 or die "SDL::SetVideoMode failed!\n"; 625 or die "SDL_SetVideoMode failed!\n";
423
424 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
425
426 $SDL_EV = new SDL::Event;
427 $SDL_EV->set_unicode (1);
428 626
429 $SDL_ACTIVE = 1; 627 $SDL_ACTIVE = 1;
430 628
431 $LAST_REFRESH = time - 0.01; 629 $LAST_REFRESH = time - 0.01;
432 630
475 $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 {
476 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 674 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
477 status "Configuration Saved"; 675 status "Configuration Saved";
478 }); 676 });
479 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
480 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 681 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
481 682
482 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
483 $tgw->add (my $hbox = new CFClient::UI::HBox ());
484 683
485 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
486 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
487 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
488 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
489
490 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
491 $CFClient::UI::ROOT->add ($tgw);
492} 684}
493 685
494sub video_shutdown { 686sub video_shutdown {
495 $CFClient::UI::ROOT->{children} = []; 687 $CFClient::UI::ROOT->{children} = [];
496 undef $SDL_ACTIVE; 688 undef $SDL_ACTIVE;
497 undef $SDL_EV;
498} 689}
499 690
691my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
500my $bgmusic;#TODO#hack#d# 692my $bgmusic;#TODO#hack#d#
693
694sub audio_music_finished {
695 return unless $CFG->{bgm_enable};
696
697 # TODO: hack, do play loop and mood music
698 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
699 $bgmusic->play (0);
700
701 push @bgmusic, shift @bgmusic;
702}
501 703
502sub audio_init { 704sub audio_init {
503 if ($CFG->{audio_enable}) { 705 if ($CFG->{audio_enable}) {
504 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 706 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
505 707 $SDL_MIXER = !CFClient::Mix_OpenAudio;
506 $SDL_MIXER = new SDL::Mixer 708 CFClient::Mix_AllocateChannels 8;
507 -rate => 22050, 709 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
508 -channels => 1, # mono
509 -size => 512;
510 710
511 $SDL_MIXER->allocate_channels (8); 711 audio_music_finished;
512
513 # TODO: hack, do play loop and mood music
514 if ($CFG->{bgm_enable}) {
515 $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
516 $SDL_MIXER->play_music ($bgmusic, -1);
517 $SDL_MIXER->music_volume ($CFG->{bgm_volume});
518 }
519 712
520 while (<$fh>) { 713 while (<$fh>) {
521 next if /^\s*#/; 714 next if /^\s*#/;
522 next if /^\s*$/; 715 next if /^\s*$/;
523 716
524 my ($file, $volume, $event) = split /\s+/, $_, 3; 717 my ($file, $volume, $event) = split /\s+/, $_, 3;
525 718
526 push @SOUNDS, "$volume,$file"; 719 push @SOUNDS, "$volume,$file";
527 720
528 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 721 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
529 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file"; 722 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
530 $chunk->volume ($volume * 128 / 100); 723 $chunk->volume ($volume * 128 / 100);
531 $chunk 724 $chunk
532 }; 725 };
533 } 726 }
534 } else { 727 } else {
536 } 729 }
537 } 730 }
538} 731}
539 732
540sub audio_shutdown { 733sub audio_shutdown {
734 CFClient::Mix_CloseAudio if $SDL_MIXER;
541 undef $SDL_MIXER; 735 undef $SDL_MIXER;
542 @SOUNDS = (); 736 @SOUNDS = ();
543 %AUDIO_CHUNKS = (); 737 %AUDIO_CHUNKS = ();
544} 738}
545 739
558 $want_refresh = 0; 752 $want_refresh = 0;
559 $can_refresh = 0; 753 $can_refresh = 0;
560 754
561 $CFClient::UI::ROOT->draw; 755 $CFClient::UI::ROOT->draw;
562 756
563 SDL::GLSwapBuffers; 757 CFClient::SDL_GL_SwapBuffers;
564 758
565 $LAST_REFRESH = $NOW; 759 $LAST_REFRESH = $NOW;
566} 760}
567 761
568my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 762my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
569 $NOW = time; 763 $NOW = time;
570 764
571 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 765 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
572 while $SDL_EV->poll; 766 for CFClient::SDL_PollEvent;
573 767
574 if (%animate_object) { 768 if (%animate_object) {
575 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 769 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
576 $want_refresh++; 770 $want_refresh++;
577 } 771 }
600@conn::ISA = Crossfire::Protocol::; 794@conn::ISA = Crossfire::Protocol::;
601 795
602sub conn::stats_update { 796sub conn::stats_update {
603 my ($self, $stats) = @_; 797 my ($self, $stats) = @_;
604 798
605 # i love text protocols!!! 799 update_stats_window ($stats);
606 # FIXME: the stats are somehow weird
607 my $hp = $stats->{1};
608 my $hp_m = $stats->{2};
609 my $sp = $stats->{3};
610 my $sp_m = $stats->{4};
611 my $fo = $stats->{18};
612 my $fo_m = 1000;
613 my $gr = $stats->{23};
614 my $gr_m = $stats->{24};
615
616 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
617 $GAUGES->{hp}->set_value ($hp, $hp_m);
618 $GAUGES->{mana}->set_value ($sp, $sp_m);
619 $GAUGES->{food}->set_value ($fo, $fo_m);
620 $GAUGES->{grace}->set_value ($gr, $gr_m);
621} 800}
622 801
623sub conn::user_send { 802sub conn::user_send {
624 my ($self, $command) = @_; 803 my ($self, $command) = @_;
625 804
650 829
651 my ($hash, $x, $y, $w, $h) = @$map_info; 830 my ($hash, $x, $y, $w, $h) = @$map_info;
652 831
653 my $data = $MAP->get_rect ($x, $y, $w, $h); 832 my $data = $MAP->get_rect ($x, $y, $w, $h);
654 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 833 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
655
656 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 834 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
657
658} 835}
659 836
660sub conn::map_clear { 837sub conn::map_clear {
661 my ($self) = @_; 838 my ($self) = @_;
662 839
663 $self->flush_map; 840 $self->flush_map;
664 delete $self->{neigh}; 841 delete $self->{neigh_map};
665 842
666 $MAP->clear; 843 $MAP->clear;
667} 844}
668 845
669 846
670sub conn::load_map($$$) { 847sub conn::load_map($$$) {
671 my ($self, $hash, $x, $y) = @_; 848 my ($self, $hash, $x, $y) = @_;
672 849
673 if (defined (my $data = $MAPCACHE->get ($hash))) { 850 if (defined (my $data = $MAPCACHE->get ($hash))) {
674 $data = Compress::LZF::decompress $data; 851 $data = Compress::LZF::decompress $data;
675 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 852 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
676 for my $id ($MAP->set_rect ($x, $y, $data)) { 853 for my $id ($MAP->set_rect ($x, $y, $data)) {
677 my $data = $TILECACHE->get ($id) 854 my $data = $TILECACHE->get ($id)
678 or next; 855 or next;
679 856
680 $self->set_texture ($id => $data); 857 $self->set_texture ($id => $data);
681 } 858 }
682 } 859 }
683} 860}
684 861
862# this method does a "flood fill" into every tile direction
863# it assumes that tiles are arranged in a rectangular grid,
864# i.e. a map is the same as the left of the right map etc.
865# failure to comply are harmless and result in display errors
866# at worst.
685sub conn::flood_fill { 867sub conn::flood_fill {
686 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 868 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
687 869
688 # the server does not allow map paths > 6 870 # the server does not allow map paths > 6
689 return if 6 <= length $path; 871 return if 6 <= length $path;
690 872
691 for my $tile (1..4) { 873 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
692 next if $self->{neigh}{$hash}[$tile]; 874
875 for (
876 [1, 0, -1],
877 [2, 1, 0],
878 [3, 0, 1],
879 [4, -1, 0],
880 ) {
881 my ($tile, $dx, $dy) = @$_;
882
883 my $gx = $gx + $dx;
884 my $gy = $gy + $dy;
885
693 next unless $flags & (1 << ($tile - 1)); 886 next unless $flags & (1 << ($tile - 1));
887 next if $self->{neigh_grid}{$gx, $gy}++;
694 888
695 my $neigh = $self->{neigh}{$hash} ||= []; 889 my $neigh = $self->{neigh_map}{$hash} ||= [];
696 890 if (my $info = $neigh->[$tile]) {
697 $self->send_mapinfo ("spatial $path$tile", sub {
698 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 891 my ($flags, $x, $y, $w, $h, $hash) = @$info;
699 892
700 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
701 return if $mode ne "spatial";
702
703 $x += $MAP->ox;
704 $y += $MAP->oy;
705
706 $self->load_map ($hash, $x, $y)
707 unless $self->{neigh}{$hash}[5]++;#d#
708
709 $neigh->[$tile] = [$x, $y, $w, $h];
710
711 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 893 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
712 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 894 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
895
896 } else {
897 $self->send_mapinfo ("spatial $path$tile", sub {
898 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
899
900 return if $mode ne "spatial";
901
902 $x += $MAP->ox;
903 $y += $MAP->oy;
904
905 $self->load_map ($hash, $x, $y)
906 unless $self->{neigh_map}{$hash}[5]++;#d#
907
908 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
909
910 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
911 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
912 });
713 }); 913 }
714 } 914 }
715} 915}
716 916
717sub conn::map_change { 917sub conn::map_change {
718 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 918 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
721 921
722 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 922 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
723 923
724 my $mapmapw = 250; 924 my $mapmapw = 250;
725 my $mapmaph = 250; 925 my $mapmaph = 250;
926
927 $self->{neigh_rect} = [
928 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
929 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
930 ];
726 931
932 delete $self->{neigh_grid};
727 $self->flood_fill ("", $hash, $flags, 933 $self->flood_fill (0, 0, "", $hash, $flags);
728 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
729 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
730 934
731 $x += $ox; 935 $x += $ox;
732 $y += $oy; 936 $y += $oy;
733 937
734 $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);
735 943
736 $self->load_map ($hash, $x, $y); 944 $self->load_map ($hash, $x, $y);
737} 945}
738 946
739sub conn::face_find { 947sub conn::face_find {
800 or return; 1008 or return;
801 1009
802 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]} 1010 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
803 or return; 1011 or return;
804 1012
805 $SDL_MIXER->play_channel (-1, $chunk, 0, -1); 1013 $chunk->play;
806 warn "sound $x,$y,$soundnum,$type\n";#d# 1014# warn "sound $x,$y,$soundnum,$type\n";#d#
807} 1015}
808 1016
809sub conn::query { 1017sub conn::query {
810 my ($self, $flags, $prompt) = @_; 1018 my ($self, $flags, $prompt) = @_;
811 1019
812 #TODO 1020 #TODO, display dialog with relevant information
813 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1021 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
814} 1022}
815 1023
816sub conn::drawinfo { 1024sub conn::drawinfo {
817 my ($self, $color, $text) = @_; 1025 my ($self, $color, $text) = @_;
833 ); 1041 );
834 1042
835 $LOGVIEW->add_paragraph ($color[$color], $text); 1043 $LOGVIEW->add_paragraph ($color[$color], $text);
836} 1044}
837 1045
1046sub conn::spell_add {
1047 my ($self, $spell) = @_;
1048
1049 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
1050 });
1051 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
1052 });
1053}
1054
1055sub conn::spell_delete {
1056 my ($self, $spell) = @_;
1057}
1058
1059sub conn::addme_success {
1060 my ($self) = @_;
1061
1062 for my $skill (values %{$self->{skill_info}}) {
1063 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1064 });
1065 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
1066 });
1067 }
1068}
1069
838%SDL_CB = ( 1070%SDL_CB = (
839 SDL_QUIT() => sub { 1071 CFClient::SDL_QUIT => sub {
840 Event::unloop -1; 1072 Event::unloop -1;
841 }, 1073 },
842 SDL_VIDEORESIZE() => sub { 1074 CFClient::SDL_VIDEORESIZE => sub {
843 }, 1075 },
844 SDL_VIDEOEXPOSE() => sub { 1076 CFClient::SDL_VIDEOEXPOSE => \&refresh,
845 refresh; 1077 CFClient::SDL_ACTIVEEVENT => sub {
1078# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
846 }, 1079 },
847 SDL_KEYDOWN() => sub { 1080 CFClient::SDL_KEYDOWN => sub {
848 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 1081 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
849 # alt-enter 1082 # alt-enter
850 video_shutdown; 1083 video_shutdown;
851 $CFG->{fullscreen} = !$CFG->{fullscreen}; 1084 $CFG->{fullscreen} = !$CFG->{fullscreen};
852 video_init; 1085 video_init;
853 } else { 1086 } else {
854 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 1087 CFClient::UI::feed_sdl_key_down_event ($_[0]);
855 } 1088 }
856 }, 1089 },
857 SDL_KEYUP() => sub { 1090 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
858 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 1091 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
859 }, 1092 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
860 SDL_MOUSEMOTION() => sub { 1093 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
861 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 1094 CFClient::SDL_USEREVENT => \&audio_music_finished,
862 },
863 SDL_MOUSEBUTTONDOWN() => sub {
864 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
865 },
866 SDL_MOUSEBUTTONUP() => sub {
867 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
868 },
869 SDL_ACTIVEEVENT() => sub {
870# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
871 },
872); 1095);
873 1096
874############################################################################# 1097#############################################################################
875 1098
876$SIG{INT} = $SIG{TERM} = sub { exit }; 1099$SIG{INT} = $SIG{TERM} = sub { exit };
888 fast => 0, 1111 fast => 0,
889 fow_enable => 1, 1112 fow_enable => 1,
890 fow_intensity => 0.45, 1113 fow_intensity => 0.45,
891 fow_smooth => 0, 1114 fow_smooth => 0,
892 gui_fontsize => 1, 1115 gui_fontsize => 1,
893 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,
894 mapsize => 100, 1121 mapsize => 100,
895 host => "crossfire.schmorp.de", 1122 host => "crossfire.schmorp.de",
896 say_command => 'say', 1123 say_command => 'say',
897 audio_enable => 1, 1124 audio_enable => 1,
898 bgm_enable => 1, 1125 bgm_enable => 1,
899 bgm_volume => 64, 1126 bgm_volume => 0.25,
900); 1127);
901 1128
902while (my ($k, $v) = each %DEF_CFG) { 1129while (my ($k, $v) = each %DEF_CFG) {
903 $CFG->{$k} = $v unless exists $CFG->{$k}; 1130 $CFG->{$k} = $v unless exists $CFG->{$k};
904} 1131}
905 1132
906sdl_init; 1133sdl_init;
907 1134
908@SDL_MODES = reverse 1135@SDL_MODES = reverse
909 grep $_->[0] >= 640 && $_->[1] >= 480, 1136 grep $_->[0] >= 640 && $_->[1] >= 480,
910 map [SDL::RectW ($_), SDL::RectH ($_)], 1137 CFClient::SDL_ListModes;
911 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
912 1138
913@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1139@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
914 1140
915$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1141$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
916 1142
924video_init; 1150video_init;
925audio_init; 1151audio_init;
926 1152
927Event::loop; 1153Event::loop;
928 1154
929END { SDL::Quit } 1155END { CFClient::SDL_Quit }
930 1156
931 1157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines