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.190 by root, Sun Jul 29 18:56:03 2007 UTC vs.
Revision 1.218 by root, Sun Aug 19 14:17:05 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
166our $ALT_ENTER_MESSAGE;
167our $STATUSBOX;
168our $DEBUG_STATUS;
169
170our $INV;
171our $INVR;
172our $INVR_HB;
173
174#############################################################################
175
176sub status {
177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
178}
179
180sub debug {
181 $DEBUG_STATUS->set_text ($_[0]);
182}
183
184sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para);
187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
163our $SDL_MIXER; 192our $SDL_MIXER;
193
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
166our $MUSIC_START; 197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
167our $MUSIC_PLAYING_DATA; 199our $MUSIC_PLAYING_DATA;
168our $MUSIC_PLAYING_META; 200our $MUSIC_PLAYING_META;
169our $MUSIC_PLAYER; 201our $MUSIC_PLAYER;
170our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
171our @SOUNDS; # event => file mapping 203
172our %AUDIO_CHUNKS; # audio files 204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
173 206
174our $ALT_ENTER_MESSAGE; 207sub audio_channel_finished {
175our $STATUSBOX; 208 my ($channel) = @_;
176our $DEBUG_STATUS;
177 209
178our $INV; 210# warn "channel $channel finished\n";#d#
179our $INVR;
180our $INV_RIGHT_HB;
181
182our $PICKUP_CFG;
183
184sub status {
185 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
186} 211}
187 212
188sub debug { 213sub audio_sound_push($) {
189 $DEBUG_STATUS->set_text ($_[0]);
190}
191
192sub message {
193 my ($para) = @_; 214 my ($face) = @_;
194 $MESSAGE_WINDOW->message ($para); 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 }
195} 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#############################################################################
196 429
197sub destroy_query_dialog { 430sub destroy_query_dialog {
198 (delete $_[0]{query_dialog})->destroy 431 (delete $_[0]{query_dialog})->destroy
199 if $_[0]{query_dialog}; 432 if $_[0]{query_dialog};
200} 433}
… …
460 query => \&server_query, 693 query => \&server_query,
461 694
462 setup_req => { 695 setup_req => {
463 smoothing => $CFG->{map_smoothing}*1, 696 smoothing => $CFG->{map_smoothing}*1,
464 }, 697 },
465
466 sound_play => sub {
467 my ($x, $y, $soundnum, $type) = @_;
468
469 $SDL_MIXER
470 or return;
471
472 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
473 or return;
474
475 $chunk->play;
476 },
477 }; 698 };
478 699
479 if ($CONN) { 700 if ($CONN) {
480 CFPlus::lowdelay fileno $CONN->{fh}; 701 CFPlus::lowdelay fileno $CONN->{fh};
481 702
… …
492 $SETUP_DIALOG->show; 713 $SETUP_DIALOG->show;
493 $PL_WINDOW->hide; 714 $PL_WINDOW->hide;
494 $SPELL_LIST->clear_spells; 715 $SPELL_LIST->clear_spells;
495 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 716 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
496 717
497 &audio_music_set ([]); 718 &audio_music_set_ambient ([]);
498 719
499 return unless $CONN; 720 return unless $CONN;
500 721
501 status "connection closed"; 722 status "connection closed";
502 723
… …
544 $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");
545 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 766 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
546 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
547 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
548 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. This setting is ignored in "
790 . "forced OpenGL 1.1 mode.",
791 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
549 ); 792 );
550 793
551 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 794 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
552 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 795 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
553 state => $CFG->{fast}, 796 state => $CFG->{fast},
… …
581 824
582 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 825 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
583 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 826 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing}, 827 state => $CFG->{map_smoothing},
585 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 828 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
586 . "This increases load on the graphics subsystem and works only with 2.x servers. " 829 . "This increases load on the graphics subsystem and works only with TRT servers. "
587 . "Changes take effect at next connection only.", 830 . "Changes take effect at next login only.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 831 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
589 ); 832 );
590 833
591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 834 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 835 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
603 ); 846 );
604 847
605 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
606 $table->add_at (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
607 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 850 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
608 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 851 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
852 . "but you still need to press apply to correctly re-layout the widget.",
609 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 853 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
610 ); 854 );
611 855
612 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 856 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
613 $table->add_at (1, $row++, new CFPlus::UI::Slider 857 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
635} 879}
636 880
637sub audio_setup { 881sub audio_setup {
638 my $vbox = new CFPlus::UI::VBox; 882 my $vbox = new CFPlus::UI::VBox;
639 883
640 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 884 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
641 885
642 my $row = 0; 886 my $row = 0;
643 887
644 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 888 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
645 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 889 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
649 ); 893 );
650# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 894# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
651# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 895# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
652# $CFG->{effects_volume} = $_[1]; 896# $CFG->{effects_volume} = $_[1];
653# }); 897# });
898
899 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
900 $table->add_at (1, $row, new CFPlus::UI::CheckBox
901 expand => 1, state => $CFG->{effects_enable},
902 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
903 on_changed => sub {
904 $CFG->{effects_enable} = $_[1];
905 $CONN->update_fx_want if $CONN;
906 0
907 }
908 );
909 $table->add_at (2, $row++, new CFPlus::UI::Slider
910 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
911 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
912 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
913 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
914 );
915
654 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 916 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
655 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 917 $table->add_at (1, $row, new CFPlus::UI::CheckBox
656 $hbox->add (new CFPlus::UI::CheckBox
657 expand => 1, state => $CFG->{bgm_enable}, 918 expand => 1, state => $CFG->{bgm_enable},
658 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 919 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
659 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 920 on_changed => sub {
921 $CFG->{bgm_enable} = $_[1];
922 $CONN->update_fx_want if $CONN;
923 0
924 }
660 ); 925 );
661 $hbox->add (new CFPlus::UI::Slider 926 $table->add_at (2, $row++, new CFPlus::UI::Slider
662 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 927 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
663 tooltip => "The volume of the background music. Changes are instant.", 928 tooltip => "The volume of the background music. Changes are instant.",
664 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 929 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
665 ); 930 );
666 931
667 $table->add_at (1, $row++, new CFPlus::UI::Button 932 $table->add_at (1, $row++, new CFPlus::UI::Button
668 expand => 1, align => 0, text => "Apply", 933 c_colspan => 2, expand => 1, align => 0, text => "Apply",
669 tooltip => "Apply the audio settings", 934 tooltip => "Apply the audio settings",
670 on_activate => sub { 935 on_activate => sub {
671 audio_shutdown (); 936 audio_shutdown ();
672 audio_init (); 937 audio_init ();
673 0 938 0
… …
744 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 1009 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
745 1010
746 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1011 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
747 1012
748 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1013 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
749 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2); 1014 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
750 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1); 1015 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
751 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2); 1016 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
752 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1); 1017 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
753 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1018 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
754 1019
755 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1020 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
756 1021
757 $c->add_items ({ 1022 $c->add_items ({
… …
1082 text => $CFG->{profile}{default}{host}, 1347 text => $CFG->{profile}{default}{host},
1083 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1348 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1084 on_changed => sub { 1349 on_changed => sub {
1085 my ($self, $value) = @_; 1350 my ($self, $value) = @_;
1086 $CFG->{profile}{default}{host} = $value; 1351 $CFG->{profile}{default}{host} = $value;
1087 0 1352 1
1088 } 1353 }
1089 ); 1354 );
1090 1355
1091 $vbox->add (new CFPlus::UI::Button 1356 $vbox->add (new CFPlus::UI::Button
1092 expand => 1, 1357 expand => 1,
1093 text => "Server List", 1358 text => "Server List",
1094 other => $METASERVER, 1359 other => $METASERVER,
1095 tooltip => "Show a list of available crossfire servers", 1360 tooltip => "Show a list of available crossfire servers",
1096 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1361 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1097 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1362 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1098 ); 1363 );
1099 } 1364 }
1100 1365
1101 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1366 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1102 $table->add_at (1, 4, new CFPlus::UI::Entry 1367 $table->add_at (1, 4, new CFPlus::UI::Entry
1103 text => $CFG->{profile}{default}{user}, 1368 text => $CFG->{profile}{default}{user},
1104 tooltip => "The name of your character on the server", 1369 tooltip => "The name of your character on the server",
1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1370 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1106 ); 1371 );
1107 1372
1108 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1373 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1109 $table->add_at (1, 5, new CFPlus::UI::Entry 1374 $table->add_at (1, 5, new CFPlus::UI::Entry
1110 text => $CFG->{profile}{default}{password}, 1375 text => $CFG->{profile}{default}{password},
1111 hidden => 1, 1376 hidden => 1,
1112 tooltip => "The password for your character", 1377 tooltip => "The password for your character",
1113 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1378 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1114 ); 1379 );
1115 1380
1116 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1381 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1117 $table->add_at (1, 7, new CFPlus::UI::Slider 1382 $table->add_at (1, 7, new CFPlus::UI::Slider
1118 force_w => 100, 1383 force_w => 100,
1119 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1384 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1120 tooltip => "This is the size of the portion of the map update the server sends you. " 1385 tooltip => "This is the size of the portion of the map update the server sends you. "
1121 . "If you set this to a high value you will be able to see further, " 1386 . "If you set this to a high value you will be able to see further, "
1122 . "but you also increase bandwidth requirements and latency. " 1387 . "but you also increase bandwidth requirements and latency. "
1123 . "This option is only used once at log-in.", 1388 . "This option is only used once at log-in.",
1124 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1125 ); 1390 );
1126 1391
1127 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1392 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1128 $table->add_at (1, 8, new CFPlus::UI::Entry 1393 $table->add_at (1, 8, new CFPlus::UI::Entry
1129 text => $CFG->{output_rate}, 1394 text => $CFG->{output_rate},
1130 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1395 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1131 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1396 . "when sending data. When 0 or unset, the server "
1132 . "default will be used, which is usually around 100kb/s.", 1397 . "default will be used, which is usually around 100kb/s. Most servers will "
1398 . "dynamically find an optimal rate, so adjust this only when necessary.",
1133 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1134 ); 1400 );
1135 1401
1136 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1402 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1137 $table->add_at (1, 9, new CFPlus::UI::Entry 1403 $table->add_at (1, 9, new CFPlus::UI::Entry
1138 text => $CFG->{output_count}, 1404 text => $CFG->{output_count},
1139 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1405 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1140 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1406 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1141 ); 1407 );
1142 1408
1143 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1409 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1144 $table->add_at (1, 10, new CFPlus::UI::Entry 1410 $table->add_at (1, 10, new CFPlus::UI::Entry
1145 text => $CFG->{output_sync}, 1411 text => $CFG->{output_sync},
1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1412 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1147 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1413 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1148 ); 1414 );
1149 1415
1150 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1416 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1151 expand => 1, 1417 expand => 1,
1152 align => 0, 1418 align => 0,
1153 text => "Login", 1419 text => "Login",
1154 on_activate => sub { 1420 on_activate => sub {
1155 $CONN ? stop_game 1421 $CONN ? stop_game
1156 : start_game; 1422 : start_game;
1157 0 1423 1
1158 }, 1424 },
1159 ); 1425 );
1160 1426
1161 $vbox->add (new CFPlus::UI::FancyFrame 1427 $vbox->add (new CFPlus::UI::FancyFrame
1162 label => "Server Info", 1428 label => "Server Info",
… …
1352 $sw1->add ($INV = new CFPlus::UI::Inventory); 1618 $sw1->add ($INV = new CFPlus::UI::Inventory);
1353 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1619 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1354 1620
1355 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1621 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1356 1622
1357 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1623 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1358 1624
1359 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1625 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1360 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1626 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1361 1627
1362 # XXX: Call after $INVR = ... because set_opencont sets the items 1628 # XXX: Call after $INVR = ... because set_opencont sets the items
1363 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1629 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1364 1630
1365 $hb 1631 $hb
1632}
1633
1634sub media_window {
1635 my $vb = new CFPlus::UI::VBox;
1636
1637 $vb->add (new CFPlus::UI::FancyFrame
1638 label => "Currently playing music",
1639 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1640 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1641 );
1642
1643 $vb->add (new CFPlus::UI::FancyFrame
1644 label => "Other media used in this session",
1645 expand => 1,
1646 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1647 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1648 );
1649
1650 $vb
1651}
1652
1653sub add_license {
1654 my ($meta) = @_;
1655
1656 $meta = $meta->{meta}
1657 or return;
1658
1659 $meta->{license} || $meta->{author} || $meta->{source}
1660 or return;
1661
1662 $LICENSE_WIDGET->add_paragraph ({
1663 fg => [1, 1, 1, 1],
1664 markup => "<small>"
1665 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1666 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1667 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1668 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1669 . "</small>",
1670 });
1671 $LICENSE_WIDGET->scroll_to_bottom;
1366} 1672}
1367 1673
1368sub toggle_player_page { 1674sub toggle_player_page {
1369 my ($widget) = @_; 1675 my ($widget) = @_;
1370 1676
… …
1409 $ntb->add_tab ( 1715 $ntb->add_tab (
1410 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1716 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1411 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1717 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1412 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1718 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1413 ); 1719 );
1414 $ntb->add_tab (Pickup => autopickup_setup, 1720 $ntb->add_tab (Pickup => autopickup_setup,
1415 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1722
1723 $ntb->add_tab (Media => media_window,
1724 "License, Author and Source info for media sent by the server.");
1416 1725
1417 $ntb->set_current_page ($INVENTORY_PAGE); 1726 $ntb->set_current_page ($INVENTORY_PAGE);
1418 1727
1419 $plwin->add ($ntb); 1728 $plwin->add ($ntb);
1420 $plwin 1729 $plwin
… …
1574 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1883 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1575 ); 1884 );
1576 $hb->add (new CFPlus::UI::Button 1885 $hb->add (new CFPlus::UI::Button
1577 text => "Quit anyway", 1886 text => "Quit anyway",
1578 expand => 1, 1887 expand => 1,
1579 on_activate => sub { exit }, 1888 on_activate => sub { Event::unloop_all },
1580 ); 1889 );
1581 } 1890 }
1582 1891
1583 $QUIT_DIALOG->show; 1892 $QUIT_DIALOG->show;
1584 $QUIT_DIALOG->grab_focus; 1893 $QUIT_DIALOG->grab_focus;
… …
1778 tooltip => "Terminates the program", 2087 tooltip => "Terminates the program",
1779 on_activate => sub { 2088 on_activate => sub {
1780 if ($CONN) { 2089 if ($CONN) {
1781 open_quit_dialog; 2090 open_quit_dialog;
1782 } else { 2091 } else {
1783 exit; 2092 Event::unloop_all;
1784 } 2093 }
1785 0 2094 0
1786 }, 2095 },
1787 ); 2096 );
1788 2097
1789 $BUTTONBAR->show; 2098 $BUTTONBAR->show;
1790 $SETUP_DIALOG->show; 2099 $SETUP_DIALOG->show;
2100 $MESSAGE_WINDOW->show;
1791 } 2101 }
1792 2102
1793 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2103 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1794} 2104}
1795 2105
… …
1797 CFPlus::OpenGL::shutdown; 2107 CFPlus::OpenGL::shutdown;
1798 2108
1799 undef $SDL_ACTIVE; 2109 undef $SDL_ACTIVE;
1800} 2110}
1801 2111
1802sub audio_channel_finished {
1803 my ($channel) = @_;
1804
1805 #warn "channel $channel finished\n";#d#
1806}
1807
1808sub audio_music_set {
1809 my ($songs) = @_;
1810
1811 my @want =
1812 grep $_,
1813 map $CONN->{music_meta}{$_},
1814 @$songs;
1815
1816 if (@want) {
1817 @MUSIC_WANT = @want;
1818 &audio_music_changed ();
1819 }
1820}
1821
1822sub audio_music_start {
1823 my $meta = $MUSIC_PLAYING_META;
1824
1825 CFPlus::DB::get res_data => $meta->{name}, sub {
1826 return unless $SDL_MIXER;
1827
1828 # music might have changed...
1829 $meta eq $MUSIC_PLAYING_META
1830 or return &audio_music_start ();
1831
1832 $MUSIC_PLAYING_DATA = \$_[0];
1833
1834 my $rwops = $meta->{path}
1835 ? new_from_file CFPlus::RW $meta->{path}
1836 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1837
1838 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1839 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1840
1841 my $NOW = time;
1842
1843 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1844 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1845 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1846 $MUSIC_START = time - $pos;
1847 } else {
1848 $MUSIC_PLAYER->play (0);
1849 $MUSIC_START = time;
1850 }
1851
1852 delete $MUSIC_PLAYING_META->{stop_time};
1853 delete $MUSIC_PLAYING_META->{stop_pos};
1854 }
1855}
1856
1857sub audio_music_changed {
1858 return unless $CFG->{bgm_enable};
1859 return unless $SDL_MIXER;
1860
1861 # default MUSIC_WANT == MUSIC_DEFAULT
1862 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1863
1864 # if the currently playing song is acceptable, let it continue
1865 return if $MUSIC_PLAYING_META
1866 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1867
1868 my $NOW = time;
1869
1870 if ($MUSIC_PLAYING_META) {
1871 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1872 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1873 CFPlus::MixMusic::fade_out 1000;
1874 } else {
1875 # sort by stop time, oldest first
1876 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1877
1878 # if the most recently-played piece played very recently,
1879 # resume it, else choose the oldest piece for rotation.
1880 $MUSIC_PLAYING_META =
1881 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1882 ? $MUSIC_WANT[-1]
1883 : $MUSIC_WANT[0];
1884
1885 audio_music_start;
1886 }
1887}
1888
1889sub audio_music_finished {
1890 undef $MUSIC_PLAYER;
1891 undef $MUSIC_PLAYING_META;
1892 undef $MUSIC_PLAYING_DATA;
1893
1894 audio_music_changed;
1895}
1896
1897sub audio_init {
1898 if ($CFG->{audio_enable}) {
1899 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1900 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1901 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1902
1903 unless ($SDL_MIXER) {
1904 status "Unable to open sound device: there will be no sound";
1905 return;
1906 }
1907
1908 CFPlus::Mix_AllocateChannels 8;
1909 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1910
1911 audio_music_finished;
1912
1913 local $_;
1914 while (<$fh>) {
1915 next if /^\s*#/;
1916 next if /^\s*$/;
1917
1918 my ($file, $volume, $event) = split /\s+/, $_, 3;
1919
1920 push @SOUNDS, "$volume,$file";
1921
1922 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1923 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1924 my $chunk = new CFPlus::MixChunk $rwops;
1925 $chunk->volume ($volume * 128 / 100);
1926 $chunk
1927 };
1928 }
1929 } else {
1930 status "unable to open sound config: $!";
1931 }
1932 } else {
1933 undef $SDL_MIXER;
1934 }
1935}
1936
1937sub audio_shutdown {
1938 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1939 undef $SDL_MIXER;
1940 @SOUNDS = ();
1941 %AUDIO_CHUNKS = ();
1942}
1943
1944my %animate_object; 2112my %animate_object;
1945my $animate_timer; 2113my $animate_timer;
1946 2114
1947my $fps = 9; 2115my $fps = 9;
1948 2116
1949my %demo;#d#
1950
1951sub force_refresh { 2117sub force_refresh {
2118 if ($ENV{CFPLUS_DEBUG} & 4) {
1952 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2119 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1953 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2120 debug sprintf "%3.2f", $fps;
2121 }
1954 2122
1955 $CFPlus::UI::ROOT->draw; 2123 $CFPlus::UI::ROOT->draw;
1956 2124 CFPlus::SDL_GL_SwapBuffers;
1957 $WANT_REFRESH = 0;
1958 $CAN_REFRESH = 0;
1959 $LAST_REFRESH = $NOW; 2125 $LAST_REFRESH = $NOW;
1960 2126 $WANT_REFRESH->stop;
1961 CFPlus::SDL_GL_SwapBuffers;
1962} 2127}
1963 2128
2129$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2130
1964my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2131my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1965 $NOW = time; 2132 $NOW = time;
1966 2133
1967 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2134 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1968 for CFPlus::poll_events; 2135 for CFPlus::poll_events;
1969 2136
1970 if (%animate_object) { 2137 if (%animate_object) {
1971 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2138 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1972 ++$WANT_REFRESH; 2139 $WANT_REFRESH->start;
1973 }
1974
1975 if ($WANT_REFRESH) {
1976 force_refresh;
1977 } else {
1978 $CAN_REFRESH = 1;
1979 } 2140 }
1980}); 2141});
1981 2142
1982sub animation_start { 2143sub animation_start {
1983 my ($widget) = @_; 2144 my ($widget) = @_;
… …
2038 CFPlus::DB::Server::run; 2199 CFPlus::DB::Server::run;
2039 2200
2040 CFPlus::UI::set_layout ($::CFG->{layout}); 2201 CFPlus::UI::set_layout ($::CFG->{layout});
2041 2202
2042 my %DEF_CFG = ( 2203 my %DEF_CFG = (
2043 sdl_mode => 0, 2204 sdl_mode => 0,
2044 width => 640,
2045 height => 480,
2046 fullscreen => 0, 2205 fullscreen => 0,
2047 fast => 0, 2206 fast => 0,
2207 force_opengl11 => undef,
2208 texture_compression => 1,
2048 map_scale => 1, 2209 map_scale => 1,
2049 fow_enable => 1, 2210 fow_enable => 1,
2050 fow_intensity => 0, 2211 fow_intensity => 0,
2051 map_smoothing => 1, 2212 map_smoothing => 1,
2052 gui_fontsize => 1, 2213 gui_fontsize => 1,
2053 log_fontsize => 0.7, 2214 log_fontsize => 0.7,
2054 gauge_fontsize => 1, 2215 gauge_fontsize => 1,
2055 gauge_size => 0.35, 2216 gauge_size => 0.35,
2056 stat_fontsize => 0.7, 2217 stat_fontsize => 0.7,
2057 mapsize => 100, 2218 mapsize => 100,
2058 audio_enable => 1, 2219 audio_enable => 1,
2220 effects_enable => 1,
2221 effects_volume => 1,
2059 bgm_enable => 1, 2222 bgm_enable => 1,
2060 bgm_volume => 0.25, 2223 bgm_volume => 0.5,
2061 output_sync => 1, 2224 output_sync => 1,
2062 output_count => 1, 2225 output_count => 1,
2063 output_rate => "", 2226 output_rate => "",
2064 pickup => 0, 2227 pickup => 0,
2065 inv_sort => "mtime", 2228 inv_sort => "mtime",
2066 default => "profile", # default profile 2229 default => "profile", # default profile
2067 show_tips => 1, 2230 show_tips => 1,
2068 logview_max_par => 1000, 2231 logview_max_par => 1000,
2069 ); 2232 );
2070 2233
2071 while (my ($k, $v) = each %DEF_CFG) { 2234 while (my ($k, $v) = each %DEF_CFG) {
2072 $CFG->{$k} = $v unless exists $CFG->{$k}; 2235 $CFG->{$k} = $v unless exists $CFG->{$k};
2073 } 2236 }
… …
2139} 2302}
2140 2303
2141show_tip_of_the_day if $CFG->{show_tips}; 2304show_tip_of_the_day if $CFG->{show_tips};
2142 2305
2143Event::loop; 2306Event::loop;
2307
2308#video_shutdown;
2309#audio_shutdown;
2144#CFPlus::SDL_Quit; 2310CFPlus::SDL_Quit;
2145#CFPlus::_exit 0;
2146
2147END {
2148 CFPlus::SDL_Quit;
2149 CFPlus::DB::Server::stop; 2311CFPlus::DB::Server::stop;
2150}
2151 2312
2152=head1 NAME 2313=head1 NAME
2153 2314
2154cfplus - A Crossfire+ and Crossfire game client 2315cfplus - A Crossfire TRT and Crossfire game client
2155 2316
2156=head1 SYNOPSIS 2317=head1 SYNOPSIS
2157 2318
2158Just run it - no commandline arguments are supported. 2319Just run it - no commandline arguments are supported.
2159 2320
2160=head1 USAGE 2321=head1 USAGE
2161 2322
2162cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2323cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2163fullscreen and interactively. 2324be used in fullscreen mode and interactively.
2164 2325
2165=head1 DEBUGGING 2326=head1 DEBUGGING
2166 2327
2167 2328
2168CFPLUS_DEBUG - environment variable 2329CFPLUS_DEBUG - environment variable

Diff Legend

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