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.124 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

… …
21 } 21 }
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26
27use Carp 'verbose';
26 28
27# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
28BEGIN { 30BEGIN {
29 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
30 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
… …
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 68$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 69$SIG{PIPE} = 'IGNORE';
68 70
69$Event::Eval = 0; 71$Event::Eval = 0;
70$Event::DIED = sub { 72$Event::DIED = sub {
71 # TODO: display dialog box or so 73 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 74};
76 75
77my $MAX_FPS = 60; 76my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
79 78
80our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
81 80
82our $LAST_REFRESH; 81our $LAST_REFRESH;
83our $NOW; 82our $NOW;
84 83
85our $CFG; 84our $CFG;
… …
123 122
124our $INVENTORY_PAGE; 123our $INVENTORY_PAGE;
125our $STATS_PAGE; 124our $STATS_PAGE;
126our $SKILL_PAGE; 125our $SKILL_PAGE;
127our $SPELL_PAGE; 126our $SPELL_PAGE;
127our $SPELL_LIST;
128 128
129our $HELP_WINDOW; 129our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 130our $MESSAGE_WINDOW;
131our $FLOORBOX; 131our $FLOORBOX;
132our $GAUGES; 132our $GAUGES;
… …
149 149
150our $BIND_EDITOR; 150our $BIND_EDITOR;
151our $BIND_UPD_CB; 151our $BIND_UPD_CB;
152 152
153our $PICKUP_CFG; 153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
154 157
155sub status { 158sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 160}
158 161
… …
429sub stop_game { 432sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 433 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 435 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 436 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 437 $SPELL_LIST->clear_spells;
435 438
436 return unless $CONN; 439 return unless $CONN;
437 440
438 status "connection closed"; 441 status "connection closed";
439 442
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 670 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 671 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 672 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 673 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
671 675
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 677
674 for my $x (0..2) { 678 for my $x (0..2) {
675 for my $y (0 .. 2) { 679 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 684 );
681 } 685 }
682 } 686 }
683 687
688 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 689
685 $table 690 $table
686} 691}
687 692
688sub stats_window { 693sub stats_window {
… …
857 862
858 my $table = $METASERVER->{table}; 863 my $table = $METASERVER->{table};
859 $table->clear; 864 $table->clear;
860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 865 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
861 866
862 my $buf; 867 my $ok = 0;
863 868
864 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 869 CFPlus::background {
870 my $ua = CFPlus::lwp_useragent;
865 871
866 unless ($fh) { 872 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
867 $label->set_text ("unable to contact metaserver: $!"); 873 } sub {
868 return; 874 my ($msg) = @_;
869 } 875 if ($msg) {
870
871 Event->io (fd => $fh, poll => 'r', cb => sub {
872 my $res = sysread $fh, $buf, 8192, length $buf;
873
874 if (!defined $res) {
875 $_[0]->w->cancel;
876 $label->set_text ("error while retrieving server list: $!");
877 } elsif ($res == 0) {
878 $_[0]->w->cancel;
879 status "server list retrieved";
880
881 utf8::decode $buf if utf8::valid $buf;
882
883 $table->clear; 876 $table->clear;
884 877
885 my @tip = ( 878 my @tip = (
886 "The current number of users logged in on the server.", 879 "The current number of users logged in on the server.",
887 "The hostname of the server.", 880 "The hostname of the server.",
… …
897 for 0 .. $#col; 890 for 0 .. $#col;
898 891
899 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
900 893
901 my $y = 0; 894 my $y = 0;
902 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} }
901 ) {
903 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
904 904
905 for ($desc) { 905 for ($desc) {
906 s/<br>/\n/gi; 906 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 907 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 908 s/<.*?>//sgi;
909 s/&/&amp;/g; 909 s/&amp;/&/g;
910 s/</&lt;/g; 910 s/&lt;/</g;
911 s/>/&gt;/g; 911 s/&gt;/>/g;
912 } 912 }
913 913
914 $uptime = sprintf "%dd %02d:%02d:%02d", 914 $uptime = sprintf "%dd %02d:%02d:%02d",
915 (int $m->[8] / 86400), 915 (int $uptime / 86400),
916 (int $m->[8] / 3600) % 24, 916 (int $uptime / 3600) % 24,
917 (int $m->[8] / 60) % 60, 917 (int $uptime / 60) % 60,
918 $m->[8] % 60; 918 $uptime % 60;
919 919
920 $m = [$users, $host, $uptime, $version, $desc]; 920 $m = [$users, $host, $uptime, $version, $desc];
921 921
922 $y++; 922 $y++;
923 923
… …
933 ), 933 ),
934 (new CFPlus::UI::Empty expand => 1), 934 (new CFPlus::UI::Empty expand => 1),
935 ]); 935 ]);
936 936
937 $table->add ($_, $y, new CFPlus::UI::Label 937 $table->add ($_, $y, new CFPlus::UI::Label
938 max_w => $::WIDTH * 0.4,
938 ellipsise => 0, 939 ellipsise => 0,
939 align => $align[$_], 940 align => $align[$_],
940 text => $m->[$_], 941 text => $m->[$_],
941 tooltip => $tip[$_], 942 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
942 can_hover => 1, 944 can_hover => 1,
943 can_events => 1, 945 can_events => 1,
944 fontsize => 0.8) 946 fontsize => 0.8)
945 for 0 .. $#$m; 947 for 0 .. $#$m;
946 } 948 }
949 } else {
950 $ok or $label->set_text ("error while contacting metaserver");
947 } 951 }
948 }); 952 };
953
949} 954}
950 955
951sub metaserver_dialog { 956sub metaserver_dialog {
952 my $vbox = new CFPlus::UI::VBox; 957 my $vbox = new CFPlus::UI::VBox;
953 my $table = new CFPlus::UI::Table; 958 my $table = new CFPlus::UI::Table;
… …
957 title => "Server List", 962 title => "Server List",
958 name => 'metaserver_dialog', 963 name => 'metaserver_dialog',
959 x => 'center', 964 x => 'center',
960 y => 'center', 965 y => 'center',
961 z => 3, 966 z => 3,
967 force_w => $::WIDTH * 0.9,
962 force_h => $::HEIGHT * 0.4, 968 force_h => $::HEIGHT * 0.7,
963 child => $vbox, 969 child => $vbox,
964 has_close_button => 1, 970 has_close_button => 1,
965 table => $table, 971 table => $table,
966 on_visibility_change => sub { 972 on_visibility_change => sub {
967 update_metaserver ($_[0]) if $_[1]; 973 update_metaserver ($_[0]) if $_[1];
… …
1188 ["Boots" => PICKUP_BOOTS], 1194 ["Boots" => PICKUP_BOOTS],
1189 ["Gloves" => PICKUP_GLOVES], 1195 ["Gloves" => PICKUP_GLOVES],
1190 ["Cloaks" => PICKUP_CLOAK], 1196 ["Cloaks" => PICKUP_CLOAK],
1191 ], 1197 ],
1192 1198
1193 ["Readables", 2, 2, 1199 ["Readables", 2, 0,
1194 ["Spellbooks" => PICKUP_SPELLBOOK], 1200 ["Spellbooks" => PICKUP_SPELLBOOK],
1195 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1201 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1196 ["Normal Books/Scrolls" => PICKUP_READABLES], 1202 ["Normal Books/Scrolls" => PICKUP_READABLES],
1197 ], 1203 ],
1198 ["Misc", 2, 7, 1204 ["Misc", 2, 5,
1199 ["Food" => PICKUP_FOOD], 1205 ["Food" => PICKUP_FOOD],
1200 ["Drinks" => PICKUP_DRINK], 1206 ["Drinks" => PICKUP_DRINK],
1201 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1207 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1202 ["Keys" => PICKUP_KEY], 1208 ["Keys" => PICKUP_KEY],
1203 ["Magical Items" => PICKUP_MAGICAL], 1209 ["Magical Items" => PICKUP_MAGICAL],
1204 ["Potions" => PICKUP_POTION], 1210 ["Potions" => PICKUP_POTION],
1205 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1211 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1206 ["Ignore cursed" => PICKUP_NOT_CURSED], 1212 ["Ignore cursed" => PICKUP_NOT_CURSED],
1207 ["Jewelery" => PICKUP_JEWELS], 1213 ["Jewelery" => PICKUP_JEWELS],
1214 ["Flesh" => PICKUP_FLESH],
1208 ], 1215 ],
1209 ["Weight/Value ratio", 2, 17] 1216 ["Weight/Value ratio", 2, 17]
1210 ) 1217 )
1211 { 1218 {
1212 my ($title, $x, $y, @bits) = @$_; 1219 my ($title, $x, $y, @bits) = @$_;
… …
1262 $table 1269 $table
1263} 1270}
1264 1271
1265my %SORT_ORDER = ( 1272my %SORT_ORDER = (
1266 type => undef, 1273 type => undef,
1267 mtime => sub { sort { 1274 mtime => sub {
1275 my $NOW = time;
1276 sort {
1277 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1278 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1279
1268 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1280 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1269 or $b->{mtime} <=> $a->{mtime} 1281 or $btime <=> $atime
1270 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1283 } @_
1271 } @_ }, 1284 },
1272 weight => sub { sort { 1285 weight => sub { sort {
1273 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1286 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1274 or $a->{type} <=> $b->{type} 1287 or $a->{type} <=> $b->{type}
1275 } @_ }, 1288 } @_ },
1276); 1289);
… …
1301 #TODO# update to weigh/maxweight 1314 #TODO# update to weigh/maxweight
1302 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1315 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1303 1316
1304 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1317 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1305 $sw1->add ($INV = new CFPlus::UI::Inventory); 1318 $sw1->add ($INV = new CFPlus::UI::Inventory);
1319 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1306 1320
1307 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1321 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1308 1322
1309 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1323 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1310 1324
… …
1350 $ntb->add ( 1364 $ntb->add (
1351 "Skills (F3)" => $SKILL_PAGE = skill_window, 1365 "Skills (F3)" => $SKILL_PAGE = skill_window,
1352 "Shows all your Skills." 1366 "Shows all your Skills."
1353 ); 1367 );
1354 1368
1355 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1369 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1356 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1370 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1357 $ntb->add ( 1371 $ntb->add (
1358 "Spellbook (F4)" => $spellsw, 1372 "Spellbook (F4)" => $spellsw,
1359 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1373 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1360 ); 1374 );
1361 $ntb->add ( 1375 $ntb->add (
… …
1852 ); 1866 );
1853 1867
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1868 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1855 tooltip => "View Documentation"); 1869 tooltip => "View Documentation");
1856 1870
1871
1857 $BUTTONBAR->add (new CFPlus::UI::Button 1872 $BUTTONBAR->add (new CFPlus::UI::Button
1858 text => "Quit", 1873 text => "Quit",
1859 tooltip => "Terminates the program", 1874 tooltip => "Terminates the program",
1860 on_activate => sub { 1875 on_activate => sub {
1861 if ($CONN) { 1876 if ($CONN) {
… …
1872 } 1887 }
1873 1888
1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1889 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1875} 1890}
1876 1891
1892sub setup_build_button {
1893 my ($enabled) = @_;
1894 if ($enabled) {
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build",
1897 tooltip => "Opens the ingame builder",
1898 on_activate => sub {
1899 if ($CONN) {
1900 $CONN->send_ext_req (builder_player_items => sub {
1901 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1902 });
1903 }
1904 0
1905 };
1906 $BUTTONBAR->add ($BUILD_BUTTON);
1907 } else {
1908 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1909 }
1910}
1911
1912sub open_ingame_editor {
1913 my ($msg) = @_;
1914
1915 my $win = new CFPlus::UI::Toplevel
1916 x => 0,
1917 y => 'center',
1918 z => 4,
1919 name => 'builder_window',
1920 force_w => int $WIDTH * 1/4,
1921 force_h => int $HEIGHT * 3/4,
1922 title => "In game builder",
1923 has_close_button => 1;
1924
1925 my $r = new CFPlus::UI::ScrolledWindow (
1926 expand => 1,
1927 scroll_y => 1
1928 );
1929 $r->add (my $vb = new CFPlus::UI::VBox);
1930 $win->add ($r);
1931
1932
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "Disable build mode",
1936 on_activate => sub { $::IN_BUILD_MODE = undef }
1937 );
1938 $vb->add (
1939 new CFPlus::UI::Button
1940 text => "ERASE",
1941 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1942 );
1943
1944 for my $itemarchname (
1945 sort {
1946 $msg->{items}->{$a}->{build_arch_name}
1947 cmp $msg->{items}->{$b}->{build_arch_name}
1948 } keys %{$msg->{items}}
1949 ) {
1950 my $info = $msg->{items}->{$itemarchname};
1951 $vb->add (
1952 new CFPlus::UI::Button text => $info->{build_arch_name},
1953 on_activate => sub {
1954 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1955
1956 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1957 build_mode_query_arch_info ();
1958 }
1959 }
1960 );
1961 }
1962
1963 $win->show;
1964}
1965
1966sub build_mode_query_arch_info {
1967 my ($iteminfo) = $::IN_BUILD_MODE;
1968 my $itemarchname = $iteminfo->{item};
1969 my $info = $iteminfo->{info};
1970
1971 my $dialog = new CFPlus::UI::Toplevel
1972 x => "center",
1973 y => "center",
1974 z => 50,
1975 force_w => int $WIDTH * 1/2,
1976 title => "Enter information for placement of '$itemarchname'",
1977 has_close_button => 1;
1978
1979 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1980
1981 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1982 my $row = 0;
1983 if ($info->{has_name}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1986 }
1987 if ($info->{has_text}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1989 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1990 }
1991 if ($info->{has_connection}) {
1992 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1993 $table->add (1, $row++,
1994 new CFPlus::UI::Entry
1995 expand => 1,
1996 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1997 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1998 );
1999 }
2000
2001 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2002 $hb->add (new CFPlus::UI::Button
2003 text => "Close",
2004 expand => 1,
2005 on_activate => sub { $dialog->hide; 0 },
2006 );
2007 $dialog->show;
2008}
2009
1877sub video_shutdown { 2010sub video_shutdown {
1878 CFPlus::OpenGL::shutdown; 2011 CFPlus::OpenGL::shutdown;
1879 2012
1880 undef $SDL_ACTIVE; 2013 undef $SDL_ACTIVE;
1881} 2014}
… …
1912 CFPlus::Mix_AllocateChannels 8; 2045 CFPlus::Mix_AllocateChannels 8;
1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2046 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1914 2047
1915 audio_music_finished; 2048 audio_music_finished;
1916 2049
2050 local $_;
1917 while (<$fh>) { 2051 while (<$fh>) {
1918 next if /^\s*#/; 2052 next if /^\s*#/;
1919 next if /^\s*$/; 2053 next if /^\s*$/;
1920 2054
1921 my ($file, $volume, $event) = split /\s+/, $_, 3; 2055 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2055 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
2056 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
2057 gauge_size => 0.35, 2191 gauge_size => 0.35,
2058 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
2059 mapsize => 100, 2193 mapsize => 100,
2060 say_command => 'say', 2194 say_command => 'chat',
2061 audio_enable => 1, 2195 audio_enable => 1,
2062 bgm_enable => 1, 2196 bgm_enable => 1,
2063 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
2064 face_prefetch => 0, 2198 face_prefetch => 0,
2065 output_sync => 1, 2199 output_sync => 1,

Diff Legend

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