ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.187 by elmex, Fri Jul 27 18:04:43 2007 UTC vs.
Revision 1.217 by root, Sun Aug 19 14:09:28 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
112our $CONN; 113our $CONN;
113our $PROFILE; # current profile 114our $PROFILE; # current profile
114our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
115 116
116our $WANT_REFRESH; 117our $WANT_REFRESH;
117our $CAN_REFRESH;
118 118
119our @SDL_MODES; 119our @SDL_MODES;
120our $WIDTH; 120our $WIDTH;
121our $HEIGHT; 121our $HEIGHT;
122our $FULLSCREEN; 122our $FULLSCREEN;
… …
143our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
144 144
145our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
146our $PL_WINDOW; 146our $PL_WINDOW;
147 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
148our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
149our $STATS_PAGE; 152our $STATS_PAGE;
150our $SKILL_PAGE; 153our $SKILL_PAGE;
151our $SPELL_PAGE; 154our $SPELL_PAGE;
152our $SPELL_LIST; 155our $SPELL_LIST;
… …
158our $STATWIDS; 161our $STATWIDS;
159 162
160our $SDL_ACTIVE; 163our $SDL_ACTIVE;
161our %SDL_CB; 164our %SDL_CB;
162 165
163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files
172
173our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
174our $STATUSBOX; 167our $STATUSBOX;
175our $DEBUG_STATUS; 168our $DEBUG_STATUS;
176 169
177our $INV; 170our $INV;
178our $INVR; 171our $INVR;
179our $INV_RIGHT_HB; 172our $INVR_HB;
180 173
181our $PICKUP_CFG; 174#############################################################################
182 175
183sub status { 176sub status {
184 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
185} 178}
186 179
… …
190 183
191sub message { 184sub message {
192 my ($para) = @_; 185 my ($para) = @_;
193 $MESSAGE_WINDOW->message ($para); 186 $MESSAGE_WINDOW->message ($para);
194} 187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{sound_meta}{$face}
234 or return;
235
236 # if its a jingle, play it as ambient music
237 if ($meta->{meta}{jingle}) {
238 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
240 &audio_music_push ($face);
241 }
242 } else {
243 # fetch from database
244 CFPlus::DB::get res_data => $meta->{name}, sub {
245 my $rwops = new CFPlus::RW $_[0];
246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
249 $AUDIO_CHUNK{$face} = $chunk;
250
251 audio_sound_push ($face);
252 };
253 }
254 }
255}
256
257sub audio_sound_play {
258 my ($face, $dx, $dy, $vol) = @_;
259
260 $SDL_MIXER
261 or return;
262 $CFG->{effects_enable}
263 or return;
264
265 my $queue = $AUDIO_PLAY{$face} ||= [];
266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
267 audio_sound_push $face
268 unless @$queue > 1;
269}
270
271sub audio_music_set_meta {
272 my ($meta) = @_;
273
274 $MUSIC_PLAYING_META = $meta;
275 $MUSIC_PLAYING_WIDGET->set_markup (
276 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
277 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
278 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
279 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
280 );
281}
282
283sub audio_music_update_volume {
284 return unless $MUSIC_PLAYING_META;
285 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
286 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
287 CFPlus::MixMusic::volume $base * $volume * 128;
288}
289
290sub audio_music_start {
291 my $meta = $MUSIC_PLAYING_META;
292
293 CFPlus::DB::get res_data => $meta->{name}, sub {
294 return unless $SDL_MIXER;
295
296 # music might have changed...
297 $meta eq $MUSIC_PLAYING_META
298 or return &audio_music_start ();
299
300 audio_music_update_volume;
301
302 $MUSIC_PLAYING_DATA = \$_[0];
303
304 my $rwops = $meta->{path}
305 ? new_from_file CFPlus::RW $meta->{path}
306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
307
308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
310
311 my $NOW = time;
312
313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
315 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
316 $MUSIC_START = time - $pos;
317 } else {
318 $MUSIC_PLAYER->play (0);
319 $MUSIC_START = time;
320 }
321
322 delete $meta->{stop_time};
323 delete $meta->{stop_pos};
324 }
325}
326
327sub audio_music_push {
328 return unless $SDL_MIXER;
329
330 my $fade_out;
331
332 if (@MUSIC_JINGLE) {
333 @MUSIC_HAVE = $MUSIC_JINGLE[0];
334 $fade_out = 333;
335 } else {
336 return unless $CFG->{bgm_enable};
337
338 my @have =
339 grep $_,
340 map $CONN->{music_meta}{$_},
341 @$MUSIC_WANT;
342
343 @MUSIC_HAVE = @have
344 if @have;
345
346 # default MUSIC_HAVE == MUSIC_DEFAULT
347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
348 $fade_out = 1000;
349 }
350
351 # if the currently playing song is acceptable, let it continue
352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
353
354 my $NOW = time;
355
356 if ($MUSIC_PLAYING_META) {
357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
358 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
359 CFPlus::MixMusic::fade_out $fade_out;
360 } else {
361 # sort by stop time, oldest first
362 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
363
364 # if the most recently-played piece played very recently,
365 # resume it, else choose the oldest piece for rotation.
366 audio_music_set_meta
367 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
368 ? $MUSIC_HAVE[-1]
369 : $MUSIC_HAVE[0];
370
371 audio_music_start;
372 }
373}
374
375sub audio_music_set_ambient {
376 my ($songs) = @_;
377
378 $MUSIC_WANT = $songs;
379 audio_music_push;
380}
381
382sub audio_music_finished {
383 # we compress multiple jingles of the same type
384 shift @MUSIC_JINGLE
385 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
386
387 $MUSIC_PLAYING_WIDGET->clear;
388
389 undef $MUSIC_PLAYER;
390 undef $MUSIC_PLAYING_META;
391 undef $MUSIC_PLAYING_DATA;
392
393 audio_music_push;
394}
395
396sub audio_init {
397 if ($CFG->{audio_enable}) {
398 $ENV{MIX_EFFECTSMAXSPEED} = 1;
399 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
400
401 unless ($SDL_MIXER) {
402 status "Unable to open sound device: there will be no sound";
403 return;
404 }
405
406 CFPlus::Mix_AllocateChannels 16;
407
408 audio_music_finished;
409 } else {
410 undef $SDL_MIXER;
411 }
412}
413
414sub audio_shutdown {
415 undef $MUSIC_PLAYER;
416 undef $MUSIC_PLAYING_META;
417 undef $MUSIC_PLAYING_DATA;
418
419 $MUSIC_WANT = [];
420 @MUSIC_JINGLE = ();
421 %AUDIO_PLAY = ();
422 %AUDIO_CHUNK = ();
423
424 CFPlus::Mix_CloseAudio if $SDL_MIXER;
425 undef $SDL_MIXER;
426}
427
428#############################################################################
195 429
196sub destroy_query_dialog { 430sub destroy_query_dialog {
197 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
198 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
199} 433}
… …
459 query => \&server_query, 693 query => \&server_query,
460 694
461 setup_req => { 695 setup_req => {
462 smoothing => $CFG->{map_smoothing}*1, 696 smoothing => $CFG->{map_smoothing}*1,
463 }, 697 },
464
465 sound_play => sub {
466 my ($x, $y, $soundnum, $type) = @_;
467
468 $SDL_MIXER
469 or return;
470
471 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
472 or return;
473
474 $chunk->play;
475 },
476 }; 698 };
477 699
478 if ($CONN) { 700 if ($CONN) {
479 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
480 702
… …
491 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
492 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
493 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
494 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
495 717
496 &audio_music_set ([]); 718 &audio_music_set_ambient ([]);
497 719
498 return unless $CONN; 720 return unless $CONN;
499 721
500 status "connection closed"; 722 status "connection closed";
501 723
… …
543 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 765 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
544 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
545 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
546 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
547 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
770 );
771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{force_opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
782 );
783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{texture_compression},
787 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
788 . "will save a lot of memory and increase performance. The compression algorithm "
789 . "can differ form card to card, so your mileage may vary.",
790 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
548 ); 791 );
549 792
550 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
551 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
552 state => $CFG->{fast}, 795 state => $CFG->{fast},
… …
580 823
581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
582 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
583 state => $CFG->{map_smoothing}, 826 state => $CFG->{map_smoothing},
584 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 827 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
585 . "This increases load on the graphics subsystem and works only with 2.x servers. " 828 . "This increases load on the graphics subsystem and works only with TRT servers. "
586 . "Changes take effect at next connection only.", 829 . "Changes take effect at next login only.",
587 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
588 ); 831 );
589 832
590 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 833 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
591 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 834 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
602 ); 845 );
603 846
604 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 847 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
605 $table->add_at (1, $row++, new CFPlus::UI::Slider 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
606 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 849 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
607 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 850 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
851 . "but you still need to press apply to correctly re-layout the widget.",
608 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 852 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
609 ); 853 );
610 854
611 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
612 $table->add_at (1, $row++, new CFPlus::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
634} 878}
635 879
636sub audio_setup { 880sub audio_setup {
637 my $vbox = new CFPlus::UI::VBox; 881 my $vbox = new CFPlus::UI::VBox;
638 882
639 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 883 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
640 884
641 my $row = 0; 885 my $row = 0;
642 886
643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 887 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
644 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 888 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
648 ); 892 );
649# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 893# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
650# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 894# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
651# $CFG->{effects_volume} = $_[1]; 895# $CFG->{effects_volume} = $_[1];
652# }); 896# });
897
898 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
899 $table->add_at (1, $row, new CFPlus::UI::CheckBox
900 expand => 1, state => $CFG->{effects_enable},
901 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
902 on_changed => sub {
903 $CFG->{effects_enable} = $_[1];
904 $CONN->update_fx_want if $CONN;
905 0
906 }
907 );
908 $table->add_at (2, $row++, new CFPlus::UI::Slider
909 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
910 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
911 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
912 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
913 );
914
653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 915 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
654 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 916 $table->add_at (1, $row, new CFPlus::UI::CheckBox
655 $hbox->add (new CFPlus::UI::CheckBox
656 expand => 1, state => $CFG->{bgm_enable}, 917 expand => 1, state => $CFG->{bgm_enable},
657 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 918 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
658 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 919 on_changed => sub {
920 $CFG->{bgm_enable} = $_[1];
921 $CONN->update_fx_want if $CONN;
922 0
923 }
659 ); 924 );
660 $hbox->add (new CFPlus::UI::Slider 925 $table->add_at (2, $row++, new CFPlus::UI::Slider
661 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 926 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
662 tooltip => "The volume of the background music. Changes are instant.", 927 tooltip => "The volume of the background music. Changes are instant.",
663 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 928 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
664 ); 929 );
665 930
666 $table->add_at (1, $row++, new CFPlus::UI::Button 931 $table->add_at (1, $row++, new CFPlus::UI::Button
667 expand => 1, align => 0, text => "Apply", 932 c_colspan => 2, expand => 1, align => 0, text => "Apply",
668 tooltip => "Apply the audio settings", 933 tooltip => "Apply the audio settings",
669 on_activate => sub { 934 on_activate => sub {
670 audio_shutdown (); 935 audio_shutdown ();
671 audio_init (); 936 audio_init ();
672 0 937 0
… …
743 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1008 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
744 1009
745 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1010 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
746 1011
747 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1012 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
748 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1013 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
749 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1014 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
750 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1015 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
751 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1016 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
752 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1017 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
753 1018
754 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1019 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
755 1020
756 $c->add_items ({ 1021 $c->add_items ({
… …
1081 text => $CFG->{profile}{default}{host}, 1346 text => $CFG->{profile}{default}{host},
1082 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1347 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1083 on_changed => sub { 1348 on_changed => sub {
1084 my ($self, $value) = @_; 1349 my ($self, $value) = @_;
1085 $CFG->{profile}{default}{host} = $value; 1350 $CFG->{profile}{default}{host} = $value;
1086 0 1351 1
1087 } 1352 }
1088 ); 1353 );
1089 1354
1090 $vbox->add (new CFPlus::UI::Button 1355 $vbox->add (new CFPlus::UI::Button
1091 expand => 1, 1356 expand => 1,
1092 text => "Server List", 1357 text => "Server List",
1093 other => $METASERVER, 1358 other => $METASERVER,
1094 tooltip => "Show a list of available crossfire servers", 1359 tooltip => "Show a list of available crossfire servers",
1095 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1360 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1361 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1097 ); 1362 );
1098 } 1363 }
1099 1364
1100 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1365 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1101 $table->add_at (1, 4, new CFPlus::UI::Entry 1366 $table->add_at (1, 4, new CFPlus::UI::Entry
1102 text => $CFG->{profile}{default}{user}, 1367 text => $CFG->{profile}{default}{user},
1103 tooltip => "The name of your character on the server", 1368 tooltip => "The name of your character on the server",
1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1369 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1105 ); 1370 );
1106 1371
1107 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1372 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1108 $table->add_at (1, 5, new CFPlus::UI::Entry 1373 $table->add_at (1, 5, new CFPlus::UI::Entry
1109 text => $CFG->{profile}{default}{password}, 1374 text => $CFG->{profile}{default}{password},
1110 hidden => 1, 1375 hidden => 1,
1111 tooltip => "The password for your character", 1376 tooltip => "The password for your character",
1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1377 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1113 ); 1378 );
1114 1379
1115 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1380 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1116 $table->add_at (1, 7, new CFPlus::UI::Slider 1381 $table->add_at (1, 7, new CFPlus::UI::Slider
1117 force_w => 100, 1382 force_w => 100,
1118 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1383 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1119 tooltip => "This is the size of the portion of the map update the server sends you. " 1384 tooltip => "This is the size of the portion of the map update the server sends you. "
1120 . "If you set this to a high value you will be able to see further, " 1385 . "If you set this to a high value you will be able to see further, "
1121 . "but you also increase bandwidth requirements and latency. " 1386 . "but you also increase bandwidth requirements and latency. "
1122 . "This option is only used once at log-in.", 1387 . "This option is only used once at log-in.",
1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1388 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1124 ); 1389 );
1125 1390
1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1127 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1128 state => $CFG->{face_prefetch},
1129 tooltip => "<b>Background Image Prefetch</b>\n\n"
1130 . "If enabled, the client automatically pre-fetches images from the server. "
1131 . "This might increase or create lag, but increases the chances "
1132 . "of faces being ready for display when you encounter them. "
1133 . "It also uses up server bandwidth on every connect, "
1134 . "so only set it if you really need to prefetch images. "
1135 . "This option can be set and unset any time.",
1136 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1137 );
1138
1139 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1391 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1392 $table->add_at (1, 8, new CFPlus::UI::Entry
1393 text => $CFG->{output_rate},
1394 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1395 . "when sending data. When 0 or unset, the server "
1396 . "default will be used, which is usually around 100kb/s. Most servers will "
1397 . "dynamically find an optimal rate, so adjust this only when necessary.",
1398 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1399 );
1400
1401 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1140 $table->add_at (1, 9, new CFPlus::UI::Entry 1402 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_rate},
1142 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1143 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1144 . "default will be used, which is usually around 100kb/s.",
1145 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1146 );
1147
1148 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1149 $table->add_at (1, 10, new CFPlus::UI::Entry
1150 text => $CFG->{output_count}, 1403 text => $CFG->{output_count},
1151 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1404 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1152 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1405 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1153 ); 1406 );
1154 1407
1155 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1408 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1156 $table->add_at (1, 11, new CFPlus::UI::Entry 1409 $table->add_at (1, 10, new CFPlus::UI::Entry
1157 text => $CFG->{output_sync}, 1410 text => $CFG->{output_sync},
1158 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1411 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1159 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1412 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1160 ); 1413 );
1161 1414
1162 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1415 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1163 expand => 1, 1416 expand => 1,
1164 align => 0, 1417 align => 0,
1165 text => "Login", 1418 text => "Login",
1166 on_activate => sub { 1419 on_activate => sub {
1167 $CONN ? stop_game 1420 $CONN ? stop_game
1168 : start_game; 1421 : start_game;
1169 0 1422 1
1170 }, 1423 },
1171 ); 1424 );
1172 1425
1173 $vbox->add (new CFPlus::UI::FancyFrame 1426 $vbox->add (new CFPlus::UI::FancyFrame
1174 label => "Server Info", 1427 label => "Server Info",
… …
1364 $sw1->add ($INV = new CFPlus::UI::Inventory); 1617 $sw1->add ($INV = new CFPlus::UI::Inventory);
1365 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1618 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1366 1619
1367 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1620 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1368 1621
1369 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1622 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1370 1623
1371 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1624 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1372 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1625 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1373 1626
1374 # XXX: Call after $INVR = ... because set_opencont sets the items 1627 # XXX: Call after $INVR = ... because set_opencont sets the items
1375 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1628 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1376 1629
1377 $hb 1630 $hb
1631}
1632
1633sub media_window {
1634 my $vb = new CFPlus::UI::VBox;
1635
1636 $vb->add (new CFPlus::UI::FancyFrame
1637 label => "Currently playing music",
1638 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1639 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1640 );
1641
1642 $vb->add (new CFPlus::UI::FancyFrame
1643 label => "Other media used in this session",
1644 expand => 1,
1645 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1646 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1647 );
1648
1649 $vb
1650}
1651
1652sub add_license {
1653 my ($meta) = @_;
1654
1655 $meta = $meta->{meta}
1656 or return;
1657
1658 $meta->{license} || $meta->{author} || $meta->{source}
1659 or return;
1660
1661 $LICENSE_WIDGET->add_paragraph ({
1662 fg => [1, 1, 1, 1],
1663 markup => "<small>"
1664 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1665 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1666 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1667 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1668 . "</small>",
1669 });
1670 $LICENSE_WIDGET->scroll_to_bottom;
1378} 1671}
1379 1672
1380sub toggle_player_page { 1673sub toggle_player_page {
1381 my ($widget) = @_; 1674 my ($widget) = @_;
1382 1675
… …
1421 $ntb->add_tab ( 1714 $ntb->add_tab (
1422 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1715 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1423 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1716 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1424 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1717 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1425 ); 1718 );
1426 $ntb->add_tab (Pickup => autopickup_setup, 1719 $ntb->add_tab (Pickup => autopickup_setup,
1427 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1720 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1721
1722 $ntb->add_tab (Media => media_window,
1723 "License, Author and Source info for media sent by the server.");
1428 1724
1429 $ntb->set_current_page ($INVENTORY_PAGE); 1725 $ntb->set_current_page ($INVENTORY_PAGE);
1430 1726
1431 $plwin->add ($ntb); 1727 $plwin->add ($ntb);
1432 $plwin 1728 $plwin
… …
1586 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1882 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1587 ); 1883 );
1588 $hb->add (new CFPlus::UI::Button 1884 $hb->add (new CFPlus::UI::Button
1589 text => "Quit anyway", 1885 text => "Quit anyway",
1590 expand => 1, 1886 expand => 1,
1591 on_activate => sub { exit }, 1887 on_activate => sub { Event::unloop_all },
1592 ); 1888 );
1593 } 1889 }
1594 1890
1595 $QUIT_DIALOG->show; 1891 $QUIT_DIALOG->show;
1596 $QUIT_DIALOG->grab_focus; 1892 $QUIT_DIALOG->grab_focus;
… …
1790 tooltip => "Terminates the program", 2086 tooltip => "Terminates the program",
1791 on_activate => sub { 2087 on_activate => sub {
1792 if ($CONN) { 2088 if ($CONN) {
1793 open_quit_dialog; 2089 open_quit_dialog;
1794 } else { 2090 } else {
1795 exit; 2091 Event::unloop_all;
1796 } 2092 }
1797 0 2093 0
1798 }, 2094 },
1799 ); 2095 );
1800 2096
1801 $BUTTONBAR->show; 2097 $BUTTONBAR->show;
1802 $SETUP_DIALOG->show; 2098 $SETUP_DIALOG->show;
2099 $MESSAGE_WINDOW->show;
1803 } 2100 }
1804 2101
1805 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2102 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1806} 2103}
1807 2104
… …
1809 CFPlus::OpenGL::shutdown; 2106 CFPlus::OpenGL::shutdown;
1810 2107
1811 undef $SDL_ACTIVE; 2108 undef $SDL_ACTIVE;
1812} 2109}
1813 2110
1814sub audio_channel_finished {
1815 my ($channel) = @_;
1816
1817 #warn "channel $channel finished\n";#d#
1818}
1819
1820sub audio_music_set {
1821 my ($songs) = @_;
1822
1823 my @want =
1824 grep $_,
1825 map $CONN->{music_meta}{$_},
1826 @$songs;
1827
1828 if (@want) {
1829 @MUSIC_WANT = @want;
1830 &audio_music_changed ();
1831 }
1832}
1833
1834sub audio_music_start {
1835 my $path = $MUSIC_PLAYING->{path}
1836 or return;
1837
1838 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1839 return unless $SDL_MIXER;
1840
1841 # music might have changed...
1842 $path eq $MUSIC_PLAYING->{path}
1843 or return &audio_music_start ();
1844
1845 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1846
1847 my $NOW = time;
1848
1849 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1850 my $pos = $MUSIC_PLAYING->{stop_pos};
1851 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1852 $MUSIC_START = time - $pos;
1853 } else {
1854 $MUSIC_PLAYER->play (0);
1855 $MUSIC_START = time;
1856 }
1857
1858 delete $MUSIC_PLAYING->{stop_time};
1859 delete $MUSIC_PLAYING->{stop_pos};
1860 }
1861}
1862
1863sub audio_music_changed {
1864 return unless $CFG->{bgm_enable};
1865 return unless $SDL_MIXER;
1866
1867 # default MUSIC_WANT == MUSIC_DEFAULT
1868 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1869
1870 # if the currently playing song is acceptable, let it continue
1871 return if $MUSIC_PLAYING
1872 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1873
1874 my $NOW = time;
1875
1876 if ($MUSIC_PLAYING) {
1877 $MUSIC_PLAYING->{stop_time} = $NOW;
1878 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
1879 CFPlus::MixMusic::fade_out 1000;
1880 } else {
1881 # sort by stop time, oldest first
1882 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1883
1884 # if the most recently-played piece played very recently,
1885 # resume it, else choose the oldest piece for rotation.
1886 $MUSIC_PLAYING =
1887 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1888 ? $MUSIC_WANT[-1]
1889 : $MUSIC_WANT[0];
1890
1891 audio_music_start;
1892 }
1893}
1894
1895sub audio_music_finished {
1896 $MUSIC_PLAYING = undef;
1897 undef $MUSIC_PLAYER;
1898
1899 audio_music_changed;
1900}
1901
1902sub audio_init {
1903 if ($CFG->{audio_enable}) {
1904 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1905 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1906
1907 unless ($SDL_MIXER) {
1908 status "Unable to open sound device: there will be no sound";
1909 return;
1910 }
1911
1912 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914
1915 audio_music_finished;
1916
1917 local $_;
1918 while (<$fh>) {
1919 next if /^\s*#/;
1920 next if /^\s*$/;
1921
1922 my ($file, $volume, $event) = split /\s+/, $_, 3;
1923
1924 push @SOUNDS, "$volume,$file";
1925
1926 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1927 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1928 $chunk->volume ($volume * 128 / 100);
1929 $chunk
1930 };
1931 }
1932 } else {
1933 status "unable to open sound config: $!";
1934 }
1935 } else {
1936 undef $SDL_MIXER;
1937 }
1938}
1939
1940sub audio_shutdown {
1941 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1942 undef $SDL_MIXER;
1943 @SOUNDS = ();
1944 %AUDIO_CHUNKS = ();
1945}
1946
1947my %animate_object; 2111my %animate_object;
1948my $animate_timer; 2112my $animate_timer;
1949 2113
1950my $fps = 9; 2114my $fps = 9;
1951 2115
1952my %demo;#d#
1953
1954sub force_refresh { 2116sub force_refresh {
2117 if ($ENV{CFPLUS_DEBUG} & 4) {
1955 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2118 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1956 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2119 debug sprintf "%3.2f", $fps;
2120 }
1957 2121
1958 $CFPlus::UI::ROOT->draw; 2122 $CFPlus::UI::ROOT->draw;
1959 2123 CFPlus::SDL_GL_SwapBuffers;
1960 $WANT_REFRESH = 0;
1961 $CAN_REFRESH = 0;
1962 $LAST_REFRESH = $NOW; 2124 $LAST_REFRESH = $NOW;
1963 2125 $WANT_REFRESH->stop;
1964 CFPlus::SDL_GL_SwapBuffers;
1965} 2126}
1966 2127
2128$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2129
1967my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2130my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1968 $NOW = time; 2131 $NOW = time;
1969 2132
1970 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2133 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1971 for CFPlus::poll_events; 2134 for CFPlus::poll_events;
1972 2135
1973 if (%animate_object) { 2136 if (%animate_object) {
1974 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2137 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1975 ++$WANT_REFRESH; 2138 $WANT_REFRESH->start;
1976 }
1977
1978 if ($WANT_REFRESH) {
1979 force_refresh;
1980 } else {
1981 $CAN_REFRESH = 1;
1982 } 2139 }
1983}); 2140});
1984 2141
1985sub animation_start { 2142sub animation_start {
1986 my ($widget) = @_; 2143 my ($widget) = @_;
… …
1989 2146
1990sub animation_stop { 2147sub animation_stop {
1991 my ($widget) = @_; 2148 my ($widget) = @_;
1992 delete $animate_object{$widget}; 2149 delete $animate_object{$widget};
1993} 2150}
1994
1995# check once/second for faces that need to be prefetched
1996# this should, of course, only run on demand, but
1997# SDL forces worse things on us....
1998
1999Event->timer (after => 1, interval => 0.25, cb => sub {
2000 $CONN->face_prefetch
2001 if $CONN;
2002});
2003 2151
2004%SDL_CB = ( 2152%SDL_CB = (
2005 CFPlus::SDL_QUIT => sub { 2153 CFPlus::SDL_QUIT => sub {
2006 exit; 2154 exit;
2007 }, 2155 },
… …
2050 CFPlus::DB::Server::run; 2198 CFPlus::DB::Server::run;
2051 2199
2052 CFPlus::UI::set_layout ($::CFG->{layout}); 2200 CFPlus::UI::set_layout ($::CFG->{layout});
2053 2201
2054 my %DEF_CFG = ( 2202 my %DEF_CFG = (
2055 sdl_mode => 0, 2203 sdl_mode => 0,
2056 width => 640,
2057 height => 480,
2058 fullscreen => 0, 2204 fullscreen => 0,
2059 fast => 0, 2205 fast => 0,
2206 force_opengl11 => undef,
2207 texture_compression => 1,
2060 map_scale => 1, 2208 map_scale => 1,
2061 fow_enable => 1, 2209 fow_enable => 1,
2062 fow_intensity => 0, 2210 fow_intensity => 0,
2063 map_smoothing => 1, 2211 map_smoothing => 1,
2064 gui_fontsize => 1, 2212 gui_fontsize => 1,
2065 log_fontsize => 0.7, 2213 log_fontsize => 0.7,
2066 gauge_fontsize => 1, 2214 gauge_fontsize => 1,
2067 gauge_size => 0.35, 2215 gauge_size => 0.35,
2068 stat_fontsize => 0.7, 2216 stat_fontsize => 0.7,
2069 mapsize => 100, 2217 mapsize => 100,
2070 audio_enable => 1, 2218 audio_enable => 1,
2219 effects_enable => 1,
2220 effects_volume => 1,
2071 bgm_enable => 1, 2221 bgm_enable => 1,
2072 bgm_volume => 0.25, 2222 bgm_volume => 0.5,
2073 face_prefetch => 0,
2074 output_sync => 1, 2223 output_sync => 1,
2075 output_count => 1, 2224 output_count => 1,
2076 output_rate => "", 2225 output_rate => "",
2077 pickup => 0, 2226 pickup => 0,
2078 inv_sort => "mtime", 2227 inv_sort => "mtime",
2079 default => "profile", # default profile 2228 default => "profile", # default profile
2080 show_tips => 1, 2229 show_tips => 1,
2081 logview_max_par => 1000, 2230 logview_max_par => 1000,
2082 ); 2231 );
2083 2232
2084 while (my ($k, $v) = each %DEF_CFG) { 2233 while (my ($k, $v) = each %DEF_CFG) {
2085 $CFG->{$k} = $v unless exists $CFG->{$k}; 2234 $CFG->{$k} = $v unless exists $CFG->{$k};
2086 } 2235 }
… …
2152} 2301}
2153 2302
2154show_tip_of_the_day if $CFG->{show_tips}; 2303show_tip_of_the_day if $CFG->{show_tips};
2155 2304
2156Event::loop; 2305Event::loop;
2306
2307#video_shutdown;
2308#audio_shutdown;
2157#CFPlus::SDL_Quit; 2309CFPlus::SDL_Quit;
2158#CFPlus::_exit 0;
2159
2160END {
2161 CFPlus::SDL_Quit;
2162 CFPlus::DB::Server::stop; 2310CFPlus::DB::Server::stop;
2163}
2164 2311
2165=head1 NAME 2312=head1 NAME
2166 2313
2167cfplus - A Crossfire+ and Crossfire game client 2314cfplus - A Crossfire TRT and Crossfire game client
2168 2315
2169=head1 SYNOPSIS 2316=head1 SYNOPSIS
2170 2317
2171Just run it - no commandline arguments are supported. 2318Just run it - no commandline arguments are supported.
2172 2319
2173=head1 USAGE 2320=head1 USAGE
2174 2321
2175cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2322cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2176fullscreen and interactively. 2323be used in fullscreen mode and interactively.
2177 2324
2178=head1 DEBUGGING 2325=head1 DEBUGGING
2179 2326
2180 2327
2181CFPLUS_DEBUG - environment variable 2328CFPLUS_DEBUG - environment variable

Diff Legend

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