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.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3{
4package Deliantra::Client; # work around CPAN breakage
5package App::Deliantra; # try to reserve namespace
6}
2 7
3if ($ENV{DELIANTRA_CORO_DEBUG}) { 8if ($ENV{DELIANTRA_CORO_DEBUG}) {
4 eval ' 9 eval '
5 use Coro; 10 use Coro;
6 use Coro::EV; 11 use Coro::EV;
78} 83}
79 84
80# prepend private library directory 85# prepend private library directory
81BEGIN { 86BEGIN {
82 for (grep !ref, @INC) { 87 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 88 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 89 if (-d $path) {
85 unshift @INC, $path; 90 unshift @INC, $path;
86 last; 91 last;
87 } 92 }
88 } 93 }
97use List::Util qw(max min); 102use List::Util qw(max min);
98 103
99use Deliantra; 104use Deliantra;
100use Deliantra::Protocol::Constants; 105use Deliantra::Protocol::Constants;
101 106
107use AnyEvent::DNS;
108
102use Compress::LZF; 109use Compress::LZF;
103 110
104use DC; 111use DC;
112BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 113use DC::OpenGL ();
106use DC::Protocol; 114use DC::Protocol;
107use DC::DB; 115use DC::DB;
108use DC::UI; 116use DC::UI;
109use DC::UI::Canvas; 117use DC::UI::Canvas;
110use DC::UI::Inventory; 118use DC::UI::Inventory;
111use DC::UI::SpellList; 119use DC::UI::SpellList;
112use DC::UI::Dockable; 120use DC::UI::Dockable;
121use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 122use DC::UI::MessageWindow;
114use DC::UI::ChatView; 123use DC::UI::ChatView;
124use DC::MessageDistributor;
115use DC::Pod; 125use DC::Pod;
116use DC::MapWidget; 126use DC::MapWidget;
117use DC::Macro; 127use DC::Macro;
118 128
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
178our $SPELL_PAGE; 188our $SPELL_PAGE;
179our $SPELL_LIST; 189our $SPELL_LIST;
180 190
181our $HELP_WINDOW; 191our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 192our $MESSAGE_WINDOW;
193our $MESSAGE_DIST;
183our $FLOORBOX; 194our $FLOORBOX;
184our $GAUGES; 195our $GAUGES;
185our $STATWIDS; 196our $STATWIDS;
186 197
187our $SDL_ACTIVE; 198our $SDL_ACTIVE;
188our %SDL_CB; 199our %SDL_CB;
189 200
190our $ALT_ENTER_MESSAGE; 201our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 202our $STATUSBOX;
203our $MODBOX;
192our $DEBUG_STATUS; 204our $DEBUG_STATUS;
193 205
194our $INV; 206our $INV;
195our $INVR; 207our $INVR;
196our $INVR_HB; 208our $INVR_HB;
204sub debug { 216sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 217 $DEBUG_STATUS->set_text ($_[0]);
206} 218}
207 219
208sub message { 220sub message {
209 $MESSAGE_WINDOW->message (@_); 221 $MESSAGE_DIST->message (@_);
222}
223
224sub update_modbox {
225 my $mod = DC::SDL_GetModState;
226
227 my $markup;
228
229 $markup .= $mod & DC::KMOD_CTRL
230 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
231 : "[<span foreground='#888'> once </span>]";
232
233 $markup .= $mod & DC::KMOD_SHIFT
234 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
235 : "[<span foreground='#888'>move</span>]";
236
237 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
238 ? "[ALT]"
239 : "[<span foreground='#888'>alt</span>]";
240
241 $markup .= $mod & DC::KMOD_NUM
242 ? "[NUM]"
243 : "[<span foreground='#888'>num</span>]";
244
245 # <tt> around next statement works around some bug that keeps the
246 # "font =>" from being used on windows
247 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 248}
211 249
212############################################################################# 250#############################################################################
213#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
214 252
634 # right: accept 672 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 674 text => "Accept",
637 on_activate => sub { 675 on_activate => sub {
638 $conn->send ("reply n"); 676 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
641 0 678 0
642 }, 679 },
643 ); 680 );
644 681
653 [Cha => CS_STAT_CHA], 690 [Cha => CS_STAT_CHA],
654 ) { 691 ) {
655 my ($name, $id) = @$_; 692 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 693 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 694 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 695 expand => 1,
660 can_events => 1, 696 can_events => 1,
661 can_hover => 1, 697 can_hover => 1,
662 tooltip => "#stat_$name", 698 tooltip => "#stat_$name",
663 ); 699 );
697 733
698 $vbox->add (@dialog); 734 $vbox->add (@dialog);
699 $dialog->show; 735 $dialog->show;
700} 736}
701 737
702sub start_game { 738sub dc_connect {
703 status "logging in..."; 739 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 740
708 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
709 742
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 743 $CONN =
715 new DC::Protocol 744 new DC::Protocol
716 host => $host, 745 host => $host,
717 port => $port || 13327, 746 port => $port || 13327,
718 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
720 mapw => $mapsize, 749 mapw => $mapsize,
721 maph => $mapsize, 750 maph => $mapsize,
722 751
723 client => "cfplus $DC::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
724 753
725 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
727 map => $MAP, 756 map => $MAP,
728 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
729 query => \&server_query, 758 query => \&server_query,
730 759
731 setup_req => { 760 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
733 }, 762 },
734 };
735 763
736 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
738 767
739 status "login successful"; 768 status "login successful";
769 } else {
770 undef $CONN;
771 status "unable to connect: $!";
772 stop_game();
773 }
774 },
775 ;
776}
777
778sub start_game {
779 status "logging in...";
780
781 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = split /:/, $PROFILE->{host};
785
786 $MAP = new DC::Map;
787
788 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl
793 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95";
795 }
796
797 dc_connect $host, $port;
798 };
740 } else { 799 } else {
741 status "unable to connect"; 800 dc_connect $host, $port;
742 stop_game();
743 } 801 }
744} 802}
745 803
746sub stop_game { 804sub stop_game {
747 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
769 827
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 829
772 my $row = 0; 830 my $row = 0;
773 831
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
776 can_events => 1, 834 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 836
779 my $vidmode_tooltip = 837 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 838 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
781 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 839 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 840
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 841 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 842 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 843
786 $hbox->add (my $mode_slider = new DC::UI::Slider 844 $hbox->add (my $mode_slider = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 845 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
788 tooltip => $vidmode_tooltip); 846 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 847 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 848 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 849 can_events => 1, tooltip => $vidmode_tooltip);
792 850
793 $mode_slider->connect (changed => sub { 851 $mode_slider->connect (changed => sub {
794 my ($self, $value) = @_; 852 my ($self, $value) = @_;
795 853
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 854 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 855 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 856 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 857 $mode_slider->emit (changed => $mode_slider->{range}[0]);
800 858
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 860 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 861 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 862 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 863 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 864 );
807 865
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 867 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 868 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 869 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
812 . "higher memory usage and slower performance. It will, however, help tremendously on " 870 . "higher memory usage and slower performance. It will, however, help tremendously on "
813 . "cards that claim to support a feature but fall back to software rendering. " 871 . "cards that claim to support a feature but fall back to software rendering. "
814 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 872 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
815 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 873 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 874 . "experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 875 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 876 );
819 877
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 878 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 879 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 880 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 881 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
824 . "will save a lot of memory and increase performance. The compression algorithm " 882 . "will save a lot of memory and increase performance. The compression algorithm "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 883 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 884 . "forced OpenGL 1.1 mode.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 885 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 886 );
829 887
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 888 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 889 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 890 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 891 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 892 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 893 );
836 894
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 896 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 897 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 898 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 899 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 900 );
843 901
844 $table->add_at (1, $row++, new DC::UI::Button 902 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 903 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 904 tooltip => "Apply the video settings above.",
847 on_activate => sub { 905 on_activate => sub {
848 video_shutdown (); 906 video_shutdown ();
849 video_init (); 907 video_init ();
850 0 908 0
851 } 909 }
852 ); 910 );
853 911
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 913 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 914 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 915 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 916 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 917 );
860 918
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 919 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 920 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 921 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 922 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
865 . "This increases load on the graphics subsystem and works only with TRT servers. " 923 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 924 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 925 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 926 );
869 927
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 929 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 930 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 931 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 932 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 933 );
876 934
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 936 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 937 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 938 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 939 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 940 );
883 941
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 943 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 944 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 945 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
888 . "but you still need to press apply to correctly re-layout the widget.", 946 . "but you still need to press apply to correctly re-layout the widget.",
889 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 947 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 948 );
891 949
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 951 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 952 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 953 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 954 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 955 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 956 &set_gauge_window_fontsize;
899 0 957 0
900 } 958 }
901 ); 959 );
902 960
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 962 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 963 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 964 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 965 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 966 $CFG->{gauge_size} = $_[1];
942 1000
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1001 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1002
945 my $row = 0; 1003 my $row = 0;
946 1004
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1007 state => $CFG->{audio_enable},
950 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.", 1008 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.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1009 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1010 );
953 1011
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1013 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1014 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1015 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1016 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1017 $CFG->{effects_enable} = $_[1];
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1024 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1025 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1026 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1027 );
970 1028
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1030 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1031 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1032 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1033 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1034 $CFG->{bgm_enable} = $_[1];
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1041 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1042 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1043 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1044 );
987 1045
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1047 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1048 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1049 value => $CFG->{audio_hw_frequency},
992 options => [ 1050 options => [
993 [ 0, "default" , "Use System Default"], 1051 [ 0, "default" , "Use System Default"],
1002 audio_tab_update; 1060 audio_tab_update;
1003 1 1061 1
1004 } 1062 }
1005 ); 1063 );
1006 1064
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1066 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1067 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1068 value => $CFG->{audio_hw_channels},
1011 options => [ 1069 options => [
1012 [0, "default" , "Use System Default"], 1070 [0, "default" , "Use System Default"],
1021 audio_tab_update; 1079 audio_tab_update;
1022 1 1080 1
1023 } 1081 }
1024 ); 1082 );
1025 1083
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1084 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1085 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1086 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1087 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1088 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1089 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1035 1 1093 1
1036 } 1094 }
1037 ); 1095 );
1038 1096
1039 # should really be a slider 1097 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1099 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1100 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1101 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1102 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1103 template => ">= 99",
1051 1; 1109 1;
1052 } 1110 }
1053 ); 1111 );
1054 1112
1055 $table->add_at (1, $row++, new DC::UI::Button 1113 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1114 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1115 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1116 on_activate => sub {
1059 audio_shutdown (); 1117 audio_shutdown ();
1060 audio_init (); 1118 audio_init ();
1061 0 1119 0
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1169 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1112 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1170 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1113 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1171 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1114 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1172 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1173
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1174 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1175 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1176 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1177 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1178
1121 $GAUGES = { 1179 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1180 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1181 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1182 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1190 $vb->add (new DC::UI::FancyFrame 1248 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1249 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1250 child => (my $pi = new DC::UI::VBox),
1193 ); 1251 );
1194 1252
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1253 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1254 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1255 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1256 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1257 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1258 tooltip => "The map you are currently on (if supported by the server).");
1201 1259
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1260 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1261 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1262 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1263 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1264 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1265 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1266 tooltip => "The weight limit: you cannot carry more than this.");
1209 1267
1210 $vb->add (new DC::UI::FancyFrame 1268 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1269 label => "Primary/Secondary Statistics",
1232 [2, 5, st_wspd => "WSp", 10.54], 1290 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1291 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1292 my ($col, $row, $id, $label, $template) = @$_;
1235 1293
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1294 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1295 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1296 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1297 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1298 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1299 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1300 }
1243 1301
1244 $vb->add (new DC::UI::FancyFrame 1302 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1303 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1304 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1305 );
1248 1306
1249 my $row = 0; 1307 my $row = 0;
1250 my $col = 0; 1308 my $col = 0;
1251 1309
1290 1348
1291 for (qw/slow holyw conf fire depl magic 1349 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1350 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1351 blind fear tund elec cold ghit/)
1294 { 1352 {
1295 $tbl2->add_at ($col, $row, 1353 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1354 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1355 new DC::UI::Label
1298 font => $FONT_FIXED, 1356 font => $FONT_FIXED,
1299 template => "-100%", 1357 template => "-100%",
1300 align => +1, 1358 align => 1,
1301 valign => 0,
1302 can_events => 1, 1359 can_events => 1,
1303 can_hover => 1, 1360 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1361 tooltip => $resist_names{$_}->[1],
1305 ); 1362 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1363 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 can_hover => 1, 1365 can_hover => 1,
1309 can_events => 1, 1366 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1367 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1368 tooltip => $resist_names{$_}->[1],
1312 ); 1369 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1370 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1371 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1372 font => $FONT_FIXED,
1373 align => 1,
1316 can_hover => 1, 1374 can_hover => 1,
1317 can_events => 1, 1375 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1376 tooltip => $resist_names{$_}->[1],
1319 ); 1377 );
1320 1378
1321 $row++; 1379 $row++;
1322 if ($row % 6 == 0) { 1380 if ($row % 6 == 0) {
1323 $col += 3; 1381 $col += 4;
1324 $row = 0; 1382 $row = 0;
1325 } 1383 }
1326 } 1384 }
1327 1385
1328 #update_stats_window ({}); 1386 #update_stats_window ({});
1374 "The time this server has been running without being restarted.", 1432 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1433 "Short information about this server provided by its admins.",
1376 ); 1434 );
1377 my @col = qw(#Users Host Uptime Version Description); 1435 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1436 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1437 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1438 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1439 for 0 .. $#col;
1383 1440
1384 my @align = qw(1 0 1 1 -1); 1441 my @align = qw(1 0.5 1 1 0);
1385 1442
1386 my $y = 0; 1443 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1444 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1445 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1446 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1470 $vbox->add (new DC::UI::FancyFrame 1527 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1528 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1529 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1530 );
1474 1531
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1532 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1533 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1534 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1535 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1536 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1537 );
1481 1538
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1539 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1540 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1541 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1542 hidden => 1,
1486 tooltip => "The password for your character.", 1543 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1544 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1545 );
1489 1546
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1547 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1548 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1549 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1550 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1551 on_activate => sub {
1496 $CONN ? stop_game 1552 $CONN ? stop_game
1497 : start_game; 1553 : start_game;
1500 ); 1556 );
1501 1557
1502 $vbox->add (new DC::UI::FancyFrame 1558 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1559 label => "Registering",
1504 min_h => 200, 1560 min_h => 200,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1561 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1562 markup =>
1507 "To register a new account, choose a username that hasn't been taken yet and " 1563 "To register a new account, choose a username that hasn't been taken yet and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1564 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1565 ),
1510 ); 1566 );
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1576 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1577 );
1522 1578
1523 my $row = 0; 1579 my $row = 0;
1524 1580
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1581 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1582 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1583 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1584
1529 $vbox->add ( 1585 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1586 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1587 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1588 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1589 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1590 on_changed => sub {
1535 my ($self, $value) = @_; 1591 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1592 $CFG->{profile}{default}{host} = $value;
1537 1 1593 1
1538 } 1594 }
1541 if (0) { #d# disabled 1597 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1598 $vbox->add (new DC::UI::Button
1543 expand => 1, 1599 expand => 1,
1544 text => "Server List", 1600 text => "Server List",
1545 other => $METASERVER, 1601 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1602 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1603 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1604 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1605 );
1550 }#d# 1606 }#d#
1551 } 1607 }
1552 1608
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1609 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1610 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1611 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1612 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1613 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1614 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1615 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1616 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1617 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1618 );
1563 1619
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1620 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1621 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1622 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1623 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1624 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1625 . "default will be used, which is usually around 100kb/s. Most servers will "
1582sub client_setup { 1638sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1639 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1640
1585 my $row = 0; 1641 my $row = 0;
1586 1642
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1643 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1644 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1645 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1646 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1647 on_changed => sub {
1592 my ($self, $value) = @_; 1648 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1649 $CFG->{show_tips} = $value;
1594 0 1650 0
1595 } 1651 }
1596 ); 1652 );
1597 1653
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1654 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1655 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1656 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1657 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1658 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1659 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1660 on_changed => sub {
1605 my ($self, $value) = @_; 1661 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1662 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1663 0
1608 }, 1664 },
1609 ); 1665 );
1610 1666
1611 $table 1667 $table
1715 1771
1716 $r 1772 $r
1717} 1773}
1718 1774
1719my %SORT_ORDER = ( 1775my %SORT_ORDER = (
1720 type => undef, 1776 type => sub {
1777 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1778 },
1721 mtime => sub { 1779 mtime => sub {
1722 my $NOW = time; 1780 my $NOW = time;
1723 sort { 1781 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1782 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1783 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1737 1795
1738sub inventory_widget { 1796sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1797 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1798
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1799 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1800 $vb1->add (new DC::UI::Label text => "Player");
1743 1801
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1802 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1803
1746 use sort 'stable'; 1804 use sort 'stable';
1747 1805
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1815 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1816 },
1759 ); 1817 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1818 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1819 #TODO# update to weigh/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1820 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1821
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1822 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1823 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1824 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1825
1947 my @path = DC::Pod::full_path_of $node; 2005 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2006 pop @path; # drop current node
1949 2007
1950 for my $node (@path) { 2008 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2009 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2010 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2011 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2012 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2013 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2014 $load_node->($node);
1957 }, 2015 },
1958 ); 2016 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2017 $buttons->add (new DC::UI::Label text => "/");
1960 } 2018 }
1961 2019
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2020 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2021
1964 $curnode = $node; 2022 $curnode = $node;
1965 2023
1966 $viewer->clear; 2024 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2025 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2146 force_x => "max", 2204 force_x => "max",
2147 force_y => 0; 2205 force_y => 0;
2148 $DEBUG_STATUS->show; 2206 $DEBUG_STATUS->show;
2149 2207
2150 $STATUSBOX = new DC::UI::Statusbox; 2208 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2209
2210 $MODBOX = new DC::UI::Label
2211 can_events => 1,
2212 can_hover => 1,
2213 markup => "",
2214 align => 0,
2215 font => $FONT_FIXED,
2216 tooltip => "#modifier_box",
2217 tooltip_width => 0.67,
2218 ;
2219
2220 update_modbox;
2152 2221
2153 (new DC::UI::Frame 2222 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2223 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2224 force_x => 0,
2156 force_y => "max", 2225 force_y => "max",
2157 child => $STATUSBOX, 2226 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2227 )->show;
2228
2229 $LR->add ($STATUSBOX);
2230 $LR->add ($MODBOX);
2231 $LR->add (new DC::UI::Label
2232 align => 0,
2233 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2234 fontsize => 0.5,
2235 fg => [1, 1, 0, 0.7],
2236 );
2159 2237
2160 DC::UI::Toplevel->new ( 2238 DC::UI::Toplevel->new (
2161 title => "Minimap", 2239 title => "Minimap",
2162 name => "mapmap", 2240 name => "mapmap",
2163 x => 0, 2241 x => 0,
2171 2249
2172 $MAPWIDGET = new DC::MapWidget; 2250 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2251 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2252 my ($mapwidget, $preset) = @_;
2175 2253
2176 $MESSAGE_WINDOW->activate_console ($preset) 2254 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2255 if $MESSAGE_DIST;
2178 }); 2256 });
2179 $MAPWIDGET->show; 2257 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2258 $MAPWIDGET->grab_focus;
2181 2259
2182 $COMPLETER = new DC::MapWidget::Command:: 2260 $COMPLETER = new DC::MapWidget::Command::
2194 force_h => $::HEIGHT * 0.6, 2272 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2273 has_close_button => 1,
2196 ; 2274 ;
2197 2275
2198 $METASERVER = metaserver_dialog; 2276 $METASERVER = metaserver_dialog;
2277 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2278 $MESSAGE_WINDOW = new DC::UI::Dockbar
2279 name => "message_window2",
2280 title => 'Messages',
2281 force_w => $::WIDTH * 0.6,
2282 force_h => $::HEIGHT * 0.25,
2283 ;
2200 2284
2285 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2286
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2287 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2288 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2289
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2290 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2291 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2292 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2310 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2311
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2312 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2313 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2314
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2315# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2316# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2317
2232 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 2318 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
2233 2319
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2320 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2321 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237 $BUTTONBAR->add (new DC::UI::Button 2323 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2324 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2325 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub { 2326 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2327 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2328 DC::write_cfg;
2243 status "Configuration Saved"; 2329 status "Configuration Saved";
2244 0 2330 0
2245 }, 2331 },
2246 ); 2332 );
2247 2333
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2334 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2335 tooltip => "View Documentation");
2250
2251 2336
2252 $BUTTONBAR->add (new DC::UI::Button 2337 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2338 text => "Quit",
2254 tooltip => "Terminates the program", 2339 tooltip => "Terminates the program",
2255 on_activate => sub { 2340 on_activate => sub {
2344 # alt-enter 2429 # alt-enter
2345 $FULLSCREEN_ENABLE->toggle; 2430 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown; 2431 video_shutdown;
2347 video_init; 2432 video_init;
2348 } else { 2433 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2434 &DC::UI::feed_sdl_key_down_event;
2350 } 2435 }
2436 update_modbox;
2351 }, 2437 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2438 DC::SDL_KEYUP => sub {
2439 &DC::UI::feed_sdl_key_up_event;
2440 update_modbox;
2441 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2442 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2443 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2444 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2445 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2446 if ($_[0]{code} == 1) {
2368 EV::unloop; 2457 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2458 #d# TODO calling exit here hangs the process in some futex
2370}; 2459};
2371 2460
2372{ 2461{
2462 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2463
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2464 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2465 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2466 } else {
2376 #TODO: compatibility cruft 2467 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2468 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2469 print STDERR "INFO: used old configuration file\n";
2379 } 2470 }
2380 2471
2381 DC::DB::Server::run; 2472 DC::DB::Server::run;
2473
2474 if ($CFG->{db_schema} < 1) {
2475 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2476 DC::DB::nuke_db;
2477 $CFG->{db_schema} = 1;
2478 DC::write_cfg;
2479 }
2480
2481 DC::DB::open_db;
2382 2482
2383 DC::UI::set_layout ($::CFG->{layout}); 2483 DC::UI::set_layout ($::CFG->{layout});
2384 2484
2385 my %DEF_CFG = ( 2485 my %DEF_CFG = (
2386 sdl_mode => 0, 2486 sdl_mode => 0,
2411 pickup => 0, 2511 pickup => 0,
2412 inv_sort => "mtime", 2512 inv_sort => "mtime",
2413 default => "profile", # default profile 2513 default => "profile", # default profile
2414 show_tips => 1, 2514 show_tips => 1,
2415 logview_max_par => 1000, 2515 logview_max_par => 1000,
2516 shift_fire_stop => 0,
2416 ); 2517 );
2417 2518
2418 while (my ($k, $v) = each %DEF_CFG) { 2519 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2520 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2521 }
2456 DejaVuSansMono-BoldOblique.ttf 2557 DejaVuSansMono-BoldOblique.ttf
2457 ); 2558 );
2458 2559
2459 DC::add_font $_ for @fonts; 2560 DC::add_font $_ for @fonts;
2460 2561
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2562 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2563 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2564
2466 $FONT_PROP->make_default; 2565 $FONT_PROP->make_default;
2566
2567 DC::pango_init;
2467 } 2568 }
2468 2569
2469# compare mono (ft) vs. rgba (cairo) 2570# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2571# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2572# for my $rgba (0..1) {
2488our $STARTUP_CANCEL = EV::idle sub { 2589our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2590 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2591 $startup_done->();
2491}; 2592};
2492 2593
2594delete $SIG{__DIE__};
2493EV::loop; 2595EV::loop;
2494 2596
2495#video_shutdown; 2597#video_shutdown;
2496#audio_shutdown; 2598#audio_shutdown;
2497DC::OpenGL::quit; 2599DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines