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.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

… …
144our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
145 145
146our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
147our $PL_WINDOW; 147our $PL_WINDOW;
148 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
149our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
150our $STATS_PAGE; 153our $STATS_PAGE;
151our $SKILL_PAGE; 154our $SKILL_PAGE;
152our $SPELL_PAGE; 155our $SPELL_PAGE;
153our $SPELL_LIST; 156our $SPELL_LIST;
… …
159our $STATWIDS; 162our $STATWIDS;
160 163
161our $SDL_ACTIVE; 164our $SDL_ACTIVE;
162our %SDL_CB; 165our %SDL_CB;
163 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
164our $SDL_MIXER; 195our $SDL_MIXER;
196
165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our @MUSIC_WANT; 198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
167our $MUSIC_START; 200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
168our $MUSIC_PLAYING_DATA; 202our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META; 203our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER; 204our $MUSIC_PLAYER;
171our $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
172our @SOUNDS; # event => file mapping 206
173our %AUDIO_CHUNKS; # audio files 207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
174 209
175our $ALT_ENTER_MESSAGE; 210sub audio_channel_finished {
176our $STATUSBOX; 211 my ($channel) = @_;
177our $DEBUG_STATUS;
178 212
179our $INV; 213# warn "channel $channel finished\n";#d#
180our $INVR;
181our $INV_RIGHT_HB;
182
183our $PICKUP_CFG;
184
185sub status {
186 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
187} 214}
188 215
189sub debug { 216sub audio_sound_push($) {
190 $DEBUG_STATUS->set_text ($_[0]);
191}
192
193sub message {
194 my ($para) = @_; 217 my ($face) = @_;
195 $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 }
196} 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#############################################################################
197 438
198sub destroy_query_dialog { 439sub destroy_query_dialog {
199 (delete $_[0]{query_dialog})->destroy 440 (delete $_[0]{query_dialog})->destroy
200 if $_[0]{query_dialog}; 441 if $_[0]{query_dialog};
201} 442}
… …
481 $SETUP_DIALOG->show; 722 $SETUP_DIALOG->show;
482 $PL_WINDOW->hide; 723 $PL_WINDOW->hide;
483 $SPELL_LIST->clear_spells; 724 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 725 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485 726
486 &audio_music_set ([]); 727 &audio_music_set_ambient ([]);
487 728
488 return unless $CONN; 729 return unless $CONN;
489 730
490 status "connection closed"; 731 status "connection closed";
491 732
… …
624} 865}
625 866
626sub audio_setup { 867sub audio_setup {
627 my $vbox = new CFPlus::UI::VBox; 868 my $vbox = new CFPlus::UI::VBox;
628 869
629 $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]);
630 871
631 my $row = 0; 872 my $row = 0;
632 873
633 $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");
634 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 875 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
638 ); 879 );
639# $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");
640# $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 {
641# $CFG->{effects_volume} = $_[1]; 882# $CFG->{effects_volume} = $_[1];
642# }); 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
643 $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");
644 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); 903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
645 $hbox->add (new CFPlus::UI::CheckBox
646 expand => 1, state => $CFG->{bgm_enable}, 904 expand => 1, state => $CFG->{bgm_enable},
647 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.",
648 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 }
649 ); 911 );
650 $hbox->add (new CFPlus::UI::Slider 912 $table->add_at (2, $row++, new CFPlus::UI::Slider
651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 913 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652 tooltip => "The volume of the background music. Changes are instant.", 914 tooltip => "The volume of the background music. Changes are instant.",
653 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 }
654 ); 916 );
655 917
656 $table->add_at (1, $row++, new CFPlus::UI::Button 918 $table->add_at (1, $row++, new CFPlus::UI::Button
657 expand => 1, align => 0, text => "Apply", 919 c_colspan => 2, expand => 1, align => 0, text => "Apply",
658 tooltip => "Apply the audio settings", 920 tooltip => "Apply the audio settings",
659 on_activate => sub { 921 on_activate => sub {
660 audio_shutdown (); 922 audio_shutdown ();
661 audio_init (); 923 audio_init ();
662 0 924 0
… …
733 $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() } );
734 996
735 $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#
736 998
737 $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);
738 $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);
739 $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);
740 $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);
741 $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);
742 $t->add_at (1,1, new CFPlus::UI::Label text => "e"); 1004 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
743 1005
744 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1006 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745 1007
746 $c->add_items ({ 1008 $c->add_items ({
… …
1071 text => $CFG->{profile}{default}{host}, 1333 text => $CFG->{profile}{default}{host},
1072 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",
1073 on_changed => sub { 1335 on_changed => sub {
1074 my ($self, $value) = @_; 1336 my ($self, $value) = @_;
1075 $CFG->{profile}{default}{host} = $value; 1337 $CFG->{profile}{default}{host} = $value;
1076 0 1338 1
1077 } 1339 }
1078 ); 1340 );
1079 1341
1080 $vbox->add (new CFPlus::UI::Button 1342 $vbox->add (new CFPlus::UI::Button
1081 expand => 1, 1343 expand => 1,
1082 text => "Server List", 1344 text => "Server List",
1083 other => $METASERVER, 1345 other => $METASERVER,
1084 tooltip => "Show a list of available crossfire servers", 1346 tooltip => "Show a list of available crossfire servers",
1085 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1347 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1348 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1087 ); 1349 );
1088 } 1350 }
1089 1351
1090 $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");
1091 $table->add_at (1, 4, new CFPlus::UI::Entry 1353 $table->add_at (1, 4, new CFPlus::UI::Entry
1092 text => $CFG->{profile}{default}{user}, 1354 text => $CFG->{profile}{default}{user},
1093 tooltip => "The name of your character on the server", 1355 tooltip => "The name of your character on the server",
1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1356 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1095 ); 1357 );
1096 1358
1097 $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");
1098 $table->add_at (1, 5, new CFPlus::UI::Entry 1360 $table->add_at (1, 5, new CFPlus::UI::Entry
1099 text => $CFG->{profile}{default}{password}, 1361 text => $CFG->{profile}{default}{password},
1100 hidden => 1, 1362 hidden => 1,
1101 tooltip => "The password for your character", 1363 tooltip => "The password for your character",
1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1364 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1103 ); 1365 );
1104 1366
1105 $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");
1106 $table->add_at (1, 7, new CFPlus::UI::Slider 1368 $table->add_at (1, 7, new CFPlus::UI::Slider
1107 force_w => 100, 1369 force_w => 100,
1108 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1370 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1109 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. "
1110 . "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, "
1111 . "but you also increase bandwidth requirements and latency. " 1373 . "but you also increase bandwidth requirements and latency. "
1112 . "This option is only used once at log-in.", 1374 . "This option is only used once at log-in.",
1113 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 },
1114 ); 1376 );
1115 1377
1116 $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");
1117 $table->add_at (1, 8, new CFPlus::UI::Entry 1379 $table->add_at (1, 8, new CFPlus::UI::Entry
1118 text => $CFG->{output_rate}, 1380 text => $CFG->{output_rate},
1119 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 "
1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1382 . "when sending data. When 0 or unset, the server "
1121 . "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.",
1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1385 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1123 ); 1386 );
1124 1387
1125 $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");
1126 $table->add_at (1, 9, new CFPlus::UI::Entry 1389 $table->add_at (1, 9, new CFPlus::UI::Entry
1127 text => $CFG->{output_count}, 1390 text => $CFG->{output_count},
1128 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.",
1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1392 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1130 ); 1393 );
1131 1394
1132 $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");
1133 $table->add_at (1, 10, new CFPlus::UI::Entry 1396 $table->add_at (1, 10, new CFPlus::UI::Entry
1134 text => $CFG->{output_sync}, 1397 text => $CFG->{output_sync},
1135 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.",
1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1399 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1137 ); 1400 );
1138 1401
1139 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1402 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1140 expand => 1, 1403 expand => 1,
1141 align => 0, 1404 align => 0,
1142 text => "Login", 1405 text => "Login",
1143 on_activate => sub { 1406 on_activate => sub {
1144 $CONN ? stop_game 1407 $CONN ? stop_game
1145 : start_game; 1408 : start_game;
1146 0 1409 1
1147 }, 1410 },
1148 ); 1411 );
1149 1412
1150 $vbox->add (new CFPlus::UI::FancyFrame 1413 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info", 1414 label => "Server Info",
… …
1352 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1615 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353 1616
1354 $hb 1617 $hb
1355} 1618}
1356 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
1357sub toggle_player_page { 1660sub toggle_player_page {
1358 my ($widget) = @_; 1661 my ($widget) = @_;
1359 1662
1360 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1663 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1361 $PL_WINDOW->hide; 1664 $PL_WINDOW->hide;
… …
1398 $ntb->add_tab ( 1701 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1702 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "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 :). "
1401 . "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."
1402 ); 1705 );
1403 $ntb->add_tab (Pickup => autopickup_setup, 1706 $ntb->add_tab (Pickup => autopickup_setup,
1404 "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.");
1405 1711
1406 $ntb->set_current_page ($INVENTORY_PAGE); 1712 $ntb->set_current_page ($INVENTORY_PAGE);
1407 1713
1408 $plwin->add ($ntb); 1714 $plwin->add ($ntb);
1409 $plwin 1715 $plwin
… …
1786 CFPlus::OpenGL::shutdown; 2092 CFPlus::OpenGL::shutdown;
1787 2093
1788 undef $SDL_ACTIVE; 2094 undef $SDL_ACTIVE;
1789} 2095}
1790 2096
1791sub audio_channel_finished {
1792 my ($channel) = @_;
1793
1794# warn "channel $channel finished\n";#d#
1795}
1796
1797our %AUDIO_PLAY;
1798our %AUDIO_CHUNK;
1799
1800sub audio_sound_push($) {
1801 my ($face) = @_;
1802
1803 if (my $chunk = $AUDIO_CHUNK{$face}) {
1804 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1805 my (undef, $dx, $dy, $vol) = @$_;
1806
1807 my $channel = $chunk->play
1808 or return;
1809
1810 $channel->volume (128 + $vol);
1811 $dx = $dx / 10 * 255;
1812 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816 }
1817 } else {
1818 # sound_meta not set means data is in flight either way
1819 my $meta = $CONN->{sound_meta}{$face}
1820 or return;
1821
1822 # fetch from database
1823 CFPlus::DB::get res_data => $meta->{name}, sub {
1824 my $vol = $meta->{meta}{volume} || 100;
1825 my $rwops = new CFPlus::RW $_[0];
1826 my $chunk = new CFPlus::MixChunk $rwops;
1827 $chunk->volume ($vol * 128 / 100);
1828 $AUDIO_CHUNK{$face} = $chunk;
1829
1830 audio_sound_push ($face);
1831 };
1832 }
1833}
1834
1835sub audio_sound_play {
1836 my ($face, $dx, $dy, $vol) = @_;
1837
1838 $SDL_MIXER
1839 or return;
1840
1841 my $queue = $AUDIO_PLAY{$face} ||= [];
1842 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1843 audio_sound_push $face
1844 unless @$queue > 1;
1845}
1846
1847sub audio_music_set {
1848 my ($songs) = @_;
1849
1850 my @want =
1851 grep $_,
1852 map $CONN->{music_meta}{$_},
1853 @$songs;
1854
1855 if (@want) {
1856 @MUSIC_WANT = @want;
1857 &audio_music_changed ();
1858 }
1859}
1860
1861sub audio_music_start {
1862 my $meta = $MUSIC_PLAYING_META;
1863
1864 CFPlus::DB::get res_data => $meta->{name}, sub {
1865 return unless $SDL_MIXER;
1866
1867 # music might have changed...
1868 $meta eq $MUSIC_PLAYING_META
1869 or return &audio_music_start ();
1870
1871 $MUSIC_PLAYING_DATA = \$_[0];
1872
1873 my $rwops = $meta->{path}
1874 ? new_from_file CFPlus::RW $meta->{path}
1875 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1876
1877 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1878 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1879
1880 my $NOW = time;
1881
1882 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1883 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1884 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1885 $MUSIC_START = time - $pos;
1886 } else {
1887 $MUSIC_PLAYER->play (0);
1888 $MUSIC_START = time;
1889 }
1890
1891 delete $MUSIC_PLAYING_META->{stop_time};
1892 delete $MUSIC_PLAYING_META->{stop_pos};
1893 }
1894}
1895
1896sub audio_music_changed {
1897 return unless $CFG->{bgm_enable};
1898 return unless $SDL_MIXER;
1899
1900 # default MUSIC_WANT == MUSIC_DEFAULT
1901 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1902
1903 # if the currently playing song is acceptable, let it continue
1904 return if $MUSIC_PLAYING_META
1905 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1906
1907 my $NOW = time;
1908
1909 if ($MUSIC_PLAYING_META) {
1910 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1911 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1912 CFPlus::MixMusic::fade_out 1000;
1913 } else {
1914 # sort by stop time, oldest first
1915 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1916
1917 # if the most recently-played piece played very recently,
1918 # resume it, else choose the oldest piece for rotation.
1919 $MUSIC_PLAYING_META =
1920 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1921 ? $MUSIC_WANT[-1]
1922 : $MUSIC_WANT[0];
1923
1924 audio_music_start;
1925 }
1926}
1927
1928sub audio_music_finished {
1929 undef $MUSIC_PLAYER;
1930 undef $MUSIC_PLAYING_META;
1931 undef $MUSIC_PLAYING_DATA;
1932
1933 audio_music_changed;
1934}
1935
1936sub audio_init {
1937 if ($CFG->{audio_enable}) {
1938 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1939 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1940
1941 unless ($SDL_MIXER) {
1942 status "Unable to open sound device: there will be no sound";
1943 return;
1944 }
1945
1946 CFPlus::Mix_AllocateChannels 16;
1947 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1948
1949 audio_music_finished;
1950 } else {
1951 undef $SDL_MIXER;
1952 }
1953}
1954
1955sub audio_shutdown {
1956 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1957 undef $SDL_MIXER;
1958 @SOUNDS = ();
1959 %AUDIO_CHUNKS = ();
1960}
1961
1962my %animate_object; 2097my %animate_object;
1963my $animate_timer; 2098my $animate_timer;
1964 2099
1965my $fps = 9; 2100my $fps = 9;
1966
1967my %demo;#d#
1968 2101
1969sub force_refresh { 2102sub force_refresh {
1970 $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;
1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1972 2105
… …
2057 2190
2058 CFPlus::UI::set_layout ($::CFG->{layout}); 2191 CFPlus::UI::set_layout ($::CFG->{layout});
2059 2192
2060 my %DEF_CFG = ( 2193 my %DEF_CFG = (
2061 sdl_mode => 0, 2194 sdl_mode => 0,
2062 width => 640,
2063 height => 480,
2064 fullscreen => 0, 2195 fullscreen => 0,
2065 fast => 0, 2196 fast => 0,
2066 map_scale => 1, 2197 map_scale => 1,
2067 fow_enable => 1, 2198 fow_enable => 1,
2068 fow_intensity => 0, 2199 fow_intensity => 0,
… …
2072 gauge_fontsize => 1, 2203 gauge_fontsize => 1,
2073 gauge_size => 0.35, 2204 gauge_size => 0.35,
2074 stat_fontsize => 0.7, 2205 stat_fontsize => 0.7,
2075 mapsize => 100, 2206 mapsize => 100,
2076 audio_enable => 1, 2207 audio_enable => 1,
2208 effects_enable => 1,
2209 effects_volume => 1,
2077 bgm_enable => 1, 2210 bgm_enable => 1,
2078 bgm_volume => 0.25, 2211 bgm_volume => 0.5,
2079 output_sync => 1, 2212 output_sync => 1,
2080 output_count => 1, 2213 output_count => 1,
2081 output_rate => "", 2214 output_rate => "",
2082 pickup => 0, 2215 pickup => 0,
2083 inv_sort => "mtime", 2216 inv_sort => "mtime",
… …
2161Event::loop; 2294Event::loop;
2162#CFPlus::SDL_Quit; 2295#CFPlus::SDL_Quit;
2163#CFPlus::_exit 0; 2296#CFPlus::_exit 0;
2164 2297
2165END { 2298END {
2299 video_shutdown;
2300 audio_shutdown;
2166 CFPlus::SDL_Quit; 2301 CFPlus::SDL_Quit;
2167 CFPlus::DB::Server::stop; 2302 CFPlus::DB::Server::stop;
2168} 2303}
2169 2304
2170=head1 NAME 2305=head1 NAME
2171 2306
2172cfplus - A Crossfire+ and Crossfire game client 2307cfplus - A Crossfire TRT and Crossfire game client
2173 2308
2174=head1 SYNOPSIS 2309=head1 SYNOPSIS
2175 2310
2176Just run it - no commandline arguments are supported. 2311Just run it - no commandline arguments are supported.
2177 2312
2178=head1 USAGE 2313=head1 USAGE
2179 2314
2180cfplus 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
2181fullscreen and interactively. 2316be used in fullscreen mode and interactively.
2182 2317
2183=head1 DEBUGGING 2318=head1 DEBUGGING
2184 2319
2185 2320
2186CFPLUS_DEBUG - environment variable 2321CFPLUS_DEBUG - environment variable

Diff Legend

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