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.183 by root, Sun Jul 22 17:17:17 2007 UTC vs.
Revision 1.189 by root, Sun Jul 29 18:22:34 2007 UTC

… …
177our $INV; 177our $INV;
178our $INVR; 178our $INVR;
179our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
180 180
181our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
185 182
186sub status { 183sub status {
187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 184 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188} 185}
189 186
… …
1124 . "but you also increase bandwidth requirements and latency. " 1121 . "but you also increase bandwidth requirements and latency. "
1125 . "This option is only used once at log-in.", 1122 . "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 }, 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1127 ); 1124 );
1128 1125
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"); 1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1143 $table->add_at (1, 9, new CFPlus::UI::Entry 1127 $table->add_at (1, 8, new CFPlus::UI::Entry
1144 text => $CFG->{output_rate}, 1128 text => $CFG->{output_rate},
1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1129 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 " 1130 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1147 . "default will be used, which is usually around 100kb/s.", 1131 . "default will be used, which is usually around 100kb/s.",
1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1132 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1149 ); 1133 );
1150 1134
1151 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1135 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1152 $table->add_at (1, 10, new CFPlus::UI::Entry 1136 $table->add_at (1, 9, new CFPlus::UI::Entry
1153 text => $CFG->{output_count}, 1137 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.", 1138 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 }, 1139 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1156 ); 1140 );
1157 1141
1158 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1142 $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 1143 $table->add_at (1, 10, new CFPlus::UI::Entry
1160 text => $CFG->{output_sync}, 1144 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.", 1145 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 }, 1146 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1163 ); 1147 );
1164 1148
1165 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1149 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1166 expand => 1, 1150 expand => 1,
1167 align => 0, 1151 align => 0,
1168 text => "Login", 1152 text => "Login",
1169 on_activate => sub { 1153 on_activate => sub {
1170 $CONN ? stop_game 1154 $CONN ? stop_game
… …
1183 1167
1184sub client_setup { 1168sub client_setup {
1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1169 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1186 1170
1187 my $row = 0; 1171 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 1172
1202 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1173 $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 1174 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1204 state => $CFG->{show_tips}, 1175 state => $CFG->{show_tips},
1205 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1176 tooltip => "Show the <b>Tip of the day</b> window at startup?",
… …
1417 1388
1418 my $ntb = 1389 my $ntb =
1419 $PL_NOTEBOOK = 1390 $PL_NOTEBOOK =
1420 new CFPlus::UI::Notebook expand => 1; 1391 new CFPlus::UI::Notebook expand => 1;
1421 1392
1422 $ntb->add ( 1393 $ntb->add_tab (
1423 "Statistics (F2)" => $STATS_PAGE = stats_window, 1394 "Statistics (F2)" => $STATS_PAGE = stats_window,
1424 "Shows statistics, where all your Stats and Resistances are shown." 1395 "Shows statistics, where all your Stats and Resistances are shown."
1425 ); 1396 );
1426 $ntb->add ( 1397 $ntb->add_tab (
1427 "Skills (F3)" => $SKILL_PAGE = skill_window, 1398 "Skills (F3)" => $SKILL_PAGE = skill_window,
1428 "Shows all your Skills." 1399 "Shows all your Skills."
1429 ); 1400 );
1430 1401
1431 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1402 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1432 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1403 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1433 $ntb->add ( 1404 $ntb->add_tab (
1434 "Spellbook (F4)" => $spellsw, 1405 "Spellbook (F4)" => $spellsw,
1435 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1406 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1436 ); 1407 );
1437 $ntb->add ( 1408 $ntb->add_tab (
1438 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1409 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1439 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1410 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1440 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1411 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1441 ); 1412 );
1442 $ntb->add (Pickup => autopickup_setup, 1413 $ntb->add_tab (Pickup => autopickup_setup,
1443 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1414 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1444 1415
1445 $ntb->set_current_page ($INVENTORY_PAGE); 1416 $ntb->set_current_page ($INVENTORY_PAGE);
1446 1417
1447 $plwin->add ($ntb); 1418 $plwin->add ($ntb);
… …
1753 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 1724 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1754 1725
1755 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1726 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1756 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1727 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1757 1728
1758 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1729 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1759 "Configure the server to play on, your username, password and other server-related options."); 1730 "Configure the server to play on, your username, password and other server-related options.");
1760 $SETUP_NOTEBOOK->add (Client => client_setup, 1731 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1761 "Configure various client-specific settings."); 1732 "Configure various client-specific settings.");
1762 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1733 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1763 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1734 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1764 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1735 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1765 "Configure the use of audio, sound effects and background music."); 1736 "Configure the use of audio, sound effects and background music.");
1766 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1737 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1767 "Lets you define, edit and delete key bindings." 1738 "Lets you define, edit and delete key bindings."
1768 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1739 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1769 . "with nothing set and the recording started. After doing the actions you " 1740 . "with nothing set and the recording started. After doing the actions you "
1770 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1741 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1771 . "After pressing the combo the binding will be saved automatically and the " 1742 . "After pressing the combo the binding will be saved automatically and the "
1772 . "binding editor closes"); 1743 . "binding editor closes");
1773 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1744 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1774 "Some debuggin' options. Do not ask."); 1745 "Some debuggin' options. Do not ask.");
1775 1746
1776 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1747 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1777 1748
1778 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1749 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
… …
1819 } 1790 }
1820 1791
1821 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1792 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1822} 1793}
1823 1794
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 { 1795sub video_shutdown {
1944 CFPlus::OpenGL::shutdown; 1796 CFPlus::OpenGL::shutdown;
1945 1797
1946 undef $SDL_ACTIVE; 1798 undef $SDL_ACTIVE;
1947} 1799}
… …
1975 1827
1976 # music might have changed... 1828 # music might have changed...
1977 $path eq $MUSIC_PLAYING->{path} 1829 $path eq $MUSIC_PLAYING->{path}
1978 or return &audio_music_start (); 1830 or return &audio_music_start ();
1979 1831
1832 my $rwops = new_from_file CFPlus::RW $path;
1980 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path; 1833 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops;
1981 1834
1982 my $NOW = time; 1835 my $NOW = time;
1983 1836
1984 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) { 1837 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1985 my $pos = $MUSIC_PLAYING->{stop_pos}; 1838 my $pos = $MUSIC_PLAYING->{stop_pos};
… …
2035} 1888}
2036 1889
2037sub audio_init { 1890sub audio_init {
2038 if ($CFG->{audio_enable}) { 1891 if ($CFG->{audio_enable}) {
2039 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1892 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1893 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2040 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1894 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2041 1895
2042 unless ($SDL_MIXER) { 1896 unless ($SDL_MIXER) {
2043 status "Unable to open sound device: there will be no sound"; 1897 status "Unable to open sound device: there will be no sound";
2044 return; 1898 return;
… …
2057 my ($file, $volume, $event) = split /\s+/, $_, 3; 1911 my ($file, $volume, $event) = split /\s+/, $_, 3;
2058 1912
2059 push @SOUNDS, "$volume,$file"; 1913 push @SOUNDS, "$volume,$file";
2060 1914
2061 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1915 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2062 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file"; 1916 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1917 my $chunk = new CFPlus::MixChunk $rwops;
2063 $chunk->volume ($volume * 128 / 100); 1918 $chunk->volume ($volume * 128 / 100);
2064 $chunk 1919 $chunk
2065 }; 1920 };
2066 } 1921 }
2067 } else { 1922 } else {
… …
2124 1979
2125sub animation_stop { 1980sub animation_stop {
2126 my ($widget) = @_; 1981 my ($widget) = @_;
2127 delete $animate_object{$widget}; 1982 delete $animate_object{$widget};
2128} 1983}
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 1984
2139%SDL_CB = ( 1985%SDL_CB = (
2140 CFPlus::SDL_QUIT => sub { 1986 CFPlus::SDL_QUIT => sub {
2141 exit; 1987 exit;
2142 }, 1988 },
… …
2200 log_fontsize => 0.7, 2046 log_fontsize => 0.7,
2201 gauge_fontsize => 1, 2047 gauge_fontsize => 1,
2202 gauge_size => 0.35, 2048 gauge_size => 0.35,
2203 stat_fontsize => 0.7, 2049 stat_fontsize => 0.7,
2204 mapsize => 100, 2050 mapsize => 100,
2205 say_command => 'chat',
2206 audio_enable => 1, 2051 audio_enable => 1,
2207 bgm_enable => 1, 2052 bgm_enable => 1,
2208 bgm_volume => 0.25, 2053 bgm_volume => 0.25,
2209 face_prefetch => 0,
2210 output_sync => 1, 2054 output_sync => 1,
2211 output_count => 1, 2055 output_count => 1,
2212 output_rate => "", 2056 output_rate => "",
2213 pickup => 0, 2057 pickup => 0,
2214 inv_sort => "mtime", 2058 inv_sort => "mtime",

Diff Legend

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