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.137 by elmex, Tue Apr 18 21:31:48 2006 UTC vs.
Revision 1.174 by root, Mon Apr 24 06:40:30 2006 UTC

4use utf8; 4use utf8;
5 5
6use Time::HiRes 'time'; 6use Time::HiRes 'time';
7use Event; 7use Event;
8 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
20use Crossfire; 9use Crossfire;
21use Crossfire::Protocol; 10use Crossfire::Protocol;
22 11
23use Compress::LZF; 12use Compress::LZF;
24 13
25use CFClient; 14use CFClient;
26use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
27 17
28our $VERSION = '0.1'; 18our $VERSION = '0.1';
29 19
30my $MAX_FPS = 60; 20my $MAX_FPS = 60;
31my $MIN_FPS = 5; # unused as of yet 21my $MIN_FPS = 5; # unused as of yet
46our @SDL_MODES; 36our @SDL_MODES;
47our $WIDTH; 37our $WIDTH;
48our $HEIGHT; 38our $HEIGHT;
49our $FULLSCREEN; 39our $FULLSCREEN;
50our $FONTSIZE; 40our $FONTSIZE;
41
42our $FONT_PROP;
43our $FONT_FIXED;
51 44
52our $MAP; 45our $MAP;
53our $MAPWIDGET; 46our $MAPWIDGET;
54our $BUTTONBAR; 47our $BUTTONBAR;
55our $LOGVIEW; 48our $LOGVIEW;
56our $CONSOLE; 49our $CONSOLE;
57our $METASERVER; 50our $METASERVER;
58 51
52our $FLOORBOX;
59our $GAUGES; 53our $GAUGES;
54our $STATWIDS;
60 55
61our $SDL_ACTIVE; 56our $SDL_ACTIVE;
62our $SDL_EV;
63our %SDL_CB; 57our %SDL_CB;
64 58
65our $SDL_MIXER; 59our $SDL_MIXER;
66our @SOUNDS; # event => file mapping 60our @SOUNDS; # event => file mapping
67our %AUDIO_CHUNKS; # audio files 61our %AUDIO_CHUNKS; # audio files
109 undef $CONN; 103 undef $CONN;
110} 104}
111 105
112sub client_setup { 106sub client_setup {
113 my $dialog = new CFClient::UI::FancyFrame 107 my $dialog = new CFClient::UI::FancyFrame
108 title => "Client Setup",
114 child => (my $vbox = new CFClient::UI::VBox); 109 child => (my $vbox = new CFClient::UI::VBox);
115 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
116 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 110 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
117 111
118 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 112 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
119 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 113 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
120 114
121 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 115 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
122 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 116 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
123 117
124 $mode_slider->connect (changed => sub { 118 $mode_slider->connect (changed => sub {
125 my ($self, $value) = @_; 119 my ($self, $value) = @_;
126 120
127 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 121 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
128 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 122 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
129 }); 123 });
130 $mode_slider->emit (changed => $mode_slider->{range}[0]); 124 $mode_slider->emit (changed => $mode_slider->{range}[0]);
131 125
126 my $row = 1;
127
132 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 128 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
133 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 129 $table->add (1, $row++, new CFClient::UI::CheckBox
130 state => $CFG->{fullscreen},
131 tooltip => "Bring the client into fullscreen mode",
132 connect_changed => sub {
134 my ($self, $value) = @_; 133 my ($self, $value) = @_;
135 $CFG->{fullscreen} = $value; 134 $CFG->{fullscreen} = $value;
135 }
136 }); 136 );
137 137
138 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 138 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
139 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 139 $table->add (1, $row++, new CFClient::UI::CheckBox
140 state => $CFG->{fast},
141 tooltip => "Lower the visual quality considerably to speed up rendering.",
142 connect_changed => sub {
140 my ($self, $value) = @_; 143 my ($self, $value) = @_;
141 $CFG->{fast} = $value; 144 $CFG->{fast} = $value;
145 }
142 }); 146 );
143 147
144 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 148 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
145 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 149 $table->add (1, $row++, new CFClient::UI::Slider
150 range => [$CFG->{map_scale}, 0.25, 2, 0.05],
151 tooltip => "Enlarge or shrink the displayed map",
152 connect_changed => sub {
146 my ($self, $value) = @_; 153 my ($self, $value) = @_;
154 $CFG->{map_scale} = 0.05 * int $value / 0.05;
155 }
156 );
157
158 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
159 $table->add (1, $row++, new CFClient::UI::CheckBox
160 state => $CFG->{fow_enable},
161 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
162 connect_changed => sub {
163 my ($self, $value) = @_;
147 $CFG->{fow_enable} = $value; 164 $CFG->{fow_enable} = $value;
165 }
148 }); 166 );
149 167
150 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 168 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
151 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 169 $table->add (1, $row++, new CFClient::UI::Slider
170 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
171 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
172 connect_changed => sub {
152 my ($self, $value) = @_; 173 my ($self, $value) = @_;
153 $CFG->{fow_intensity} = $value; 174 $CFG->{fow_intensity} = $value;
175 }
154 }); 176 );
155 177
156 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 178 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
157 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 179 $table->add (1, $row++, new CFClient::UI::CheckBox
180 state => $CFG->{fow_smooth},
181 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
182 connect_changed => sub {
158 my ($self, $value) = @_; 183 my ($self, $value) = @_;
159 $CFG->{fow_smooth} = $value; 184 $CFG->{fow_smooth} = $value;
160 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 185 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
186 }
161 }); 187 );
162 188
163 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 189 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
164 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 190 $table->add (1, $row++, new CFClient::UI::Slider
165 my ($self, $value) = @_; 191 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
166 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 192 tooltip => "The font size used by most GUI elements",
193 connect_changed => sub {
194 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
195# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
196 }
167 }); 197 );
168 198
169 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 199 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
200 $table->add (1, $row++, new CFClient::UI::Slider
201 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
202 tooltip => "The font size used by the server log window only",
203 connect_changed => sub {
204 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
205 }
206 );
207
208 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
209
210 $table->add (1, $row++, new CFClient::UI::Slider
211 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
212 tooltip => "The font size used by the statistics window only",
213 connect_changed => sub {
214 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
215 &set_stats_window_fontsize;
216 }
217 );
218
219 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
220 $table->add (1, $row++, new CFClient::UI::Slider
221 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
222 tooltip => "Adjust the size of the stats gauges at the bottom right",
223 connect_changed => sub {
224 $CFG->{gauge_size} = $_[1];
225 my $h = int $HEIGHT * $CFG->{gauge_size};
226 $GAUGES->{win}->set_size ($WIDTH, $h);
227 $GAUGES->{win}->move (0, $HEIGHT - $h);
228 }
229 );
230
231 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
232 $table->add (1, $row++, new CFClient::UI::Slider
233 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
234 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
235 connect_changed => sub {
236 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
237 &set_gauge_window_fontsize;
238 }
239 );
240
241 $table->add (1, $row++, new CFClient::UI::Button
242 expand => 1, align => 0, text => "Apply",
243 tooltip => "Apply the video settings",
244 connect_activate => sub {
170 video_shutdown (); 245 video_shutdown ();
171 video_init (); 246 video_init ();
247 }
248 );
249
250 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
251 $table->add (1, $row++, new CFClient::UI::CheckBox
252 state => $CFG->{audio_enable},
253 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
254 connect_changed => sub {
255 $CFG->{audio_enable} = $_[1];
256 }
257 );
258# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
259# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
260# $CFG->{effects_volume} = $_[1];
172 }); 261# });
173
174 $table->add (0, 8, new CFClient::UI::Label align => 1, text => "Sound"); 262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
175 $table->add (1, 8, new CFClient::UI::CheckBox state => $CFG->{sound}, connect_changed => sub { 263 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
176 my ($self, $value) = @_; 264 $hbox->add (new CFClient::UI::CheckBox
177 $CFG->{sound} = $value; 265 expand => 1, state => $CFG->{bgm_enable},
266 tooltip => "Enable background music playing",
267 connect_changed => sub {
268 $CFG->{bgm_enable} = $_[1];
269 }
178 }); 270 );
179 $table->add (0, 9, new CFClient::UI::Label align => 1, text => "Bg. Music"); 271 $hbox->add (new CFClient::UI::Slider
180 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{bg_music_enable}, connect_changed => sub { 272 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
181 my ($self, $value) = @_; 273 tooltip => "The volume of the background music",
182 $CFG->{bg_music_enable} = $value; 274 connect_changed => sub {
275 $CFG->{bgm_volume} = $_[1];
276 CFClient::MixMusic::volume $_[1] * 128;
277 }
183 }); 278 );
184 $table->add (1, 10, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 279
280 $table->add (1, $row++, new CFClient::UI::Button
281 expand => 1, align => 0, text => "Apply",
282 tooltip => "Apply the audio settings",
283 connect_activate => sub {
185 audio_shutdown (); 284 audio_shutdown ();
186 audio_init (); 285 audio_init ();
286 }
187 }); 287 );
188 288
189 $dialog 289 $dialog
290}
291
292sub set_stats_window_fontsize {
293 for (values %{$STATWIDS}) {
294 $_->set_fontsize ($::CFG->{stat_fontsize});
295 }
296}
297
298sub set_gauge_window_fontsize {
299 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
300 $_->set_fontsize ($::CFG->{gauge_fontsize});
301 }
302
303# local $GAUGES->{win}{parent};#d#
304# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
305}
306
307sub make_gauge_window {
308 my $gh = int ($HEIGHT * $CFG->{gauge_size});
309# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
310
311 my $win = new CFClient::UI::Frame (
312 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
313 );
314 $win->add (my $hbox = new CFClient::UI::HBox
315 children => [
316 (new CFClient::UI::HBox expand => 1),
317 ($FLOORBOX = new CFClient::UI::VBox),
318 (my $vbox = new CFClient::UI::VBox),
319 ],
320 );
321
322 $vbox->add (new CFClient::UI::HBox
323 expand => 1,
324 children => [
325 (new CFClient::UI::Empty expand => 1),
326 (my $hb = new CFClient::UI::HBox),
327 ],
328 );
329
330 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
331 tooltip => "Health points - depletes when you get wounded, refills when you heal or idle");
332 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
333 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle");
334 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
335 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray");
336 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
337 tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food");
338
339 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
340 tooltip => "Experience points and level - increases when you kill monsters or successfully use skills");
341 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
342 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
343
344 $GAUGES = {
345 exp => $exp, win => $win, range => $rng,
346 food => $fg, mana => $mg, hp => $hg, grace => $gg
347 };
348
349 &set_gauge_window_fontsize;
350
351 $win
352}
353
354sub make_stats_window {
355 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
356
357 $tgw->add (my $vb = new CFClient::UI::VBox);
358 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
359 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
360
361 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
362
363 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
364
365 my $black = [0, 0, 0];
366
367 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
368 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
369 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
370 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
371 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
372 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
373 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
374
375 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str");
376 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex");
377 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con");
378 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int");
379 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis");
380 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow");
381 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha");
382
383 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
384 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
385 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
386 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
387 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
388 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
389
390 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
391 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
392 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
393 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
394 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
395 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
396
397 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
398
399 my $row = 0;
400 my $col = 0;
401
402 my %resist_names = (
403 slow => "Slow",
404 holyw => "Holy Word",
405 conf => "Confusion",
406 fire => "Fire",
407 depl => "Depletion",
408 magic => "Magic",
409 drain => "Draining",
410 acid => "Acid",
411 pois => "Poison",
412 para => "Paralysation",
413 deat => "Death",
414 phys => "Physical",
415 blind => "Blind",
416 fear => "Fear",
417 tund => "Turn undead",
418 elec => "Electricity",
419 cold => "Cold",
420 ghit => "Ghost hit",
421 );
422 for (qw/slow holyw conf fire depl magic
423 drain acid pois para deat phys
424 blind fear tund elec cold ghit/)
425 {
426 $tbl2->add ($col, $row,
427 $STATWIDS->{"res_$_"} =
428 new CFClient::UI::Label
429 template => "-100%",
430 align => +1,
431 valign => 0,
432 tooltip => $resist_names{$_}
433 );
434 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
435 can_hover => 1,
436 can_events => 1,
437 image => "ui/resist/resist_$_.png",
438 tooltip => $resist_names{$_}
439 );
440
441 $row++;
442 if ($row % 6 == 0) {
443 $col += 2;
444 $row = 0;
445 }
446 }
447
448 &set_stats_window_fontsize;
449 update_stats_window ({});
450
451 $tgw
452}
453
454sub formsep {
455 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
456}
457
458sub update_stats_window {
459 my ($stats) = @_;
460
461 # i love text protocols!!!
462 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
463 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
464 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
465 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
466 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
467 my $fo_m = 999;
468 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
469 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
470
471 $GAUGES->{hp} ->set_value ($hp, $hp_m);
472 $GAUGES->{mana} ->set_value ($sp, $sp_m);
473 $GAUGES->{food} ->set_value ($fo, $fo_m);
474 $GAUGES->{grace} ->set_value ($gr, $gr_m);
475 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
476 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
477 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
478 $rng =~ s/^Range: //; # thank you so much dear server
479 $GAUGES->{range} ->set_text ("Rng: " . $rng);
480 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
481 $title =~ s/^Player: //;
482 $STATWIDS->{title} ->set_text ("Title: " . $title);
483
484 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
485 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
486 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
487 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
488 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
489 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
490 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
491 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
492 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
493 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
494 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
495 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
496 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
497
498 my %tbl = (
499 phys => 100,
500 magic => 101,
501 fire => 102,
502 elec => 103,
503 cold => 104,
504 conf => 105,
505 acid => 106,
506 drain => 107,
507 ghit => 108,
508 pois => 109,
509 slow => 110,
510 para => 111,
511 tund => 112,
512 fear => 113,
513 depl => 113,
514 deat => 115,
515 holyw => 116,
516 blind => 117
517 );
518
519 for (keys %tbl) {
520 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
521 }
522
190} 523}
191 524
192sub metaserver_dialog { 525sub metaserver_dialog {
193 my $dialog = new CFClient::UI::FancyFrame 526 my $dialog = new CFClient::UI::FancyFrame
527 title => "Metaserver",
194 child => (my $vbox = new CFClient::UI::VBox); 528 child => (my $vbox = new CFClient::UI::VBox);
195 529
196 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 530 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
197 531
198 $dialog 532 $dialog
255 $HOST->set_text ($CFG->{host} = $host); 589 $HOST->set_text ($CFG->{host} = $host);
256 }), 590 }),
257 (new CFClient::UI::Empty expand => 1), 591 (new CFClient::UI::Empty expand => 1),
258 ]); 592 ]);
259 593
260 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 594 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
261 for 0 .. $#$m; 595 for 0 .. $#$m;
262 } 596 }
263 } 597 }
264 }); 598 });
265} 599}
266 600
267sub server_setup { 601sub server_setup {
268 my $dialog = new CFClient::UI::FancyFrame 602 my $dialog = new CFClient::UI::FancyFrame
603 title => "Server Setup",
269 child => (my $vbox = new CFClient::UI::VBox); 604 child => (my $vbox = new CFClient::UI::VBox);
270 605
271 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
272 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 606 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
273 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 607 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
274 608
275 { 609 {
276 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 610 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
277 611
278 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 612 $vbox->add (
613 my $HOST = new CFClient::UI::Entry
614 expand => 1,
615 text => $CFG->{host},
616 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
617 connect_changed => sub {
618 my ($self, $value) = @_;
619 $CFG->{host} = $value;
620 }
621 );
622
623 $METASERVER = metaserver_dialog;
624
625 $vbox->add (new CFClient::UI::Flopper
626 expand => 1,
627 text => "Metaserver",
628 other => $METASERVER,
629 tooltip => "Show a list of avaible crossfire servers",
630 connect_open => sub {
631 update_metaserver $HOST;
632 }
633 );
634 }
635
636 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
637 $table->add (1, 4, new CFClient::UI::Entry
638 text => $CFG->{user},
639 tooltip => "The name of your character on the server",
640 connect_changed => sub {
279 my ($self, $value) = @_; 641 my ($self, $value) = @_;
280 $CFG->{host} = $value; 642 $CFG->{user} = $value;
281 }); 643 }
644 );
282 645
283 $METASERVER = metaserver_dialog;
284
285 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
286 update_metaserver $HOST;
287 });
288 }
289
290 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 646 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
291 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 647 $table->add (1, 5, new CFClient::UI::Entry
648 text => $CFG->{password},
649 hidden => 1,
650 tooltip => "The password for your character",
651 connect_changed => sub {
292 my ($self, $value) = @_; 652 my ($self, $value) = @_;
293 $CFG->{user} = $value;
294 });
295
296 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
297 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
298 my ($self, $value) = @_;
299 $CFG->{password} = $value; 653 $CFG->{password} = $value;
654 }
300 }); 655 );
301 656
302 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 657 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
303 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 658 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
659 text => $CFG->{say_command},
660 tooltip => "This is the command that will be used if you write a line in the message window entry. "
661 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
662 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.",
663 connect_changed => sub {
304 my ($self, $value) = @_; 664 my ($self, $value) = @_;
305 $CFG->{say_command} = $value; 665 $CFG->{say_command} = $value;
666 }
306 }); 667 );
307 668
308 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 669 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
309 $table->add (1, 7, new CFClient::UI::Slider 670 $table->add (1, 7, new CFClient::UI::Slider
310 req_w => 100, 671 req_w => 100,
311 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 672 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
673 tooltip => "This is the size of the portion of the map update the server sends you. "
674 ."If you set this to a high value you will be able to see further for example.",
312 connect_changed => sub { 675 connect_changed => sub {
313 my ($self, $value) = @_; 676 my ($self, $value) = @_;
314 677
315 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 678 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
316 }, 679 },
323 $dialog 686 $dialog
324} 687}
325 688
326sub message_window { 689sub message_window {
327 my $window = new CFClient::UI::FancyFrame 690 my $window = new CFClient::UI::FancyFrame
691 title => "Messages",
328 border_bg => [1, 1, 1, 0.5], 692 border_bg => [1, 1, 1, 0.5],
329 bg => [0.3, 0.3, 0.3, 0.8], 693 bg => [0.3, 0.3, 0.3, 0.8],
330 user_w => int $::WIDTH / 3, 694 user_w => int $::WIDTH / 3,
331 user_h => int $::HEIGHT / 5, 695 user_h => int $::HEIGHT / 5,
332 child => (my $vbox = new CFClient::UI::VBox); 696 child => (my $vbox = new CFClient::UI::VBox);
333 697
334 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 698 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
335 expand => 1, 699 expand => 1,
700 font => $FONT_FIXED,
336 fontsize => $::CFG->{log_fontsize}, 701 fontsize => $::CFG->{log_fontsize},
337 ); 702 );
338 703
339 $vbox->add (my $input = new CFClient::UI::Entry 704 $vbox->add (my $input = new CFClient::UI::Entry
340 connect_focus_in => sub { 705 connect_focus_in => sub {
374 739
375 $window 740 $window
376} 741}
377 742
378sub sdl_init { 743sub sdl_init {
379 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 744 CFClient::SDL_Init
380 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
381 and die "SDL::Init failed!\n"; 745 and die "SDL::Init failed!\n";
382} 746}
383 747
384sub video_init { 748sub video_init {
385 sdl_init; 749 sdl_init;
386 750
387 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 751 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
388 $FULLSCREEN = $CFG->{fullscreen}; 752 $FULLSCREEN = $CFG->{fullscreen};
389 $FAST = $CFG->{fast}; 753 $FAST = $CFG->{fast};
390 754
391 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 755 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
392 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
393 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
394 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
395
396 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
397 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
398 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
399 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
400
401 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
402 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
403 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
404
405 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
406 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
407 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
408 or die "SDL::SetVideoMode failed!\n"; 756 or die "SDL_SetVideoMode failed!\n";
409
410 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
411
412 $SDL_EV = new SDL::Event;
413 $SDL_EV->set_unicode (1);
414 757
415 $SDL_ACTIVE = 1; 758 $SDL_ACTIVE = 1;
416 759
417 $LAST_REFRESH = time - 0.01; 760 $LAST_REFRESH = time - 0.01;
418 761
419 CFClient::gl_init; 762 CFClient::gl_init;
420 763
421 $FONTSIZE = int $HEIGHT / 40; 764 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
422 765
423 ############################################################################# 766 #############################################################################
424 767
425 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 768 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
426 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 769 $DEBUG_STATUS->show;
427 770
428 $STATUS_LINE = new CFClient::UI::Label 771 $STATUS_LINE = new CFClient::UI::Label
429 padding => 0, 772 padding => 0,
430 y => $HEIGHT * 44 / 45 - $FONTSIZE; 773 y => $HEIGHT - $FONTSIZE * 1.8;
431 $CFClient::UI::ROOT->add ($STATUS_LINE); 774 $STATUS_LINE->show;
432 775
433 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 776 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
434 padding => 0, 777 padding => 0,
435 y => $HEIGHT * 44 / 45,
436 fontsize => $HEIGHT / 45, 778 fontsize => 0.8,
437 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 779 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
438 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 780 $ALT_ENTER_MESSAGE->show;
781 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
439 782
440 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 783 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
441 $MAPWIDGET->focus_in; 784 $MAPWIDGET->focus_in;
442 $MAPWIDGET->connect (activate_console => sub { 785 $MAPWIDGET->connect (activate_console => sub {
443 my ($mapwidget, $preset) = @_; 786 my ($mapwidget, $preset) = @_;
444 787
445 if ($CONSOLE) { 788 if ($CONSOLE) {
455 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 798 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
456 799
457 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 800 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
458 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 801 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
459 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 802 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
803
804 $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
805 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
460 806
461 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 807 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
462 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 808 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
463 status "Configuration Saved"; 809 status "Configuration Saved";
464 }); 810 });
465 811
466 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 812 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
467
468 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
469 $tgw->add (my $hbox = new CFClient::UI::HBox ());
470
471 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
472 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
473 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
474 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
475
476 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
477 $CFClient::UI::ROOT->add ($tgw);
478} 813}
479 814
480sub video_shutdown { 815sub video_shutdown {
481 $CFClient::UI::ROOT->{children} = []; 816 $CFClient::UI::ROOT->{children} = [];
482 undef $SDL_ACTIVE; 817 undef $SDL_ACTIVE;
483 undef $SDL_EV;
484} 818}
485 819
820my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
486my $bgmusic;#TODO#hack#d# 821my $bgmusic;#TODO#hack#d#
487 822
823sub audio_music_finished {
824 return unless $CFG->{bgm_enable};
825
826 # TODO: hack, do play loop and mood music
827 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
828 $bgmusic->play (0);
829
830 push @bgmusic, shift @bgmusic;
831}
832
488sub audio_init { 833sub audio_init {
489 if ($CFG->{sound} || 1) { 834 if ($CFG->{audio_enable}) {
490 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 835 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
491 $SDL_MIXER = new SDL::Mixer; 836 $SDL_MIXER = !CFClient::Mix_OpenAudio;
492 $SDL_MIXER->allocate_channels (8); 837 CFClient::Mix_AllocateChannels 8;
838 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
493 839
494 if ($CFG->{bg_music_enable}) { 840 audio_music_finished;
495 $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
496 $SDL_MIXER->play_music ($bgmusic, -1);
497 }
498 841
499 while (<$fh>) { 842 while (<$fh>) {
500 next if /^\s*#/; 843 next if /^\s*#/;
501 next if /^\s*$/; 844 next if /^\s*$/;
502 845
503 my ($file, $volume, $event) = split /\s+/, $_, 3; 846 my ($file, $volume, $event) = split /\s+/, $_, 3;
504 847
505 push @SOUNDS, "$volume,$file"; 848 push @SOUNDS, "$volume,$file";
506 849
507 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 850 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
508 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file"; 851 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
509 $chunk->volume ($volume * 128 / 100); 852 $chunk->volume ($volume * 128 / 100);
510 $chunk 853 $chunk
511 }; 854 };
512 } 855 }
513 } else { 856 } else {
515 } 858 }
516 } 859 }
517} 860}
518 861
519sub audio_shutdown { 862sub audio_shutdown {
863 CFClient::Mix_CloseAudio if $SDL_MIXER;
520 undef $SDL_MIXER; 864 undef $SDL_MIXER;
521 @SOUNDS = (); 865 @SOUNDS = ();
522 %AUDIO_CHUNKS = (); 866 %AUDIO_CHUNKS = ();
523} 867}
524 868
537 $want_refresh = 0; 881 $want_refresh = 0;
538 $can_refresh = 0; 882 $can_refresh = 0;
539 883
540 $CFClient::UI::ROOT->draw; 884 $CFClient::UI::ROOT->draw;
541 885
542 SDL::GLSwapBuffers; 886 CFClient::SDL_GL_SwapBuffers;
543 887
544 $LAST_REFRESH = $NOW; 888 $LAST_REFRESH = $NOW;
545} 889}
546 890
547my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 891my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
548 $NOW = time; 892 $NOW = time;
549 893
550 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 894 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
551 while $SDL_EV->poll; 895 for CFClient::SDL_PollEvent;
552 896
553 if (%animate_object) { 897 if (%animate_object) {
554 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 898 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
555 $want_refresh++; 899 $want_refresh++;
556 } 900 }
579@conn::ISA = Crossfire::Protocol::; 923@conn::ISA = Crossfire::Protocol::;
580 924
581sub conn::stats_update { 925sub conn::stats_update {
582 my ($self, $stats) = @_; 926 my ($self, $stats) = @_;
583 927
584 # i love text protocols!!! 928 update_stats_window ($stats);
585 # FIXME: the stats are somehow weird
586 my $hp = $stats->{1};
587 my $hp_m = $stats->{2};
588 my $sp = $stats->{3};
589 my $sp_m = $stats->{4};
590 my $fo = $stats->{18};
591 my $fo_m = 1000;
592 my $gr = $stats->{23};
593 my $gr_m = $stats->{24};
594
595 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
596 $GAUGES->{hp}->set_value ($hp, $hp_m);
597 $GAUGES->{mana}->set_value ($sp, $sp_m);
598 $GAUGES->{food}->set_value ($fo, $fo_m);
599 $GAUGES->{grace}->set_value ($gr, $gr_m);
600} 929}
601 930
602sub conn::user_send { 931sub conn::user_send {
603 my ($self, $command) = @_; 932 my ($self, $command) = @_;
604 933
629 958
630 my ($hash, $x, $y, $w, $h) = @$map_info; 959 my ($hash, $x, $y, $w, $h) = @$map_info;
631 960
632 my $data = $MAP->get_rect ($x, $y, $w, $h); 961 my $data = $MAP->get_rect ($x, $y, $w, $h);
633 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 962 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
634
635 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 963 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
636
637} 964}
638 965
639sub conn::map_clear { 966sub conn::map_clear {
640 my ($self) = @_; 967 my ($self) = @_;
641 968
642 $self->flush_map; 969 $self->flush_map;
643 delete $self->{neigh}; 970 delete $self->{neigh_map};
644 971
645 $MAP->clear; 972 $MAP->clear;
646} 973}
647 974
648 975
649sub conn::load_map($$$) { 976sub conn::load_map($$$) {
650 my ($self, $hash, $x, $y) = @_; 977 my ($self, $hash, $x, $y) = @_;
651 978
652 if (defined (my $data = $MAPCACHE->get ($hash))) { 979 if (defined (my $data = $MAPCACHE->get ($hash))) {
653 $data = Compress::LZF::decompress $data; 980 $data = Compress::LZF::decompress $data;
654 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 981 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
655 for my $id ($MAP->set_rect ($x, $y, $data)) { 982 for my $id ($MAP->set_rect ($x, $y, $data)) {
656 my $data = $TILECACHE->get ($id) 983 my $data = $TILECACHE->get ($id)
657 or next; 984 or next;
658 985
659 $self->set_texture ($id => $data); 986 $self->set_texture ($id => $data);
660 } 987 }
661 } 988 }
662} 989}
663 990
991# this method does a "flood fill" into every tile direction
992# it assumes that tiles are arranged in a rectangular grid,
993# i.e. a map is the same as the left of the right map etc.
994# failure to comply are harmless and result in display errors
995# at worst.
664sub conn::flood_fill { 996sub conn::flood_fill {
665 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 997 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
666 998
667 # the server does not allow map paths > 6 999 # the server does not allow map paths > 6
668 return if 6 <= length $path; 1000 return if 6 <= length $path;
669 1001
670 for my $tile (1..4) { 1002 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
671 next if $self->{neigh}{$hash}[$tile]; 1003
1004 for (
1005 [1, 0, -1],
1006 [2, 1, 0],
1007 [3, 0, 1],
1008 [4, -1, 0],
1009 ) {
1010 my ($tile, $dx, $dy) = @$_;
1011
1012 my $gx = $gx + $dx;
1013 my $gy = $gy + $dy;
1014
672 next unless $flags & (1 << ($tile - 1)); 1015 next unless $flags & (1 << ($tile - 1));
1016 next if $self->{neigh_grid}{$gx, $gy}++;
673 1017
674 my $neigh = $self->{neigh}{$hash} ||= []; 1018 my $neigh = $self->{neigh_map}{$hash} ||= [];
675 1019 if (my $info = $neigh->[$tile]) {
676 $self->send_mapinfo ("spatial $path$tile", sub {
677 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1020 my ($flags, $x, $y, $w, $h, $hash) = @$info;
678 1021
679 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
680 return if $mode ne "spatial";
681
682 $x += $MAP->ox;
683 $y += $MAP->oy;
684
685 $self->load_map ($hash, $x, $y)
686 unless $self->{neigh}{$hash}[5]++;#d#
687
688 $neigh->[$tile] = [$x, $y, $w, $h];
689
690 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 1022 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
691 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1023 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1024
1025 } else {
1026 $self->send_mapinfo ("spatial $path$tile", sub {
1027 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1028
1029 return if $mode ne "spatial";
1030
1031 $x += $MAP->ox;
1032 $y += $MAP->oy;
1033
1034 $self->load_map ($hash, $x, $y)
1035 unless $self->{neigh_map}{$hash}[5]++;#d#
1036
1037 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1038
1039 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
1040 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1041 });
692 }); 1042 }
693 } 1043 }
694} 1044}
695 1045
696sub conn::map_change { 1046sub conn::map_change {
697 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 1047 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
700 1050
701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1051 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
702 1052
703 my $mapmapw = 250; 1053 my $mapmapw = 250;
704 my $mapmaph = 250; 1054 my $mapmaph = 250;
1055
1056 $self->{neigh_rect} = [
1057 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1058 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1059 ];
705 1060
1061 delete $self->{neigh_grid};
706 $self->flood_fill ("", $hash, $flags, 1062 $self->flood_fill (0, 0, "", $hash, $flags);
707 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
708 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
709 1063
710 $x += $ox; 1064 $x += $ox;
711 $y += $oy; 1065 $y += $oy;
712 1066
713 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1067 $self->{map_info} = [$hash, $x, $y, $w, $h];
1068
1069 my $map = $self->{map_info}[0];
1070 $map =~ s/^.*?\/([^\/]+)$/\1/;
1071 $STATWIDS->{map}->set_text ("Map: " . $map);
714 1072
715 $self->load_map ($hash, $x, $y); 1073 $self->load_map ($hash, $x, $y);
716} 1074}
717 1075
718sub conn::face_find { 1076sub conn::face_find {
744 } 1102 }
745 1103
746gotid: 1104gotid:
747 $face->{id} = $id; 1105 $face->{id} = $id;
748 $MAP->set_face ($facenum => $id); 1106 $MAP->set_face ($facenum => $id);
1107 $self->{faceid}[$facenum] = $id;#d#
749 $TILECACHE->get ($id) 1108 $TILECACHE->get ($id)
750} 1109}
751 1110
752sub conn::face_update { 1111sub conn::face_update {
753 my ($self, $facenum, $face) = @_; 1112 my ($self, $facenum, $face) = @_;
761 my ($self, $id, $data) = @_; 1120 my ($self, $id, $data) = @_;
762 1121
763 $self->{texture}[$id] ||= do { 1122 $self->{texture}[$id] ||= do {
764 my $tex = 1123 my $tex =
765 new_from_image CFClient::Texture 1124 new_from_image CFClient::Texture
766 $data, minify => 1; 1125 $data, minify => 1, mipmap => 1;
767 1126
768 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1127 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
769 $MAPWIDGET->update; 1128 $MAPWIDGET->update;
770 1129
771 $tex 1130 $tex
773} 1132}
774 1133
775sub conn::sound_play { 1134sub conn::sound_play {
776 my ($self, $x, $y, $soundnum, $type) = @_; 1135 my ($self, $x, $y, $soundnum, $type) = @_;
777 1136
1137 $SDL_MIXER
1138 or return;
1139
778 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]} 1140 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
779 or return; 1141 or return;
780 1142
781 $SDL_MIXER->play_channel (-1, $chunk); 1143 $chunk->play;
782 warn "sound $x,$y,$soundnum,$type\n";#d# 1144# warn "sound $x,$y,$soundnum,$type\n";#d#
783} 1145}
1146
1147my $LAST_QUERY; # server is stupid, stupid, stupid
784 1148
785sub conn::query { 1149sub conn::query {
786 my ($self, $flags, $prompt) = @_; 1150 my ($self, $flags, $prompt) = @_;
787 1151
788 #TODO 1152 $prompt = $LAST_QUERY unless length $prompt;
789 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1153 $LAST_QUERY = $prompt;
1154
1155 my $dialog = new CFClient::UI::FancyFrame
1156 title => "Query",
1157 child => my $vbox = new CFClient::UI::VBox;
1158
1159 $vbox->add (new CFClient::UI::Label
1160 max_w => $::WIDTH * 0.4,
1161 text => $prompt);
1162
1163 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1164 $vbox->add (my $hbox = new CFClient::HBox);
1165 $hbox->add (new CFClient::Button
1166 text => "No",
1167 connect_activate => sub {
1168 $self->send ("reply n");
1169 $dialog->destroy;
1170 $MAPWIDGET->focus_in;
1171 }
1172 );
1173 $hbox->add (new CFClient::Button
1174 text => "Yes",
1175 connect_activate => sub {
1176 $self->send ("reply y");
1177 $dialog->destroy;
1178 $MAPWIDGET->focus_in;
1179 },
1180 );
1181
1182 $dialog->focus_in;
1183
1184 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1185 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1186 $vbox->add (my $entry = new CFClient::UI::Entry
1187 connect_changed => sub {
1188 $self->send ("reply $_[1]");
1189 $dialog->destroy;
1190 $MAPWIDGET->focus_in;
1191 },
1192 );
1193
1194 $entry->focus_in;
1195
1196 } else {
1197 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1198
1199 $vbox->add (my $entry = new CFClient::UI::Entry
1200 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1201 connect_activate => sub {
1202 $self->send ("reply $_[1]");
1203 $dialog->destroy;
1204 $MAPWIDGET->focus_in;
1205 },
1206 );
1207
1208 $entry->focus_in;
1209 }
1210
1211 $dialog->show;
790} 1212}
791 1213
792sub conn::drawinfo { 1214sub conn::drawinfo {
793 my ($self, $color, $text) = @_; 1215 my ($self, $color, $text) = @_;
794 1216
809 ); 1231 );
810 1232
811 $LOGVIEW->add_paragraph ($color[$color], $text); 1233 $LOGVIEW->add_paragraph ($color[$color], $text);
812} 1234}
813 1235
1236sub conn::spell_add {
1237 my ($self, $spell) = @_;
1238
1239 # TODO
1240 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1241 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
1242 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
1243}
1244
1245sub conn::spell_delete {
1246 my ($self, $spell) = @_;
1247}
1248
1249sub conn::addme_success {
1250 my ($self) = @_;
1251
1252 for my $skill (values %{$self->{skill_info}}) {
1253 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1254 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1255 }
1256}
1257
1258sub update_floorbox {
1259 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1260 $FLOORBOX->clear;
1261 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1262
1263 my @items = values %{ $CONN->{container}{0} };
1264
1265 # we basically have to use the same sorting as everybody else
1266 @items = sort { $a->{type} <=> $b->{type} } @items;
1267
1268 for my $item (reverse @items) {
1269 my $desc = $item->{nrof} < 2
1270 ? $item->{name}
1271 : "$item->{nrof} $item->{name_pl}";
1272 # todo: animation widget, face widget, weight(?) etc.
1273 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1274 tooltip => (CFClient::UI::Label->escape ($desc)
1275 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1276 can_hover => 1,
1277 can_events => 1,
1278 connect_button_down => sub {
1279 my ($self, $ev, $x, $y) = @_;
1280
1281 # todo: maybe put examine on 1? but should just be a tooltip :(
1282 if ($ev->{button} == 1) {
1283 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1284 } elsif ($ev->{button} == 2) {
1285 $CONN->send ("apply $item->{tag}");
1286 } elsif ($ev->{button} == 3) {
1287 # examine, lock, mark, maybe other things
1288 warn "MENU not implemented yet\n";
1289 }
1290
1291 1
1292 },
1293 );
1294
1295 $hbox->add (new CFClient::UI::Face
1296 face => $item->{face},
1297 anim => $item->{anim},
1298 animspeed => $item->{animspeed},
1299 );
1300
1301 $hbox->add (new CFClient::UI::Label
1302 text => $desc,
1303 );
1304 }
1305 });
1306 refresh;
1307}
1308
1309sub conn::container_add {
1310 my ($self, $id, $items) = @_;
1311
1312 update_floorbox if $id == 0;
1313 # $self-<{player}{tag} => player inv
1314 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1315}
1316
1317sub conn::container_clear {
1318 my ($self, $id) = @_;
1319
1320 update_floorbox if $id == 0;
1321# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1322}
1323
1324sub conn::item_delete {
1325 my ($self, @items) = @_;
1326
1327 for (@items) {
1328 update_floorbox if $_->{container} == 0;
1329 }
1330}
1331
1332sub conn::item_update {
1333 my ($self, $item) = @_;
1334
1335 update_floorbox if $item->{container} == 0;
1336}
1337
814%SDL_CB = ( 1338%SDL_CB = (
815 SDL_QUIT() => sub { 1339 CFClient::SDL_QUIT => sub {
816 Event::unloop -1; 1340 Event::unloop -1;
817 }, 1341 },
818 SDL_VIDEORESIZE() => sub { 1342 CFClient::SDL_VIDEORESIZE => sub {
819 }, 1343 },
820 SDL_VIDEOEXPOSE() => sub { 1344 CFClient::SDL_VIDEOEXPOSE => \&refresh,
821 refresh; 1345 CFClient::SDL_ACTIVEEVENT => sub {
1346# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
822 }, 1347 },
823 SDL_KEYDOWN() => sub { 1348 CFClient::SDL_KEYDOWN => sub {
824 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 1349 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
825 # alt-enter 1350 # alt-enter
826 video_shutdown; 1351 video_shutdown;
827 $CFG->{fullscreen} = !$CFG->{fullscreen}; 1352 $CFG->{fullscreen} = !$CFG->{fullscreen};
828 video_init; 1353 video_init;
829 } else { 1354 } else {
830 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 1355 CFClient::UI::feed_sdl_key_down_event ($_[0]);
831 } 1356 }
832 }, 1357 },
833 SDL_KEYUP() => sub { 1358 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
834 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 1359 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
835 }, 1360 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
836 SDL_MOUSEMOTION() => sub { 1361 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
837 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 1362 CFClient::SDL_USEREVENT => \&audio_music_finished,
838 },
839 SDL_MOUSEBUTTONDOWN() => sub {
840 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
841 },
842 SDL_MOUSEBUTTONUP() => sub {
843 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
844 },
845 SDL_ACTIVEEVENT() => sub {
846# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
847 },
848); 1363);
849 1364
850############################################################################# 1365#############################################################################
851 1366
852$SIG{INT} = $SIG{TERM} = sub { exit }; 1367$SIG{INT} = $SIG{TERM} = sub { exit };
860 sdl_mode => 0, 1375 sdl_mode => 0,
861 width => 640, 1376 width => 640,
862 height => 480, 1377 height => 480,
863 fullscreen => 0, 1378 fullscreen => 0,
864 fast => 0, 1379 fast => 0,
1380 map_scale => 0.5,
865 fow_enable => 1, 1381 fow_enable => 1,
866 fow_intensity => 0.45, 1382 fow_intensity => 0.45,
867 fow_smooth => 0, 1383 fow_smooth => 0,
1384 gui_fontsize => 1,
868 log_fontsize => 14, 1385 log_fontsize => 1,
1386 gauge_fontsize => 1,
1387 gauge_size => 0.35,
1388 stat_fontsize => 1,
869 mapsize => 100, 1389 mapsize => 100,
870 host => "crossfire.schmorp.de", 1390 host => "crossfire.schmorp.de",
871 say_command => 'say', 1391 say_command => 'say',
1392 audio_enable => 1,
1393 bgm_enable => 1,
1394 bgm_volume => 0.25,
872); 1395);
873 1396
874while (my ($k, $v) = each %DEF_CFG) { 1397while (my ($k, $v) = each %DEF_CFG) {
875 $CFG->{$k} = $v unless exists $CFG->{$k}; 1398 $CFG->{$k} = $v unless exists $CFG->{$k};
876} 1399}
877 1400
878sdl_init; 1401sdl_init;
879 1402
880@SDL_MODES = reverse 1403@SDL_MODES = reverse
881 grep $_->[0] >= 640 && $_->[1] >= 480, 1404 grep $_->[0] >= 640 && $_->[1] >= 480,
882 map [SDL::RectW ($_), SDL::RectH ($_)], 1405 CFClient::SDL_ListModes;
883 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
884 1406
885@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1407@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
886 1408
887$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1409$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
888 1410
889{ 1411{
890 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1412 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1413 DejaVuSans.ttf
1414 DejaVuSansMono.ttf
1415 DejaVuSans-Bold.ttf
1416 DejaVuSansMono-Bold.ttf
1417 DejaVuSans-Oblique.ttf
1418 DejaVuSansMono-Oblique.ttf
1419 DejaVuSans-BoldOblique.ttf
1420 DejaVuSansMono-BoldOblique.ttf
1421 );
891 1422
892 CFClient::add_font $_ for @fonts; 1423 CFClient::add_font $_ for @fonts;
893 CFClient::set_font $fonts[0]; 1424
1425 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1426 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1427
1428 $FONT_PROP->make_default;
894} 1429}
895 1430
896video_init; 1431video_init;
897audio_init; 1432audio_init;
898 1433
899Event::loop; 1434Event::loop;
900 1435
901END { SDL::Quit } 1436END { CFClient::SDL_Quit }
902 1437
903 1438

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines