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.125 by root, Thu Nov 16 19:42:46 2006 UTC vs.
Revision 1.128 by root, Sat Nov 18 23:31:24 2006 UTC

1302 #TODO# update to weigh/maxweight 1302 #TODO# update to weigh/maxweight
1303 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1303 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1304 1304
1305 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1305 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1306 $sw1->add ($INV = new CFPlus::UI::Inventory); 1306 $sw1->add ($INV = new CFPlus::UI::Inventory);
1307 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1307 1308
1308 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1309 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1309 1310
1310 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1311 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1311 1312
1914 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1915 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1915 1916
1916 audio_music_finished; 1917 audio_music_finished;
1917 1918
1918 while (<$fh>) { 1919 while (<$fh>) {
1920 last;
1919 next if /^\s*#/; 1921 next if /^\s*#/;
1920 next if /^\s*$/; 1922 next if /^\s*$/;
1921 1923
1922 my ($file, $volume, $event) = split /\s+/, $_, 3; 1924 my ($file, $volume, $event) = split /\s+/, $_, 3;
1923 1925
1924 push @SOUNDS, "$volume,$file"; 1926 push @SOUNDS, "$volume,$file";
1925 1927
1926 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1928# $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1927 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file"; 1929# my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1928 $chunk->volume ($volume * 128 / 100); 1930# $chunk->volume ($volume * 128 / 100);
1929 $chunk 1931# $chunk
1930 }; 1932# };
1931 } 1933 }
1932 } else { 1934 } else {
1933 status "unable to open sound config: $!"; 1935 status "unable to open sound config: $!";
1934 } 1936 }
1935 } 1937 }
2056 log_fontsize => 0.7, 2058 log_fontsize => 0.7,
2057 gauge_fontsize => 1, 2059 gauge_fontsize => 1,
2058 gauge_size => 0.35, 2060 gauge_size => 0.35,
2059 stat_fontsize => 0.7, 2061 stat_fontsize => 0.7,
2060 mapsize => 100, 2062 mapsize => 100,
2061 say_command => 'say', 2063 say_command => 'chat',
2062 audio_enable => 1, 2064 audio_enable => 1,
2063 bgm_enable => 1, 2065 bgm_enable => 1,
2064 bgm_volume => 0.25, 2066 bgm_volume => 0.25,
2065 face_prefetch => 0, 2067 face_prefetch => 0,
2066 output_sync => 1, 2068 output_sync => 1,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines