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.206 by root, Thu Aug 9 03:40:44 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;
… …
143our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
144 145
145our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
146our $PL_WINDOW; 147our $PL_WINDOW;
147 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
148our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
149our $STATS_PAGE; 153our $STATS_PAGE;
150our $SKILL_PAGE; 154our $SKILL_PAGE;
151our $SPELL_PAGE; 155our $SPELL_PAGE;
152our $SPELL_LIST; 156our $SPELL_LIST;
… …
158our $STATWIDS; 162our $STATWIDS;
159 163
160our $SDL_ACTIVE; 164our $SDL_ACTIVE;
161our %SDL_CB; 165our %SDL_CB;
162 166
167our $ALT_ENTER_MESSAGE;
168our $STATUSBOX;
169our $DEBUG_STATUS;
170
171our $INV;
172our $INVR;
173our $INV_RIGHT_HB;
174
175our $PICKUP_CFG;
176
177#############################################################################
178
179sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
181}
182
183sub debug {
184 $DEBUG_STATUS->set_text ($_[0]);
185}
186
187sub message {
188 my ($para) = @_;
189 $MESSAGE_WINDOW->message ($para);
190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
163our $SDL_MIXER; 195our $SDL_MIXER;
196
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
166our $MUSIC_START; 200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
167our $MUSIC_PLAYING_DATA; 202our $MUSIC_PLAYING_DATA;
168our $MUSIC_PLAYING_META; 203our $MUSIC_PLAYING_META;
169our $MUSIC_PLAYER; 204our $MUSIC_PLAYER;
170our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
171our @SOUNDS; # event => file mapping 206
172our %AUDIO_CHUNKS; # audio files 207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
173 209
174our $ALT_ENTER_MESSAGE; 210sub audio_channel_finished {
175our $STATUSBOX; 211 my ($channel) = @_;
176our $DEBUG_STATUS;
177 212
178our $INV; 213# 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} 214}
187 215
188sub debug { 216sub audio_sound_push($) {
189 $DEBUG_STATUS->set_text ($_[0]);
190}
191
192sub message {
193 my ($para) = @_; 217 my ($face) = @_;
194 $MESSAGE_WINDOW->message ($para); 218
219 $CFG->{effects_enable}
220 or return;
221
222 $AUDIO_PLAY{$face}
223 or return;
224
225 if (my $chunk = $AUDIO_CHUNK{$face}) {
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_;
228
229 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $dx = $dx / 10 * 255;
232 $channel->set_panning (255 - $dx, 255 + $dx);
233
234# my $angle = $dx ? : $dx < 0 ?
235# my $distance = -$vol;
236# $channel->set_position ($angle, $distance);
237
238 $chunk->play ($channel);
239 }
240 } else {
241 # sound_meta not set means data is in flight either way
242 my $meta = $CONN->{sound_meta}{$face}
243 or return;
244
245 # if its a jingle, play it as ambient music
246 if ($meta->{meta}{jingle}) {
247 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
248 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
249 &audio_music_push ($face);
250 }
251 } else {
252 # fetch from database
253 CFPlus::DB::get res_data => $meta->{name}, sub {
254 my $rwops = new CFPlus::RW $_[0];
255 my $chunk = new CFPlus::MixChunk $rwops
256 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
257 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
258 $AUDIO_CHUNK{$face} = $chunk;
259
260 audio_sound_push ($face);
261 };
262 }
263 }
195} 264}
265
266sub audio_sound_play {
267 my ($face, $dx, $dy, $vol) = @_;
268
269 $SDL_MIXER
270 or return;
271 $CFG->{effects_enable}
272 or return;
273
274 my $queue = $AUDIO_PLAY{$face} ||= [];
275 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
276 audio_sound_push $face
277 unless @$queue > 1;
278}
279
280sub audio_music_set_meta {
281 my ($meta) = @_;
282
283 $MUSIC_PLAYING_META = $meta;
284 $MUSIC_PLAYING_WIDGET->set_markup (
285 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
286 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
287 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
288 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
289 );
290}
291
292sub audio_music_update_volume {
293 return unless $MUSIC_PLAYING_META;
294 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
295 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
296 CFPlus::MixMusic::volume $base * $volume * 128;
297}
298
299sub audio_music_start {
300 my $meta = $MUSIC_PLAYING_META;
301
302 CFPlus::DB::get res_data => $meta->{name}, sub {
303 return unless $SDL_MIXER;
304
305 # music might have changed...
306 $meta eq $MUSIC_PLAYING_META
307 or return &audio_music_start ();
308
309 audio_music_update_volume;
310
311 $MUSIC_PLAYING_DATA = \$_[0];
312
313 my $rwops = $meta->{path}
314 ? new_from_file CFPlus::RW $meta->{path}
315 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
316
317 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
318 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
319
320 my $NOW = time;
321
322 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
323 my $pos = $MUSIC_PLAYING_META->{stop_pos};
324 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
325 $MUSIC_START = time - $pos;
326 } else {
327 $MUSIC_PLAYER->play (0);
328 $MUSIC_START = time;
329 }
330
331 delete $meta->{stop_time};
332 delete $meta->{stop_pos};
333 }
334}
335
336sub audio_music_push {
337 return unless $SDL_MIXER;
338
339 my $fade_out;
340
341 if (@MUSIC_JINGLE) {
342 @MUSIC_HAVE = $MUSIC_JINGLE[0];
343 $fade_out = 333;
344 } else {
345 return unless $CFG->{bgm_enable};
346
347 my @have =
348 grep $_,
349 map $CONN->{music_meta}{$_},
350 @$MUSIC_WANT;
351
352 @MUSIC_HAVE = @have
353 if @have;
354
355 # default MUSIC_HAVE == MUSIC_DEFAULT
356 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
357 $fade_out = 1000;
358 }
359
360 # if the currently playing song is acceptable, let it continue
361 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
362
363 my $NOW = time;
364
365 if ($MUSIC_PLAYING_META) {
366 $MUSIC_PLAYING_META->{stop_time} = $NOW;
367 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
368 CFPlus::MixMusic::fade_out $fade_out;
369 } else {
370 # sort by stop time, oldest first
371 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
372
373 # if the most recently-played piece played very recently,
374 # resume it, else choose the oldest piece for rotation.
375 audio_music_set_meta
376 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
377 ? $MUSIC_HAVE[-1]
378 : $MUSIC_HAVE[0];
379
380 audio_music_start;
381 }
382}
383
384sub audio_music_set_ambient {
385 my ($songs) = @_;
386
387 $MUSIC_WANT = $songs;
388 audio_music_push;
389}
390
391sub audio_music_finished {
392 # we compress multiple jingles of the same type
393 shift @MUSIC_JINGLE
394 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
395
396 $MUSIC_PLAYING_WIDGET->clear;
397
398 undef $MUSIC_PLAYER;
399 undef $MUSIC_PLAYING_META;
400 undef $MUSIC_PLAYING_DATA;
401
402 audio_music_push;
403}
404
405sub audio_init {
406 if ($CFG->{audio_enable}) {
407 $ENV{MIX_EFFECTSMAXSPEED} = 1;
408 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
409
410 unless ($SDL_MIXER) {
411 status "Unable to open sound device: there will be no sound";
412 return;
413 }
414
415 CFPlus::Mix_AllocateChannels 16;
416
417 audio_music_finished;
418 } else {
419 undef $SDL_MIXER;
420 }
421}
422
423sub audio_shutdown {
424 undef $MUSIC_PLAYER;
425 undef $MUSIC_PLAYING_META;
426 undef $MUSIC_PLAYING_DATA;
427
428 $MUSIC_WANT = [];
429 @MUSIC_JINGLE = ();
430 %AUDIO_PLAY = ();
431 %AUDIO_CHUNK = ();
432
433 CFPlus::Mix_CloseAudio if $SDL_MIXER;
434 undef $SDL_MIXER;
435}
436
437#############################################################################
196 438
197sub destroy_query_dialog { 439sub destroy_query_dialog {
198 (delete $_[0]{query_dialog})->destroy 440 (delete $_[0]{query_dialog})->destroy
199 if $_[0]{query_dialog}; 441 if $_[0]{query_dialog};
200} 442}
… …
460 query => \&server_query, 702 query => \&server_query,
461 703
462 setup_req => { 704 setup_req => {
463 smoothing => $CFG->{map_smoothing}*1, 705 smoothing => $CFG->{map_smoothing}*1,
464 }, 706 },
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 }; 707 };
478 708
479 if ($CONN) { 709 if ($CONN) {
480 CFPlus::lowdelay fileno $CONN->{fh}; 710 CFPlus::lowdelay fileno $CONN->{fh};
481 711
… …
492 $SETUP_DIALOG->show; 722 $SETUP_DIALOG->show;
493 $PL_WINDOW->hide; 723 $PL_WINDOW->hide;
494 $SPELL_LIST->clear_spells; 724 $SPELL_LIST->clear_spells;
495 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
496 726
497 &audio_music_set ([]); 727 &audio_music_set_ambient ([]);
498 728
499 return unless $CONN; 729 return unless $CONN;
500 730
501 status "connection closed"; 731 status "connection closed";
502 732
… …
635} 865}
636 866
637sub audio_setup { 867sub audio_setup {
638 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
639 869
640 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 870 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
641 871
642 my $row = 0; 872 my $row = 0;
643 873
644 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 874 $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 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
649 ); 879 );
650# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 880# $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 { 881# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
652# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
653# }); 883# });
884
885 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
886 $table->add_at (1, $row, new CFPlus::UI::CheckBox
887 expand => 1, state => $CFG->{effects_enable},
888 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
889 on_changed => sub {
890 $CFG->{effects_enable} = $_[1];
891 $CONN->update_fx_want if $CONN;
892 0
893 }
894 );
895 $table->add_at (2, $row++, new CFPlus::UI::Slider
896 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
897 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
898 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
899 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
900 );
901
654 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 902 $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); 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
656 $hbox->add (new CFPlus::UI::CheckBox
657 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
658 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 905 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 } 906 on_changed => sub {
907 $CFG->{bgm_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
660 ); 911 );
661 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
662 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
663 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
664 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 915 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
665 ); 916 );
666 917
667 $table->add_at (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
668 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
669 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
670 on_activate => sub { 921 on_activate => sub {
671 audio_shutdown (); 922 audio_shutdown ();
672 audio_init (); 923 audio_init ();
673 0 924 0
… …
744 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 995 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
745 996
746 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 997 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
747 998
748 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 999 $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); 1000 $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); 1001 $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); 1002 $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); 1003 $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"); 1004 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
754 1005
755 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1006 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
756 1007
757 $c->add_items ({ 1008 $c->add_items ({
… …
1082 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1083 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1334 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1084 on_changed => sub { 1335 on_changed => sub {
1085 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1086 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1087 0 1338 1
1088 } 1339 }
1089 ); 1340 );
1090 1341
1091 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1092 expand => 1, 1343 expand => 1,
1093 text => "Server List", 1344 text => "Server List",
1094 other => $METASERVER, 1345 other => $METASERVER,
1095 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1096 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1097 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1098 ); 1349 );
1099 } 1350 }
1100 1351
1101 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1352 $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 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1103 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1104 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1106 ); 1357 );
1107 1358
1108 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1359 $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 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1110 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1111 hidden => 1, 1362 hidden => 1,
1112 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1113 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1114 ); 1365 );
1115 1366
1116 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1367 $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 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1118 force_w => 100, 1369 force_w => 100,
1119 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1120 tooltip => "This is the size of the portion of the map update the server sends you. " 1371 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, " 1372 . "If you set this to a high value you will be able to see further, "
1122 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1123 . "This option is only used once at log-in.", 1374 . "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 }, 1375 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1125 ); 1376 );
1126 1377
1127 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1378 $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 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1129 text => $CFG->{output_rate}, 1380 text => $CFG->{output_rate},
1130 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1381 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 " 1382 . "when sending data. When 0 or unset, the server "
1132 . "default will be used, which is usually around 100kb/s.", 1383 . "default will be used, which is usually around 100kb/s. Most servers will "
1384 . "dynamically find an optimal rate, so adjust this only when necessary.",
1133 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1134 ); 1386 );
1135 1387
1136 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1388 $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 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1138 text => $CFG->{output_count}, 1390 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.", 1391 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 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1141 ); 1393 );
1142 1394
1143 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1395 $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 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1145 text => $CFG->{output_sync}, 1397 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.", 1398 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 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1148 ); 1400 );
1149 1401
1150 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1151 expand => 1, 1403 expand => 1,
1152 align => 0, 1404 align => 0,
1153 text => "Login", 1405 text => "Login",
1154 on_activate => sub { 1406 on_activate => sub {
1155 $CONN ? stop_game 1407 $CONN ? stop_game
1156 : start_game; 1408 : start_game;
1157 0 1409 1
1158 }, 1410 },
1159 ); 1411 );
1160 1412
1161 $vbox->add (new CFPlus::UI::FancyFrame 1413 $vbox->add (new CFPlus::UI::FancyFrame
1162 label => "Server Info", 1414 label => "Server Info",
… …
1363 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1364 1616
1365 $hb 1617 $hb
1366} 1618}
1367 1619
1620sub media_window {
1621 my $vb = new CFPlus::UI::VBox;
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Currently playing music",
1625 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1626 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1627 );
1628
1629 $vb->add (new CFPlus::UI::FancyFrame
1630 label => "Other media used in this session",
1631 expand => 1,
1632 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1633 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1634 );
1635
1636 $vb
1637}
1638
1639sub add_license {
1640 my ($meta) = @_;
1641
1642 $meta = $meta->{meta}
1643 or return;
1644
1645 $meta->{license} || $meta->{author} || $meta->{source}
1646 or return;
1647
1648 $LICENSE_WIDGET->add_paragraph ({
1649 fg => [1, 1, 1, 1],
1650 markup => "<small>"
1651 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1652 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1653 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1654 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1655 . "</small>",
1656 });
1657 $LICENSE_WIDGET->scroll_to_bottom;
1658}
1659
1368sub toggle_player_page { 1660sub toggle_player_page {
1369 my ($widget) = @_; 1661 my ($widget) = @_;
1370 1662
1371 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1372 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1409 $ntb->add_tab ( 1701 $ntb->add_tab (
1410 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1411 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1703 "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." 1704 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1413 ); 1705 );
1414 $ntb->add_tab (Pickup => autopickup_setup, 1706 $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."); 1707 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1708
1709 $ntb->add_tab (Media => media_window,
1710 "License, Author and Source info for media sent by the server.");
1416 1711
1417 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1418 1713
1419 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1420 $plwin 1715 $plwin
… …
1797 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
1798 2093
1799 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
1800} 2095}
1801 2096
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; 2097my %animate_object;
1945my $animate_timer; 2098my $animate_timer;
1946 2099
1947my $fps = 9; 2100my $fps = 9;
1948
1949my %demo;#d#
1950 2101
1951sub force_refresh { 2102sub force_refresh {
1952 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2103 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1953 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1954 2105
… …
2039 2190
2040 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2041 2192
2042 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2043 sdl_mode => 0, 2194 sdl_mode => 0,
2044 width => 640,
2045 height => 480,
2046 fullscreen => 0, 2195 fullscreen => 0,
2047 fast => 0, 2196 fast => 0,
2048 map_scale => 1, 2197 map_scale => 1,
2049 fow_enable => 1, 2198 fow_enable => 1,
2050 fow_intensity => 0, 2199 fow_intensity => 0,
… …
2054 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2055 gauge_size => 0.35, 2204 gauge_size => 0.35,
2056 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2057 mapsize => 100, 2206 mapsize => 100,
2058 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2059 bgm_enable => 1, 2210 bgm_enable => 1,
2060 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2061 output_sync => 1, 2212 output_sync => 1,
2062 output_count => 1, 2213 output_count => 1,
2063 output_rate => "", 2214 output_rate => "",
2064 pickup => 0, 2215 pickup => 0,
2065 inv_sort => "mtime", 2216 inv_sort => "mtime",
… …
2143Event::loop; 2294Event::loop;
2144#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2145#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2146 2297
2147END { 2298END {
2299 video_shutdown;
2300 audio_shutdown;
2148 CFPlus::SDL_Quit; 2301 CFPlus::SDL_Quit;
2149 CFPlus::DB::Server::stop; 2302 CFPlus::DB::Server::stop;
2150} 2303}
2151 2304
2152=head1 NAME 2305=head1 NAME
2153 2306
2154cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2155 2308
2156=head1 SYNOPSIS 2309=head1 SYNOPSIS
2157 2310
2158Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2159 2312
2160=head1 USAGE 2313=head1 USAGE
2161 2314
2162cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2315cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2163fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2164 2317
2165=head1 DEBUGGING 2318=head1 DEBUGGING
2166 2319
2167 2320
2168CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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