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.189 by root, Sun Jul 29 18:22:34 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
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. This setting is ignored in "
790 . "forced OpenGL 1.1 mode.",
791 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
548 ); 792 );
549 793
550 $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");
551 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 795 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
552 state => $CFG->{fast}, 796 state => $CFG->{fast},
… …
580 824
581 $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");
582 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 826 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
583 state => $CFG->{map_smoothing}, 827 state => $CFG->{map_smoothing},
584 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. "
585 . "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. "
586 . "Changes take effect at next connection only.", 830 . "Changes take effect at next login only.",
587 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 831 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
588 ); 832 );
589 833
590 $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");
591 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 835 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
602 ); 846 );
603 847
604 $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");
605 $table->add_at (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
606 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 850 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.", 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.",
608 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 },
609 ); 854 );
610 855
611 $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");
612 $table->add_at (1, $row++, new CFPlus::UI::Slider 857 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
634} 879}
635 880
636sub audio_setup { 881sub audio_setup {
637 my $vbox = new CFPlus::UI::VBox; 882 my $vbox = new CFPlus::UI::VBox;
638 883
639 $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]);
640 885
641 my $row = 0; 886 my $row = 0;
642 887
643 $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");
644 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 889 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
648 ); 893 );
649# $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");
650# $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 {
651# $CFG->{effects_volume} = $_[1]; 896# $CFG->{effects_volume} = $_[1];
652# }); 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
653 $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");
654 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 917 $table->add_at (1, $row, new CFPlus::UI::CheckBox
655 $hbox->add (new CFPlus::UI::CheckBox
656 expand => 1, state => $CFG->{bgm_enable}, 918 expand => 1, state => $CFG->{bgm_enable},
657 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.",
658 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 }
659 ); 925 );
660 $hbox->add (new CFPlus::UI::Slider 926 $table->add_at (2, $row++, new CFPlus::UI::Slider
661 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 927 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
662 tooltip => "The volume of the background music. Changes are instant.", 928 tooltip => "The volume of the background music. Changes are instant.",
663 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 }
664 ); 930 );
665 931
666 $table->add_at (1, $row++, new CFPlus::UI::Button 932 $table->add_at (1, $row++, new CFPlus::UI::Button
667 expand => 1, align => 0, text => "Apply", 933 c_colspan => 2, expand => 1, align => 0, text => "Apply",
668 tooltip => "Apply the audio settings", 934 tooltip => "Apply the audio settings",
669 on_activate => sub { 935 on_activate => sub {
670 audio_shutdown (); 936 audio_shutdown ();
671 audio_init (); 937 audio_init ();
672 0 938 0
… …
743 $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() } );
744 1010
745 $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#
746 1012
747 $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);
748 $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);
749 $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);
750 $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);
751 $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);
752 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1018 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
753 1019
754 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1020 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
755 1021
756 $c->add_items ({ 1022 $c->add_items ({
… …
1081 text => $CFG->{profile}{default}{host}, 1347 text => $CFG->{profile}{default}{host},
1082 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",
1083 on_changed => sub { 1349 on_changed => sub {
1084 my ($self, $value) = @_; 1350 my ($self, $value) = @_;
1085 $CFG->{profile}{default}{host} = $value; 1351 $CFG->{profile}{default}{host} = $value;
1086 0 1352 1
1087 } 1353 }
1088 ); 1354 );
1089 1355
1090 $vbox->add (new CFPlus::UI::Button 1356 $vbox->add (new CFPlus::UI::Button
1091 expand => 1, 1357 expand => 1,
1092 text => "Server List", 1358 text => "Server List",
1093 other => $METASERVER, 1359 other => $METASERVER,
1094 tooltip => "Show a list of available crossfire servers", 1360 tooltip => "Show a list of available crossfire servers",
1095 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1361 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1362 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1097 ); 1363 );
1098 } 1364 }
1099 1365
1100 $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");
1101 $table->add_at (1, 4, new CFPlus::UI::Entry 1367 $table->add_at (1, 4, new CFPlus::UI::Entry
1102 text => $CFG->{profile}{default}{user}, 1368 text => $CFG->{profile}{default}{user},
1103 tooltip => "The name of your character on the server", 1369 tooltip => "The name of your character on the server",
1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1370 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1105 ); 1371 );
1106 1372
1107 $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");
1108 $table->add_at (1, 5, new CFPlus::UI::Entry 1374 $table->add_at (1, 5, new CFPlus::UI::Entry
1109 text => $CFG->{profile}{default}{password}, 1375 text => $CFG->{profile}{default}{password},
1110 hidden => 1, 1376 hidden => 1,
1111 tooltip => "The password for your character", 1377 tooltip => "The password for your character",
1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1378 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1113 ); 1379 );
1114 1380
1115 $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");
1116 $table->add_at (1, 7, new CFPlus::UI::Slider 1382 $table->add_at (1, 7, new CFPlus::UI::Slider
1117 force_w => 100, 1383 force_w => 100,
1118 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1384 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1119 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. "
1120 . "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, "
1121 . "but you also increase bandwidth requirements and latency. " 1387 . "but you also increase bandwidth requirements and latency. "
1122 . "This option is only used once at log-in.", 1388 . "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 }, 1389 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1124 ); 1390 );
1125 1391
1126 $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");
1127 $table->add_at (1, 8, new CFPlus::UI::Entry 1393 $table->add_at (1, 8, new CFPlus::UI::Entry
1128 text => $CFG->{output_rate}, 1394 text => $CFG->{output_rate},
1129 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 "
1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1396 . "when sending data. When 0 or unset, the server "
1131 . "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.",
1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1133 ); 1400 );
1134 1401
1135 $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");
1136 $table->add_at (1, 9, new CFPlus::UI::Entry 1403 $table->add_at (1, 9, new CFPlus::UI::Entry
1137 text => $CFG->{output_count}, 1404 text => $CFG->{output_count},
1138 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.",
1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1406 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1140 ); 1407 );
1141 1408
1142 $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");
1143 $table->add_at (1, 10, new CFPlus::UI::Entry 1410 $table->add_at (1, 10, new CFPlus::UI::Entry
1144 text => $CFG->{output_sync}, 1411 text => $CFG->{output_sync},
1145 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.",
1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1413 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1147 ); 1414 );
1148 1415
1149 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1416 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1150 expand => 1, 1417 expand => 1,
1151 align => 0, 1418 align => 0,
1152 text => "Login", 1419 text => "Login",
1153 on_activate => sub { 1420 on_activate => sub {
1154 $CONN ? stop_game 1421 $CONN ? stop_game
1155 : start_game; 1422 : start_game;
1156 0 1423 1
1157 }, 1424 },
1158 ); 1425 );
1159 1426
1160 $vbox->add (new CFPlus::UI::FancyFrame 1427 $vbox->add (new CFPlus::UI::FancyFrame
1161 label => "Server Info", 1428 label => "Server Info",
… …
1351 $sw1->add ($INV = new CFPlus::UI::Inventory); 1618 $sw1->add ($INV = new CFPlus::UI::Inventory);
1352 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1619 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1353 1620
1354 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1621 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1355 1622
1356 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1623 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1357 1624
1358 $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);
1359 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1626 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1360 1627
1361 # XXX: Call after $INVR = ... because set_opencont sets the items 1628 # XXX: Call after $INVR = ... because set_opencont sets the items
1362 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1629 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1363 1630
1364 $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;
1365} 1672}
1366 1673
1367sub toggle_player_page { 1674sub toggle_player_page {
1368 my ($widget) = @_; 1675 my ($widget) = @_;
1369 1676
… …
1408 $ntb->add_tab ( 1715 $ntb->add_tab (
1409 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1716 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1410 "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 :). "
1411 . "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."
1412 ); 1719 );
1413 $ntb->add_tab (Pickup => autopickup_setup, 1720 $ntb->add_tab (Pickup => autopickup_setup,
1414 "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.");
1415 1725
1416 $ntb->set_current_page ($INVENTORY_PAGE); 1726 $ntb->set_current_page ($INVENTORY_PAGE);
1417 1727
1418 $plwin->add ($ntb); 1728 $plwin->add ($ntb);
1419 $plwin 1729 $plwin
… …
1573 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1883 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1574 ); 1884 );
1575 $hb->add (new CFPlus::UI::Button 1885 $hb->add (new CFPlus::UI::Button
1576 text => "Quit anyway", 1886 text => "Quit anyway",
1577 expand => 1, 1887 expand => 1,
1578 on_activate => sub { exit }, 1888 on_activate => sub { Event::unloop_all },
1579 ); 1889 );
1580 } 1890 }
1581 1891
1582 $QUIT_DIALOG->show; 1892 $QUIT_DIALOG->show;
1583 $QUIT_DIALOG->grab_focus; 1893 $QUIT_DIALOG->grab_focus;
… …
1777 tooltip => "Terminates the program", 2087 tooltip => "Terminates the program",
1778 on_activate => sub { 2088 on_activate => sub {
1779 if ($CONN) { 2089 if ($CONN) {
1780 open_quit_dialog; 2090 open_quit_dialog;
1781 } else { 2091 } else {
1782 exit; 2092 Event::unloop_all;
1783 } 2093 }
1784 0 2094 0
1785 }, 2095 },
1786 ); 2096 );
1787 2097
1788 $BUTTONBAR->show; 2098 $BUTTONBAR->show;
1789 $SETUP_DIALOG->show; 2099 $SETUP_DIALOG->show;
2100 $MESSAGE_WINDOW->show;
1790 } 2101 }
1791 2102
1792 $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]);
1793} 2104}
1794 2105
… …
1796 CFPlus::OpenGL::shutdown; 2107 CFPlus::OpenGL::shutdown;
1797 2108
1798 undef $SDL_ACTIVE; 2109 undef $SDL_ACTIVE;
1799} 2110}
1800 2111
1801sub audio_channel_finished {
1802 my ($channel) = @_;
1803
1804 #warn "channel $channel finished\n";#d#
1805}
1806
1807sub audio_music_set {
1808 my ($songs) = @_;
1809
1810 my @want =
1811 grep $_,
1812 map $CONN->{music_meta}{$_},
1813 @$songs;
1814
1815 if (@want) {
1816 @MUSIC_WANT = @want;
1817 &audio_music_changed ();
1818 }
1819}
1820
1821sub audio_music_start {
1822 my $path = $MUSIC_PLAYING->{path}
1823 or return;
1824
1825 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1826 return unless $SDL_MIXER;
1827
1828 # music might have changed...
1829 $path eq $MUSIC_PLAYING->{path}
1830 or return &audio_music_start ();
1831
1832 my $rwops = new_from_file CFPlus::RW $path;
1833 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops;
1834
1835 my $NOW = time;
1836
1837 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1838 my $pos = $MUSIC_PLAYING->{stop_pos};
1839 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1840 $MUSIC_START = time - $pos;
1841 } else {
1842 $MUSIC_PLAYER->play (0);
1843 $MUSIC_START = time;
1844 }
1845
1846 delete $MUSIC_PLAYING->{stop_time};
1847 delete $MUSIC_PLAYING->{stop_pos};
1848 }
1849}
1850
1851sub audio_music_changed {
1852 return unless $CFG->{bgm_enable};
1853 return unless $SDL_MIXER;
1854
1855 # default MUSIC_WANT == MUSIC_DEFAULT
1856 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1857
1858 # if the currently playing song is acceptable, let it continue
1859 return if $MUSIC_PLAYING
1860 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1861
1862 my $NOW = time;
1863
1864 if ($MUSIC_PLAYING) {
1865 $MUSIC_PLAYING->{stop_time} = $NOW;
1866 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
1867 CFPlus::MixMusic::fade_out 1000;
1868 } else {
1869 # sort by stop time, oldest first
1870 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1871
1872 # if the most recently-played piece played very recently,
1873 # resume it, else choose the oldest piece for rotation.
1874 $MUSIC_PLAYING =
1875 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1876 ? $MUSIC_WANT[-1]
1877 : $MUSIC_WANT[0];
1878
1879 audio_music_start;
1880 }
1881}
1882
1883sub audio_music_finished {
1884 $MUSIC_PLAYING = undef;
1885 undef $MUSIC_PLAYER;
1886
1887 audio_music_changed;
1888}
1889
1890sub audio_init {
1891 if ($CFG->{audio_enable}) {
1892 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1893 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1894 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1895
1896 unless ($SDL_MIXER) {
1897 status "Unable to open sound device: there will be no sound";
1898 return;
1899 }
1900
1901 CFPlus::Mix_AllocateChannels 8;
1902 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1903
1904 audio_music_finished;
1905
1906 local $_;
1907 while (<$fh>) {
1908 next if /^\s*#/;
1909 next if /^\s*$/;
1910
1911 my ($file, $volume, $event) = split /\s+/, $_, 3;
1912
1913 push @SOUNDS, "$volume,$file";
1914
1915 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1916 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1917 my $chunk = new CFPlus::MixChunk $rwops;
1918 $chunk->volume ($volume * 128 / 100);
1919 $chunk
1920 };
1921 }
1922 } else {
1923 status "unable to open sound config: $!";
1924 }
1925 } else {
1926 undef $SDL_MIXER;
1927 }
1928}
1929
1930sub audio_shutdown {
1931 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1932 undef $SDL_MIXER;
1933 @SOUNDS = ();
1934 %AUDIO_CHUNKS = ();
1935}
1936
1937my %animate_object; 2112my %animate_object;
1938my $animate_timer; 2113my $animate_timer;
1939 2114
1940my $fps = 9; 2115my $fps = 9;
1941 2116
1942my %demo;#d#
1943
1944sub force_refresh { 2117sub force_refresh {
2118 if ($ENV{CFPLUS_DEBUG} & 4) {
1945 $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;
1946 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2120 debug sprintf "%3.2f", $fps;
2121 }
1947 2122
1948 $CFPlus::UI::ROOT->draw; 2123 $CFPlus::UI::ROOT->draw;
1949 2124 CFPlus::SDL_GL_SwapBuffers;
1950 $WANT_REFRESH = 0;
1951 $CAN_REFRESH = 0;
1952 $LAST_REFRESH = $NOW; 2125 $LAST_REFRESH = $NOW;
1953 2126 $WANT_REFRESH->stop;
1954 CFPlus::SDL_GL_SwapBuffers;
1955} 2127}
1956 2128
2129$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2130
1957my $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 {
1958 $NOW = time; 2132 $NOW = time;
1959 2133
1960 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2134 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1961 for CFPlus::poll_events; 2135 for CFPlus::poll_events;
1962 2136
1963 if (%animate_object) { 2137 if (%animate_object) {
1964 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2138 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1965 ++$WANT_REFRESH; 2139 $WANT_REFRESH->start;
1966 }
1967
1968 if ($WANT_REFRESH) {
1969 force_refresh;
1970 } else {
1971 $CAN_REFRESH = 1;
1972 } 2140 }
1973}); 2141});
1974 2142
1975sub animation_start { 2143sub animation_start {
1976 my ($widget) = @_; 2144 my ($widget) = @_;
… …
2031 CFPlus::DB::Server::run; 2199 CFPlus::DB::Server::run;
2032 2200
2033 CFPlus::UI::set_layout ($::CFG->{layout}); 2201 CFPlus::UI::set_layout ($::CFG->{layout});
2034 2202
2035 my %DEF_CFG = ( 2203 my %DEF_CFG = (
2036 sdl_mode => 0, 2204 sdl_mode => 0,
2037 width => 640,
2038 height => 480,
2039 fullscreen => 0, 2205 fullscreen => 0,
2040 fast => 0, 2206 fast => 0,
2207 force_opengl11 => undef,
2208 texture_compression => 1,
2041 map_scale => 1, 2209 map_scale => 1,
2042 fow_enable => 1, 2210 fow_enable => 1,
2043 fow_intensity => 0, 2211 fow_intensity => 0,
2044 map_smoothing => 1, 2212 map_smoothing => 1,
2045 gui_fontsize => 1, 2213 gui_fontsize => 1,
2046 log_fontsize => 0.7, 2214 log_fontsize => 0.7,
2047 gauge_fontsize => 1, 2215 gauge_fontsize => 1,
2048 gauge_size => 0.35, 2216 gauge_size => 0.35,
2049 stat_fontsize => 0.7, 2217 stat_fontsize => 0.7,
2050 mapsize => 100, 2218 mapsize => 100,
2051 audio_enable => 1, 2219 audio_enable => 1,
2220 effects_enable => 1,
2221 effects_volume => 1,
2052 bgm_enable => 1, 2222 bgm_enable => 1,
2053 bgm_volume => 0.25, 2223 bgm_volume => 0.5,
2054 output_sync => 1, 2224 output_sync => 1,
2055 output_count => 1, 2225 output_count => 1,
2056 output_rate => "", 2226 output_rate => "",
2057 pickup => 0, 2227 pickup => 0,
2058 inv_sort => "mtime", 2228 inv_sort => "mtime",
2059 default => "profile", # default profile 2229 default => "profile", # default profile
2060 show_tips => 1, 2230 show_tips => 1,
2061 logview_max_par => 1000, 2231 logview_max_par => 1000,
2062 ); 2232 );
2063 2233
2064 while (my ($k, $v) = each %DEF_CFG) { 2234 while (my ($k, $v) = each %DEF_CFG) {
2065 $CFG->{$k} = $v unless exists $CFG->{$k}; 2235 $CFG->{$k} = $v unless exists $CFG->{$k};
2066 } 2236 }
… …
2132} 2302}
2133 2303
2134show_tip_of_the_day if $CFG->{show_tips}; 2304show_tip_of_the_day if $CFG->{show_tips};
2135 2305
2136Event::loop; 2306Event::loop;
2307
2308#video_shutdown;
2309#audio_shutdown;
2137#CFPlus::SDL_Quit; 2310CFPlus::SDL_Quit;
2138#CFPlus::_exit 0;
2139
2140END {
2141 CFPlus::SDL_Quit;
2142 CFPlus::DB::Server::stop; 2311CFPlus::DB::Server::stop;
2143}
2144 2312
2145=head1 NAME 2313=head1 NAME
2146 2314
2147cfplus - A Crossfire+ and Crossfire game client 2315cfplus - A Crossfire TRT and Crossfire game client
2148 2316
2149=head1 SYNOPSIS 2317=head1 SYNOPSIS
2150 2318
2151Just run it - no commandline arguments are supported. 2319Just run it - no commandline arguments are supported.
2152 2320
2153=head1 USAGE 2321=head1 USAGE
2154 2322
2155cfplus 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
2156fullscreen and interactively. 2324be used in fullscreen mode and interactively.
2157 2325
2158=head1 DEBUGGING 2326=head1 DEBUGGING
2159 2327
2160 2328
2161CFPLUS_DEBUG - environment variable 2329CFPLUS_DEBUG - environment variable

Diff Legend

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