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.184 by root, Mon Jul 23 15:30:46 2007 UTC vs.
Revision 1.194 by root, Tue Jul 31 00:50:04 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;
… …
162 163
163our $SDL_MIXER; 164our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 166our @MUSIC_WANT;
166our $MUSIC_START; 167our $MUSIC_START;
167our $MUSIC_PLAYING; 168our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META;
168our $MUSIC_PLAYER; 170our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNK; # audio files
172 174
173our $ALT_ENTER_MESSAGE; 175our $ALT_ENTER_MESSAGE;
174our $STATUSBOX; 176our $STATUSBOX;
175our $DEBUG_STATUS; 177our $DEBUG_STATUS;
176 178
177our $INV; 179our $INV;
178our $INVR; 180our $INVR;
179our $INV_RIGHT_HB; 181our $INV_RIGHT_HB;
180 182
181our $PICKUP_CFG; 183our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
185 184
186sub status { 185sub status {
187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 186 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188} 187}
189 188
… …
462 query => \&server_query, 461 query => \&server_query,
463 462
464 setup_req => { 463 setup_req => {
465 smoothing => $CFG->{map_smoothing}*1, 464 smoothing => $CFG->{map_smoothing}*1,
466 }, 465 },
467
468 sound_play => sub {
469 my ($x, $y, $soundnum, $type) = @_;
470
471 $SDL_MIXER
472 or return;
473
474 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
475 or return;
476
477 $chunk->play;
478 },
479 }; 466 };
480 467
481 if ($CONN) { 468 if ($CONN) {
482 CFPlus::lowdelay fileno $CONN->{fh}; 469 CFPlus::lowdelay fileno $CONN->{fh};
483 470
… …
494 $SETUP_DIALOG->show; 481 $SETUP_DIALOG->show;
495 $PL_WINDOW->hide; 482 $PL_WINDOW->hide;
496 $SPELL_LIST->clear_spells; 483 $SPELL_LIST->clear_spells;
497 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
498 485
499 &audio_music_set ([]); 486 &audio_music_set_ambient ([]);
500 487
501 return unless $CONN; 488 return unless $CONN;
502 489
503 status "connection closed"; 490 status "connection closed";
504 491
… …
1084 text => $CFG->{profile}{default}{host}, 1071 text => $CFG->{profile}{default}{host},
1085 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1086 on_changed => sub { 1073 on_changed => sub {
1087 my ($self, $value) = @_; 1074 my ($self, $value) = @_;
1088 $CFG->{profile}{default}{host} = $value; 1075 $CFG->{profile}{default}{host} = $value;
1089 0 1076 1
1090 } 1077 }
1091 ); 1078 );
1092 1079
1093 $vbox->add (new CFPlus::UI::Button 1080 $vbox->add (new CFPlus::UI::Button
1094 expand => 1, 1081 expand => 1,
1095 text => "Server List", 1082 text => "Server List",
1096 other => $METASERVER, 1083 other => $METASERVER,
1097 tooltip => "Show a list of available crossfire servers", 1084 tooltip => "Show a list of available crossfire servers",
1098 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1085 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1099 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1100 ); 1087 );
1101 } 1088 }
1102 1089
1103 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1090 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1104 $table->add_at (1, 4, new CFPlus::UI::Entry 1091 $table->add_at (1, 4, new CFPlus::UI::Entry
1105 text => $CFG->{profile}{default}{user}, 1092 text => $CFG->{profile}{default}{user},
1106 tooltip => "The name of your character on the server", 1093 tooltip => "The name of your character on the server",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1108 ); 1095 );
1109 1096
1110 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1097 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1111 $table->add_at (1, 5, new CFPlus::UI::Entry 1098 $table->add_at (1, 5, new CFPlus::UI::Entry
1112 text => $CFG->{profile}{default}{password}, 1099 text => $CFG->{profile}{default}{password},
1113 hidden => 1, 1100 hidden => 1,
1114 tooltip => "The password for your character", 1101 tooltip => "The password for your character",
1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1116 ); 1103 );
1117 1104
1118 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1105 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1119 $table->add_at (1, 7, new CFPlus::UI::Slider 1106 $table->add_at (1, 7, new CFPlus::UI::Slider
1120 force_w => 100, 1107 force_w => 100,
1121 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1108 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1122 tooltip => "This is the size of the portion of the map update the server sends you. " 1109 tooltip => "This is the size of the portion of the map update the server sends you. "
1123 . "If you set this to a high value you will be able to see further, " 1110 . "If you set this to a high value you will be able to see further, "
1124 . "but you also increase bandwidth requirements and latency. " 1111 . "but you also increase bandwidth requirements and latency. "
1125 . "This option is only used once at log-in.", 1112 . "This option is only used once at log-in.",
1126 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1127 ); 1114 );
1128 1115
1129 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1130 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1131 state => $CFG->{face_prefetch},
1132 tooltip => "<b>Background Image Prefetch</b>\n\n"
1133 . "If enabled, the client automatically pre-fetches images from the server. "
1134 . "This might increase or create lag, but increases the chances "
1135 . "of faces being ready for display when you encounter them. "
1136 . "It also uses up server bandwidth on every connect, "
1137 . "so only set it if you really need to prefetch images. "
1138 . "This option can be set and unset any time.",
1139 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1140 );
1141
1142 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1116 $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
1118 text => $CFG->{output_rate},
1119 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1120 . "when sending data. When 0 or unset, the server "
1121 . "default will be used, which is usually around 100kb/s. Most servers will "
1122 . "dynamically find an optimal rate, so adjust this only when necessary.",
1123 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1124 );
1125
1126 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1143 $table->add_at (1, 9, new CFPlus::UI::Entry 1127 $table->add_at (1, 9, new CFPlus::UI::Entry
1144 text => $CFG->{output_rate},
1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1146 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1147 . "default will be used, which is usually around 100kb/s.",
1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1149 );
1150
1151 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1152 $table->add_at (1, 10, new CFPlus::UI::Entry
1153 text => $CFG->{output_count}, 1128 text => $CFG->{output_count},
1154 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1129 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1155 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1130 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1156 ); 1131 );
1157 1132
1158 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1133 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1159 $table->add_at (1, 11, new CFPlus::UI::Entry 1134 $table->add_at (1, 10, new CFPlus::UI::Entry
1160 text => $CFG->{output_sync}, 1135 text => $CFG->{output_sync},
1161 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1162 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1137 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1163 ); 1138 );
1164 1139
1165 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1140 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1166 expand => 1, 1141 expand => 1,
1167 align => 0, 1142 align => 0,
1168 text => "Login", 1143 text => "Login",
1169 on_activate => sub { 1144 on_activate => sub {
1170 $CONN ? stop_game 1145 $CONN ? stop_game
1171 : start_game; 1146 : start_game;
1172 0 1147 1
1173 }, 1148 },
1174 ); 1149 );
1175 1150
1176 $vbox->add (new CFPlus::UI::FancyFrame 1151 $vbox->add (new CFPlus::UI::FancyFrame
1177 label => "Server Info", 1152 label => "Server Info",
… …
1183 1158
1184sub client_setup { 1159sub client_setup {
1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1160 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1186 1161
1187 my $row = 0; 1162 my $row = 0;
1188
1189 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1190 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1191 text => $CFG->{say_command},
1192 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1193 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1194 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1195 on_changed => sub {
1196 my ($self, $value) = @_;
1197 $CFG->{say_command} = $value;
1198 0
1199 }
1200 );
1201 1163
1202 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1164 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1203 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1165 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1204 state => $CFG->{show_tips}, 1166 state => $CFG->{show_tips},
1205 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1167 tooltip => "Show the <b>Tip of the day</b> window at startup?",
… …
1819 } 1781 }
1820 1782
1821 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1783 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1822} 1784}
1823 1785
1824sub setup_build_button {
1825 my ($enabled) = @_;
1826 if ($enabled) {
1827 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1828 $BUILD_BUTTON ||= new CFPlus::UI::Button
1829 text => "Build",
1830 tooltip => "Opens the ingame builder",
1831 on_activate => sub {
1832 if ($CONN) {
1833 $CONN->send_ext_req (builder_player_items => sub {
1834 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1835 });
1836 }
1837 0
1838 };
1839 $BUTTONBAR->add ($BUILD_BUTTON);
1840 } else {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 }
1843}
1844
1845sub open_ingame_editor {
1846 my ($msg) = @_;
1847
1848 my $win = new CFPlus::UI::Toplevel
1849 x => 0,
1850 y => 'center',
1851 z => 4,
1852 name => 'builder_window',
1853 force_w => int $WIDTH * 1/4,
1854 force_h => int $HEIGHT * 3/4,
1855 title => "In game builder",
1856 has_close_button => 1;
1857
1858 my $r = new CFPlus::UI::ScrolledWindow (
1859 expand => 1,
1860 scroll_y => 1
1861 );
1862 $r->add (my $vb = new CFPlus::UI::VBox);
1863 $win->add ($r);
1864
1865
1866 $vb->add (
1867 new CFPlus::UI::Button
1868 text => "Disable build mode",
1869 on_activate => sub { $::IN_BUILD_MODE = undef }
1870 );
1871 $vb->add (
1872 new CFPlus::UI::Button
1873 text => "ERASE",
1874 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1875 );
1876
1877 for my $itemarchname (
1878 sort {
1879 $msg->{items}->{$a}->{build_arch_name}
1880 cmp $msg->{items}->{$b}->{build_arch_name}
1881 } keys %{$msg->{items}}
1882 ) {
1883 my $info = $msg->{items}->{$itemarchname};
1884 $vb->add (
1885 new CFPlus::UI::Button text => $info->{build_arch_name},
1886 on_activate => sub {
1887 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1888
1889 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1890 build_mode_query_arch_info ();
1891 }
1892 }
1893 );
1894 }
1895
1896 $win->show;
1897}
1898
1899sub build_mode_query_arch_info {
1900 my ($iteminfo) = $::IN_BUILD_MODE;
1901 my $itemarchname = $iteminfo->{item};
1902 my $info = $iteminfo->{info};
1903
1904 my $dialog = new CFPlus::UI::Toplevel
1905 x => "center",
1906 y => "center",
1907 z => 50,
1908 force_w => int $WIDTH * 1/2,
1909 title => "Enter information for placement of '$itemarchname'",
1910 has_close_button => 1;
1911
1912 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1913
1914 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1915 my $row = 0;
1916 if ($info->{has_name}) {
1917 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1918 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1919 }
1920 if ($info->{has_text}) {
1921 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1922 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1923 }
1924 if ($info->{has_connection}) {
1925 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1926 $table->add_at (1, $row++,
1927 new CFPlus::UI::Entry
1928 expand => 1,
1929 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1930 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1931 );
1932 }
1933
1934 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1935 $hb->add (new CFPlus::UI::Button
1936 text => "Close",
1937 expand => 1,
1938 on_activate => sub { $dialog->hide; 0 },
1939 );
1940 $dialog->show;
1941}
1942
1943sub video_shutdown { 1786sub video_shutdown {
1944 CFPlus::OpenGL::shutdown; 1787 CFPlus::OpenGL::shutdown;
1945 1788
1946 undef $SDL_ACTIVE; 1789 undef $SDL_ACTIVE;
1947} 1790}
1948 1791
1949sub audio_channel_finished { 1792sub audio_channel_finished {
1950 my ($channel) = @_; 1793 my ($channel) = @_;
1951 1794
1952 #warn "channel $channel finished\n";#d# 1795# warn "channel $channel finished\n";#d#
1953} 1796}
1954 1797
1798our %AUDIO_PLAY;
1799our %AUDIO_CHUNK;
1800
1801sub audio_sound_push($) {
1802 my ($face) = @_;
1803
1804 if (my $chunk = $AUDIO_CHUNK{$face}) {
1805 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1806 my (undef, $dx, $dy, $vol) = @$_;
1807
1808 my $channel = CFPlus::Channel::find;
1809 $channel->volume (128 + $vol);
1810 $dx = $dx / 10 * 255;
1811 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1812
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816
1817 $chunk->play ($channel);
1818 }
1819 } else {
1820 # sound_meta not set means data is in flight either way
1821 my $meta = $CONN->{sound_meta}{$face}
1822 or return;
1823
1824 # fetch from database
1825 CFPlus::DB::get res_data => $meta->{name}, sub {
1826 my $vol = $meta->{meta}{volume} || 1;
1827 my $rwops = new CFPlus::RW $_[0];
1828 my $chunk = new CFPlus::MixChunk $rwops;
1829 $chunk->volume ($vol * 128);
1830 $AUDIO_CHUNK{$face} = $chunk;
1831
1832 audio_sound_push ($face);
1833 };
1834 }
1835}
1836
1837sub audio_sound_play {
1838 my ($face, $dx, $dy, $vol) = @_;
1839
1840 $SDL_MIXER
1841 or return;
1842
1843 my $queue = $AUDIO_PLAY{$face} ||= [];
1844 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1845 audio_sound_push $face
1846 unless @$queue > 1;
1847}
1848
1955sub audio_music_set { 1849sub audio_music_set_ambient {
1956 my ($songs) = @_; 1850 my ($songs) = @_;
1957 1851
1958 my @want = 1852 my @want =
1959 grep $_, 1853 grep $_,
1960 map $CONN->{music_meta}{$_}, 1854 map $CONN->{music_meta}{$_},
… …
1965 &audio_music_changed (); 1859 &audio_music_changed ();
1966 } 1860 }
1967} 1861}
1968 1862
1969sub audio_music_start { 1863sub audio_music_start {
1970 my $path = $MUSIC_PLAYING->{path} 1864 my $meta = $MUSIC_PLAYING_META;
1971 or return;
1972 1865
1973 CFPlus::DB::prefetch_file $path, 1024_000, sub { 1866 CFPlus::DB::get res_data => $meta->{name}, sub {
1974 return unless $SDL_MIXER; 1867 return unless $SDL_MIXER;
1975 1868
1976 # music might have changed... 1869 # music might have changed...
1977 $path eq $MUSIC_PLAYING->{path} 1870 $meta eq $MUSIC_PLAYING_META
1978 or return &audio_music_start (); 1871 or return &audio_music_start ();
1979 1872
1873 $MUSIC_PLAYING_DATA = \$_[0];
1874
1875 my $rwops = $meta->{path}
1876 ? new_from_file CFPlus::RW $meta->{path}
1877 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1878
1980 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path; 1879 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1880 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1981 1881
1982 my $NOW = time; 1882 my $NOW = time;
1983 1883
1984 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) { 1884 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1985 my $pos = $MUSIC_PLAYING->{stop_pos}; 1885 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1986 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 1886 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1987 $MUSIC_START = time - $pos; 1887 $MUSIC_START = time - $pos;
1988 } else { 1888 } else {
1989 $MUSIC_PLAYER->play (0); 1889 $MUSIC_PLAYER->play (0);
1990 $MUSIC_START = time; 1890 $MUSIC_START = time;
1991 } 1891 }
1992 1892
1993 delete $MUSIC_PLAYING->{stop_time}; 1893 delete $MUSIC_PLAYING_META->{stop_time};
1994 delete $MUSIC_PLAYING->{stop_pos}; 1894 delete $MUSIC_PLAYING_META->{stop_pos};
1995 } 1895 }
1996} 1896}
1997 1897
1998sub audio_music_changed { 1898sub audio_music_changed {
1999 return unless $CFG->{bgm_enable}; 1899 return unless $CFG->{bgm_enable};
… …
2001 1901
2002 # default MUSIC_WANT == MUSIC_DEFAULT 1902 # default MUSIC_WANT == MUSIC_DEFAULT
2003 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT; 1903 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2004 1904
2005 # if the currently playing song is acceptable, let it continue 1905 # if the currently playing song is acceptable, let it continue
2006 return if $MUSIC_PLAYING 1906 return if $MUSIC_PLAYING_META
2007 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT; 1907 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
2008 1908
2009 my $NOW = time; 1909 my $NOW = time;
2010 1910
2011 if ($MUSIC_PLAYING) { 1911 if ($MUSIC_PLAYING_META) {
2012 $MUSIC_PLAYING->{stop_time} = $NOW; 1912 $MUSIC_PLAYING_META->{stop_time} = $NOW;
2013 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START; 1913 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
2014 CFPlus::MixMusic::fade_out 1000; 1914 CFPlus::MixMusic::fade_out 1000;
2015 } else { 1915 } else {
2016 # sort by stop time, oldest first 1916 # sort by stop time, oldest first
2017 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT; 1917 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2018 1918
2019 # if the most recently-played piece played very recently, 1919 # if the most recently-played piece played very recently,
2020 # resume it, else choose the oldest piece for rotation. 1920 # resume it, else choose the oldest piece for rotation.
2021 $MUSIC_PLAYING = 1921 $MUSIC_PLAYING_META =
2022 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME 1922 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2023 ? $MUSIC_WANT[-1] 1923 ? $MUSIC_WANT[-1]
2024 : $MUSIC_WANT[0]; 1924 : $MUSIC_WANT[0];
2025 1925
2026 audio_music_start; 1926 audio_music_start;
2027 } 1927 }
2028} 1928}
2029 1929
2030sub audio_music_finished { 1930sub audio_music_finished {
2031 $MUSIC_PLAYING = undef;
2032 undef $MUSIC_PLAYER; 1931 undef $MUSIC_PLAYER;
1932 undef $MUSIC_PLAYING_META;
1933 undef $MUSIC_PLAYING_DATA;
2033 1934
2034 audio_music_changed; 1935 audio_music_changed;
2035} 1936}
2036 1937
2037sub audio_init { 1938sub audio_init {
2038 if ($CFG->{audio_enable}) { 1939 if ($CFG->{audio_enable}) {
2039 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1940 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2040 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1941 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2041 1942
2042 unless ($SDL_MIXER) { 1943 unless ($SDL_MIXER) {
2043 status "Unable to open sound device: there will be no sound"; 1944 status "Unable to open sound device: there will be no sound";
2044 return; 1945 return;
2045 }
2046
2047 CFPlus::Mix_AllocateChannels 8;
2048 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2049
2050 audio_music_finished;
2051
2052 local $_;
2053 while (<$fh>) {
2054 next if /^\s*#/;
2055 next if /^\s*$/;
2056
2057 my ($file, $volume, $event) = split /\s+/, $_, 3;
2058
2059 push @SOUNDS, "$volume,$file";
2060
2061 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2062 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2063 $chunk->volume ($volume * 128 / 100);
2064 $chunk
2065 };
2066 }
2067 } else {
2068 status "unable to open sound config: $!";
2069 } 1946 }
1947
1948 CFPlus::Mix_AllocateChannels 16;
1949 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1950
1951 audio_music_finished;
2070 } else { 1952 } else {
2071 undef $SDL_MIXER; 1953 undef $SDL_MIXER;
2072 } 1954 }
2073} 1955}
2074 1956
2075sub audio_shutdown { 1957sub audio_shutdown {
2076 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1958 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2077 undef $SDL_MIXER; 1959 undef $SDL_MIXER;
2078 @SOUNDS = (); 1960 @SOUNDS = ();
2079 %AUDIO_CHUNKS = (); 1961 %AUDIO_CHUNK = ();
2080} 1962}
2081 1963
2082my %animate_object; 1964my %animate_object;
2083my $animate_timer; 1965my $animate_timer;
2084 1966
2085my $fps = 9; 1967my $fps = 9;
2086
2087my %demo;#d#
2088 1968
2089sub force_refresh { 1969sub force_refresh {
2090 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2091 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2092 1972
… …
2124 2004
2125sub animation_stop { 2005sub animation_stop {
2126 my ($widget) = @_; 2006 my ($widget) = @_;
2127 delete $animate_object{$widget}; 2007 delete $animate_object{$widget};
2128} 2008}
2129
2130# check once/second for faces that need to be prefetched
2131# this should, of course, only run on demand, but
2132# SDL forces worse things on us....
2133
2134Event->timer (after => 1, interval => 0.25, cb => sub {
2135 $CONN->face_prefetch
2136 if $CONN;
2137});
2138 2009
2139%SDL_CB = ( 2010%SDL_CB = (
2140 CFPlus::SDL_QUIT => sub { 2011 CFPlus::SDL_QUIT => sub {
2141 exit; 2012 exit;
2142 }, 2013 },
… …
2186 2057
2187 CFPlus::UI::set_layout ($::CFG->{layout}); 2058 CFPlus::UI::set_layout ($::CFG->{layout});
2188 2059
2189 my %DEF_CFG = ( 2060 my %DEF_CFG = (
2190 sdl_mode => 0, 2061 sdl_mode => 0,
2191 width => 640,
2192 height => 480,
2193 fullscreen => 0, 2062 fullscreen => 0,
2194 fast => 0, 2063 fast => 0,
2195 map_scale => 1, 2064 map_scale => 1,
2196 fow_enable => 1, 2065 fow_enable => 1,
2197 fow_intensity => 0, 2066 fow_intensity => 0,
… …
2200 log_fontsize => 0.7, 2069 log_fontsize => 0.7,
2201 gauge_fontsize => 1, 2070 gauge_fontsize => 1,
2202 gauge_size => 0.35, 2071 gauge_size => 0.35,
2203 stat_fontsize => 0.7, 2072 stat_fontsize => 0.7,
2204 mapsize => 100, 2073 mapsize => 100,
2205 say_command => 'chat',
2206 audio_enable => 1, 2074 audio_enable => 1,
2207 bgm_enable => 1, 2075 bgm_enable => 1,
2208 bgm_volume => 0.25, 2076 bgm_volume => 0.25,
2209 face_prefetch => 0,
2210 output_sync => 1, 2077 output_sync => 1,
2211 output_count => 1, 2078 output_count => 1,
2212 output_rate => "", 2079 output_rate => "",
2213 pickup => 0, 2080 pickup => 0,
2214 inv_sort => "mtime", 2081 inv_sort => "mtime",

Diff Legend

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