ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.18 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.39 by root, Mon May 5 16:58:35 2008 UTC

78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use Compress::LZF; 102use Compress::LZF;
103 103
104use DC; 104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 105use DC::OpenGL ();
106use DC::Protocol; 106use DC::Protocol;
107use DC::DB; 107use DC::DB;
108use DC::UI; 108use DC::UI;
109use DC::UI::Canvas; 109use DC::UI::Canvas;
110use DC::UI::Inventory; 110use DC::UI::Inventory;
111use DC::UI::SpellList; 111use DC::UI::SpellList;
112use DC::UI::Dockable; 112use DC::UI::Dockable;
113use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 114use DC::UI::MessageWindow;
114use DC::UI::ChatView; 115use DC::UI::ChatView;
116use DC::MessageDistributor;
115use DC::Pod; 117use DC::Pod;
116use DC::MapWidget; 118use DC::MapWidget;
117use DC::Macro; 119use DC::Macro;
118 120
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 121$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$EV::DIED = sub { 124$EV::DIED = sub {
123 DC::fatal Carp::longmess $@; 125 DC::fatal Carp::longmess $@;
124}; 126};
125 127
126my $MAX_FPS = 60; 128my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet
128 129
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 130our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 131
131our $LAST_REFRESH; 132our $LAST_REFRESH;
132our $NOW; 133our $NOW;
179our $SPELL_PAGE; 180our $SPELL_PAGE;
180our $SPELL_LIST; 181our $SPELL_LIST;
181 182
182our $HELP_WINDOW; 183our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 184our $MESSAGE_WINDOW;
185our $MESSAGE_DIST;
184our $FLOORBOX; 186our $FLOORBOX;
185our $GAUGES; 187our $GAUGES;
186our $STATWIDS; 188our $STATWIDS;
187 189
188our $SDL_ACTIVE; 190our $SDL_ACTIVE;
189our %SDL_CB; 191our %SDL_CB;
190 192
191our $ALT_ENTER_MESSAGE; 193our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 194our $STATUSBOX;
195our $MODBOX;
193our $DEBUG_STATUS; 196our $DEBUG_STATUS;
194 197
195our $INV; 198our $INV;
196our $INVR; 199our $INVR;
197our $INVR_HB; 200our $INVR_HB;
205sub debug { 208sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 209 $DEBUG_STATUS->set_text ($_[0]);
207} 210}
208 211
209sub message { 212sub message {
210 $MESSAGE_WINDOW->message (@_); 213 $MESSAGE_DIST->message (@_);
214}
215
216sub update_modbox {
217 my $mod = DC::SDL_GetModState;
218
219 my $markup;
220
221 $markup .= $mod & DC::KMOD_CTRL
222 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
223 : "[<span foreground='#888'> once </span>]";
224
225 $markup .= $mod & DC::KMOD_SHIFT
226 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
227 : "[<span foreground='#888'>move</span>]";
228
229 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
230 ? "[ALT]"
231 : "[<span foreground='#888'>alt</span>]";
232
233 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]";
236
237 # <tt> around next statement works around some bug that keeps the
238 # "font =>" from being used on windows
239 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 240}
212 241
213############################################################################# 242#############################################################################
214#TODO: maybe move into own audio module... 243#TODO: maybe move into own audio module...
215 244
635 # right: accept 664 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 665 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 666 text => "Accept",
638 on_activate => sub { 667 on_activate => sub {
639 $conn->send ("reply n"); 668 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 669 destroy_query_dialog $conn;
642 0 670 0
643 }, 671 },
644 ); 672 );
645 673
654 [Cha => CS_STAT_CHA], 682 [Cha => CS_STAT_CHA],
655 ) { 683 ) {
656 my ($name, $id) = @$_; 684 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 685 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 686 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 687 expand => 1,
661 can_events => 1, 688 can_events => 1,
662 can_hover => 1, 689 can_hover => 1,
663 tooltip => "#stat_$name", 690 tooltip => "#stat_$name",
664 ); 691 );
719 user => $PROFILE->{user}, 746 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 747 pass => $PROFILE->{password},
721 mapw => $mapsize, 748 mapw => $mapsize,
722 maph => $mapsize, 749 maph => $mapsize,
723 750
724 client => "cfplus $DC::VERSION $] $^O", 751 client => "$DC::VERSION $] $^O",
725 752
726 map_widget => $MAPWIDGET, 753 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 754 statusbox => $STATUSBOX,
728 map => $MAP, 755 map => $MAP,
729 mapmap => $MAPMAP, 756 mapmap => $MAPMAP,
737 if ($CONN) { 764 if ($CONN) {
738 DC::lowdelay fileno $CONN->{fh}; 765 DC::lowdelay fileno $CONN->{fh};
739 766
740 status "login successful"; 767 status "login successful";
741 } else { 768 } else {
769 warn $@;
742 status "unable to connect"; 770 status "unable to connect";
743 stop_game(); 771 stop_game();
744 } 772 }
745} 773}
746 774
770 798
771 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 800
773 my $row = 0; 801 my $row = 0;
774 802
775 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
776 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
777 can_events => 1, 805 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 807
780 my $vidmode_tooltip = 808 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
782 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 811
784 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
785 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 814
787 $hbox->add (my $mode_slider = new DC::UI::Slider 815 $hbox->add (my $mode_slider = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
789 tooltip => $vidmode_tooltip); 817 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 818 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 819 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 820 can_events => 1, tooltip => $vidmode_tooltip);
793 821
794 $mode_slider->connect (changed => sub { 822 $mode_slider->connect (changed => sub {
795 my ($self, $value) = @_; 823 my ($self, $value) = @_;
796 824
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 827 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 828 $mode_slider->emit (changed => $mode_slider->{range}[0]);
801 829
802 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 832 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 833 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 835 );
808 836
809 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
810 $table->add_at (1, $row++, new DC::UI::CheckBox 838 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 839 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
813 . "higher memory usage and slower performance. It will, however, help tremendously on " 841 . "higher memory usage and slower performance. It will, however, help tremendously on "
814 . "cards that claim to support a feature but fall back to software rendering. " 842 . "cards that claim to support a feature but fall back to software rendering. "
815 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
816 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
817 . "experience extremely low framerates and your card should do better, try this option.</b>", 845 . "experience extremely low framerates and your card should do better, try this option.</b>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 847 );
820 848
821 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 850 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 851 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
825 . "will save a lot of memory and increase performance. The compression algorithm " 853 . "will save a lot of memory and increase performance. The compression algorithm "
826 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 854 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 855 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 857 );
830 858
831 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 860 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 861 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 862 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 864 );
837 865
838 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new DC::UI::Slider 867 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
841 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 869 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
842 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 871 );
844 872
845 $table->add_at (1, $row++, new DC::UI::Button 873 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 874 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 875 tooltip => "Apply the video settings above.",
848 on_activate => sub { 876 on_activate => sub {
849 video_shutdown (); 877 video_shutdown ();
850 video_init (); 878 video_init ();
851 0 879 0
852 } 880 }
853 ); 881 );
854 882
855 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new DC::UI::Slider 884 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 888 );
861 889
862 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 891 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 892 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 893 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
866 . "This increases load on the graphics subsystem and works only with TRT servers. " 894 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 895 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 897 );
870 898
871 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
872 $table->add_at (1, $row++, new DC::UI::CheckBox 900 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 901 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 902 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 904 );
877 905
878 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new DC::UI::Slider 907 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
881 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
882 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 911 );
884 912
885 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new DC::UI::Slider 914 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
888 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
889 . "but you still need to press apply to correctly re-layout the widget.", 917 . "but you still need to press apply to correctly re-layout the widget.",
890 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 919 );
892 920
893 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new DC::UI::Slider 922 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
896 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 925 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 926 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 927 &set_gauge_window_fontsize;
900 0 928 0
901 } 929 }
902 ); 930 );
903 931
904 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new DC::UI::Slider 933 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 934 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 936 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 937 $CFG->{gauge_size} = $_[1];
943 971
944 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 972 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 973
946 my $row = 0; 974 my $row = 0;
947 975
948 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 978 state => $CFG->{audio_enable},
951 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 979 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 980 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 981 );
954 982
955 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new DC::UI::CheckBox 984 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 985 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 986 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 987 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 988 $CFG->{effects_enable} = $_[1];
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 995 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
968 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 996 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 997 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 998 );
971 999
972 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1001 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1002 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1003 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1004 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1005 $CFG->{bgm_enable} = $_[1];
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1012 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1013 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1014 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1015 );
988 1016
989 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new DC::UI::Selector 1018 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1019 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1020 value => $CFG->{audio_hw_frequency},
993 options => [ 1021 options => [
994 [ 0, "default" , "Use System Default"], 1022 [ 0, "default" , "Use System Default"],
1003 audio_tab_update; 1031 audio_tab_update;
1004 1 1032 1
1005 } 1033 }
1006 ); 1034 );
1007 1035
1008 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1037 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1038 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1039 value => $CFG->{audio_hw_channels},
1012 options => [ 1040 options => [
1013 [0, "default" , "Use System Default"], 1041 [0, "default" , "Use System Default"],
1022 audio_tab_update; 1050 audio_tab_update;
1023 1 1051 1
1024 } 1052 }
1025 ); 1053 );
1026 1054
1027 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1028 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1056 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1057 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1058 value => $CFG->{audio_hw_chunksize},
1031 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1059 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1032 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1060 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1036 1 1064 1
1037 } 1065 }
1038 ); 1066 );
1039 1067
1040 # should really be a slider 1068 # should really be a slider
1041 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1070 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1071 c_colspan => 2, expand => 1,
1044 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1072 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1045 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1073 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1074 template => ">= 99",
1052 1; 1080 1;
1053 } 1081 }
1054 ); 1082 );
1055 1083
1056 $table->add_at (1, $row++, new DC::UI::Button 1084 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1085 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1086 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1087 on_activate => sub {
1060 audio_shutdown (); 1088 audio_shutdown ();
1061 audio_init (); 1089 audio_init ();
1062 0 1090 0
1112 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1140 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1113 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1141 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1114 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1142 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1115 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1143 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116 1144
1117 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1145 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1118 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1146 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1147 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1148 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1149
1122 $GAUGES = { 1150 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1151 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1152 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1153 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1141 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1169 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1142 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1170 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1143 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1171 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1144 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1172 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1173
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1174 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1175
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1176 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1149 $t->add_at (0,0, new DC::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2); 1177 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1150 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1); 1178 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1151 $t->add_at (1,2, new DC::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2); 1179 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1152 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1180 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1153 $t->add_at (1,1, new DC::UI::Label text => "e"); 1181 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1182
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1183 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1184
1157 $c->add_items ({ 1185 $c->add_items ({
1191 $vb->add (new DC::UI::FancyFrame 1219 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1220 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1221 child => (my $pi = new DC::UI::VBox),
1194 ); 1222 );
1195 1223
1196 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1224 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1225 can_hover => 1, can_events => 1,
1198 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1226 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1199 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1227 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1228 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1229 tooltip => "The map you are currently on (if supported by the server).");
1202 1230
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1231 $pi->add (my $hb0 = new DC::UI::HBox);
1204 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1232 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1233 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1234 tooltip => "The weight of the player including all inventory items.");
1207 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1235 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1236 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1237 tooltip => "The weight limit: you cannot carry more than this.");
1210 1238
1211 $vb->add (new DC::UI::FancyFrame 1239 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1240 label => "Primary/Secondary Statistics",
1233 [2, 5, st_wspd => "WSp", 10.54], 1261 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1262 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1263 my ($col, $row, $id, $label, $template) = @$_;
1236 1264
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1265 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1266 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1267 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1268 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1241 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1269 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1270 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1271 }
1244 1272
1245 $vb->add (new DC::UI::FancyFrame 1273 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1274 label => "Resistancies",
1247 child => (my $tbl2 = new DC::UI::Table expand => 1), 1275 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1276 );
1249 1277
1250 my $row = 0; 1278 my $row = 0;
1251 my $col = 0; 1279 my $col = 0;
1252 1280
1291 1319
1292 for (qw/slow holyw conf fire depl magic 1320 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1321 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1322 blind fear tund elec cold ghit/)
1295 { 1323 {
1296 $tbl2->add_at ($col, $row, 1324 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1325 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1326 new DC::UI::Label
1299 font => $FONT_FIXED, 1327 font => $FONT_FIXED,
1300 template => "-100%", 1328 template => "-100%",
1301 align => +1, 1329 align => 1,
1302 valign => 0,
1303 can_events => 1, 1330 can_events => 1,
1304 can_hover => 1, 1331 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1332 tooltip => $resist_names{$_}->[1],
1306 ); 1333 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1334 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1309 can_hover => 1, 1336 can_hover => 1,
1310 can_events => 1, 1337 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1338 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1339 tooltip => $resist_names{$_}->[1],
1313 ); 1340 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1341 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1342 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1343 font => $FONT_FIXED,
1344 align => 1,
1317 can_hover => 1, 1345 can_hover => 1,
1318 can_events => 1, 1346 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1347 tooltip => $resist_names{$_}->[1],
1320 ); 1348 );
1321 1349
1322 $row++; 1350 $row++;
1323 if ($row % 6 == 0) { 1351 if ($row % 6 == 0) {
1324 $col += 3; 1352 $col += 4;
1325 $row = 0; 1353 $row = 0;
1326 } 1354 }
1327 } 1355 }
1328 1356
1329 #update_stats_window ({}); 1357 #update_stats_window ({});
1375 "The time this server has been running without being restarted.", 1403 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1404 "Short information about this server provided by its admins.",
1377 ); 1405 );
1378 my @col = qw(#Users Host Uptime Version Description); 1406 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1407 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1408 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1409 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1410 for 0 .. $#col;
1384 1411
1385 my @align = qw(1 0 1 1 -1); 1412 my @align = qw(1 0.5 1 1 0);
1386 1413
1387 my $y = 0; 1414 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1415 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1416 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1417 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1471 $vbox->add (new DC::UI::FancyFrame 1498 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1499 label => "Login Settings",
1473 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1500 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1501 );
1475 1502
1476 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1503 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new DC::UI::Entry 1504 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1505 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1506 tooltip => "The name of your character on the server.",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1507 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1508 );
1482 1509
1483 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1510 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new DC::UI::Entry 1511 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1512 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1513 hidden => 1,
1487 tooltip => "The password for your character.", 1514 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1515 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1516 );
1490 1517
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1518 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1519 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1520 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1521 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1522 on_activate => sub {
1497 $CONN ? stop_game 1523 $CONN ? stop_game
1498 : start_game; 1524 : start_game;
1501 ); 1527 );
1502 1528
1503 $vbox->add (new DC::UI::FancyFrame 1529 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1530 label => "Registering",
1505 min_h => 200, 1531 min_h => 200,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1532 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1533 markup =>
1508 "To register a new account, choose a username that hasn't been taken yet and " 1534 "To register a new account, choose a username that hasn't been taken yet and "
1509 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1535 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1536 ),
1511 ); 1537 );
1521 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1547 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1548 );
1523 1549
1524 my $row = 0; 1550 my $row = 0;
1525 1551
1526 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1552 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1553 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1554 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1555
1530 $vbox->add ( 1556 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1557 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1558 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1559 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1560 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1561 on_changed => sub {
1536 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1563 $CFG->{profile}{default}{host} = $value;
1538 1 1564 1
1539 } 1565 }
1542 if (0) { #d# disabled 1568 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1569 $vbox->add (new DC::UI::Button
1544 expand => 1, 1570 expand => 1,
1545 text => "Server List", 1571 text => "Server List",
1546 other => $METASERVER, 1572 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1573 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1574 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1575 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1576 );
1551 }#d# 1577 }#d#
1552 } 1578 }
1553 1579
1554 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1580 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new DC::UI::Slider 1581 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1582 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1583 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1584 tooltip => "This is the size of the portion of the map update the server sends you. "
1559 . "If you set this to a high value you will be able to see further, " 1585 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1586 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1587 . "This option is only used once at log-in.",
1562 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1588 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1589 );
1564 1590
1565 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1591 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new DC::UI::Entry 1592 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1593 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1594 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1595 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1596 . "default will be used, which is usually around 100kb/s. Most servers will "
1583sub client_setup { 1609sub client_setup {
1584 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1610 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1611
1586 my $row = 0; 1612 my $row = 0;
1587 1613
1588 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1614 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1589 $table->add_at (1, $row++, new DC::UI::CheckBox 1615 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1616 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1617 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1618 on_changed => sub {
1593 my ($self, $value) = @_; 1619 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1620 $CFG->{show_tips} = $value;
1595 0 1621 0
1596 } 1622 }
1597 ); 1623 );
1598 1624
1599 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1625 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1600 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1627 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1628 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1603 . "sends more messages than this number, older messages get removed to save memory and " 1629 . "sends more messages than this number, older messages get removed to save memory and "
1604 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1631 on_changed => sub {
1606 my ($self, $value) = @_; 1632 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1634 0
1609 }, 1635 },
1610 ); 1636 );
1611 1637
1612 $table 1638 $table
1738 1764
1739sub inventory_widget { 1765sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1766 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1767
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1768 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1769 $vb1->add (new DC::UI::Label text => "Player");
1744 1770
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1771 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1772
1747 use sort 'stable'; 1773 use sort 'stable';
1748 1774
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1784 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1785 },
1760 ); 1786 );
1761 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1787 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1788 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1790
1765 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1791 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1792 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1794
1948 my @path = DC::Pod::full_path_of $node; 1974 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 1975 pop @path; # drop current node
1950 1976
1951 for my $node (@path) { 1977 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 1978 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 1979 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 1980 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 1981 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1982 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 1983 $load_node->($node);
1958 }, 1984 },
1959 ); 1985 );
1960 $buttons->add (new DC::UI::Label text => "/"); 1986 $buttons->add (new DC::UI::Label text => "/");
1961 } 1987 }
1962 1988
1963 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1989 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 1990
1965 $curnode = $node; 1991 $curnode = $node;
1966 1992
1967 $viewer->clear; 1993 $viewer->clear;
1968 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 1994 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2147 force_x => "max", 2173 force_x => "max",
2148 force_y => 0; 2174 force_y => 0;
2149 $DEBUG_STATUS->show; 2175 $DEBUG_STATUS->show;
2150 2176
2151 $STATUSBOX = new DC::UI::Statusbox; 2177 $STATUSBOX = new DC::UI::Statusbox;
2152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2178
2179 $MODBOX = new DC::UI::Label
2180 can_events => 1,
2181 can_hover => 1,
2182 markup => "",
2183 align => 0,
2184 font => $FONT_FIXED,
2185 tooltip => "#modifier_box",
2186 tooltip_width => 0.67,
2187 ;
2188
2189 update_modbox;
2153 2190
2154 (new DC::UI::Frame 2191 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2192 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2193 force_x => 0,
2157 force_y => "max", 2194 force_y => "max",
2158 child => $STATUSBOX, 2195 child => (my $LR = new DC::UI::VBox),
2159 )->show; 2196 )->show;
2197
2198 $LR->add ($STATUSBOX);
2199 $LR->add ($MODBOX);
2200 $LR->add (new DC::UI::Label
2201 align => 0,
2202 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2203 fontsize => 0.5,
2204 fg => [1, 1, 0, 0.7],
2205 );
2160 2206
2161 DC::UI::Toplevel->new ( 2207 DC::UI::Toplevel->new (
2162 title => "Minimap", 2208 title => "Minimap",
2163 name => "mapmap", 2209 name => "mapmap",
2164 x => 0, 2210 x => 0,
2172 2218
2173 $MAPWIDGET = new DC::MapWidget; 2219 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2220 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2221 my ($mapwidget, $preset) = @_;
2176 2222
2177 $MESSAGE_WINDOW->activate_console ($preset) 2223 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2224 if $MESSAGE_DIST;
2179 }); 2225 });
2180 $MAPWIDGET->show; 2226 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2227 $MAPWIDGET->grab_focus;
2182 2228
2183 $COMPLETER = new DC::MapWidget::Command:: 2229 $COMPLETER = new DC::MapWidget::Command::
2195 force_h => $::HEIGHT * 0.6, 2241 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2242 has_close_button => 1,
2197 ; 2243 ;
2198 2244
2199 $METASERVER = metaserver_dialog; 2245 $METASERVER = metaserver_dialog;
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2246 # the name is changed to not conflict with the older name as users could have hidden it
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => "message_window2", title => 'Messages');
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2249
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2252
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2254 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2274
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2276 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2277
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2278# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2279# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2280
2233 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2281 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2234 2282
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2284 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2238 $BUTTONBAR->add (new DC::UI::Button 2286 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2287 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2288 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2289 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2290 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2291 DC::write_cfg;
2244 status "Configuration Saved"; 2292 status "Configuration Saved";
2245 0 2293 0
2246 }, 2294 },
2247 ); 2295 );
2248 2296
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2298 tooltip => "View Documentation");
2251
2252 2299
2253 $BUTTONBAR->add (new DC::UI::Button 2300 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2301 text => "Quit",
2255 tooltip => "Terminates the program", 2302 tooltip => "Terminates the program",
2256 on_activate => sub { 2303 on_activate => sub {
2294 $DC::UI::ROOT->draw; 2341 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2342 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2343 $LAST_REFRESH = $NOW;
2297} 2344}
2298 2345
2299my $want_refresh = EV::idle_ns \&force_refresh; 2346my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2347
2301my $input = EV::periodic 0, 1/60, undef, sub { 2348my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2349 $NOW = EV::now;
2303 2350
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2351 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2352 for DC::poll_events;
2306 2353
2307 if (%animate_object) { 2354 if (%animate_object) {
2345 # alt-enter 2392 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2393 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2394 video_shutdown;
2348 video_init; 2395 video_init;
2349 } else { 2396 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2397 &DC::UI::feed_sdl_key_down_event;
2351 } 2398 }
2399 update_modbox;
2352 }, 2400 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2401 DC::SDL_KEYUP => sub {
2402 &DC::UI::feed_sdl_key_up_event;
2403 update_modbox;
2404 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2405 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2406 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2407 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2408 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2409 if ($_[0]{code} == 1) {
2369 EV::unloop; 2420 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2421 #d# TODO calling exit here hangs the process in some futex
2371}; 2422};
2372 2423
2373{ 2424{
2425 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2426
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2427 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2428 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2429 } else {
2377 #TODO: compatibility cruft 2430 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2431 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2432 print STDERR "INFO: used old configuration file\n";
2380 } 2433 }
2381 2434
2382 DC::DB::Server::run; 2435 DC::DB::Server::run;
2436
2437 if ($CFG->{db_schema} < 1) {
2438 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2439 DC::DB::nuke_db;
2440 $CFG->{db_schema} = 1;
2441 DC::write_cfg;
2442 }
2443
2444 DC::DB::open_db;
2383 2445
2384 DC::UI::set_layout ($::CFG->{layout}); 2446 DC::UI::set_layout ($::CFG->{layout});
2385 2447
2386 my %DEF_CFG = ( 2448 my %DEF_CFG = (
2387 sdl_mode => 0, 2449 sdl_mode => 0,
2457 DejaVuSansMono-BoldOblique.ttf 2519 DejaVuSansMono-BoldOblique.ttf
2458 ); 2520 );
2459 2521
2460 DC::add_font $_ for @fonts; 2522 DC::add_font $_ for @fonts;
2461 2523
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2524 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2525 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2526
2467 $FONT_PROP->make_default; 2527 $FONT_PROP->make_default;
2528
2529 DC::pango_init;
2468 } 2530 }
2469 2531
2470# compare mono (ft) vs. rgba (cairo) 2532# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2533# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2534# for my $rgba (0..1) {
2489our $STARTUP_CANCEL = EV::idle sub { 2551our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2552 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2553 $startup_done->();
2492}; 2554};
2493 2555
2556delete $SIG{__DIE__};
2494EV::loop; 2557EV::loop;
2495 2558
2496#video_shutdown; 2559#video_shutdown;
2497#audio_shutdown; 2560#audio_shutdown;
2498DC::OpenGL::quit; 2561DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines