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.58 by root, Sun Aug 17 01:27:33 2008 UTC vs.
Revision 1.79 by root, Fri Dec 19 22:06:53 2008 UTC

… …
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 # OS X
56 or die "pangoversion: $!"; 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 59 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 60 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 61 }
75 62
76 unshift @INC, $root; 63 unshift @INC, $root;
77 } 64 }
78} 65}
… …
90 77
91# need to do it again because that pile of garbage called PAR nukes it before main 78# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 80 if %PAR::LibCache;
94 81
95use Time::HiRes 'time';
96use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
97use List::Util qw(max min); 85use List::Util qw(max min);
98 86
99use Deliantra; 87use Deliantra;
100use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
101 89
90use AnyEvent::Util ();
102use AnyEvent::DNS; 91use AnyEvent::DNS;
103use AnyEvent::Socket (); 92use AnyEvent::Socket ();
104 93
105use Compress::LZF; 94use Compress::LZF;
95use JSON::XS;
106 96
107use DC; 97use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 98
99sub crash($;$) {
100 # nop during compiletime
101}
102
103BEGIN {
104 $SIG{__DIE__} = sub {
105 return if $^S;
106 crash "CRASH/DIE: $_[0]" => 1;
107 DC::fatal Carp::longmess "$_[0]";
108 }
109}
110
109use DC::OpenGL (); 111use DC::OpenGL ();
110use DC::Protocol; 112use DC::Protocol;
111use DC::DB; 113use DC::DB;
112use DC::UI; 114use DC::UI;
113use DC::UI::Canvas; 115use DC::UI::Canvas;
114use DC::UI::Inventory; 116use DC::UI::Inventory;
115use DC::UI::SpellList; 117use DC::UI::SpellList;
116use DC::UI::Dockable; 118use DC::UI::Dockable;
117use DC::UI::Dockbar; 119use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 120use DC::UI::ChatView;
120use DC::MessageDistributor; 121use DC::MessageDistributor;
121use DC::Pod; 122use DC::Pod;
122use DC::MapWidget; 123use DC::MapWidget;
123use DC::Macro; 124use DC::Macro;
124 125
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
127 128
128$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1;
129 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
130}; 132};
131 133
132my $MAX_FPS = 60; 134my $MAX_FPS = 60;
133 135
… …
135 137
136our $LAST_REFRESH; 138our $LAST_REFRESH;
137our $NOW; 139our $NOW;
138 140
139our $CFG; 141our $CFG;
140our $CONN;
141our $PROFILE; # current profile 142our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 144
144our $WANT_REFRESH; 145our $WANT_REFRESH;
145 146
… …
153our $FULLSCREEN; 154our $FULLSCREEN;
154our $FONTSIZE; 155our $FONTSIZE;
155 156
156our $FONT_PROP; 157our $FONT_PROP;
157our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
158 161
159our $MAP; 162our $MAP;
160our $MAPMAP; 163our $MAPMAP;
161our $MAPWIDGET; 164our $MAPWIDGET;
162our $COMPLETER; 165our $COMPLETER;
… …
204our $DEBUG_STATUS; 207our $DEBUG_STATUS;
205 208
206our $INV; 209our $INV;
207our $INVR; 210our $INVR;
208our $INVR_HB; 211our $INVR_HB;
212
213#############################################################################
214
215# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) {
218 my ($msg, $backtrace) = @_;
219
220 return unless $CONN;
221
222 my $fh = $CONN->{fh}
223 or return;
224
225 my $buf = delete $CONN->{wbuf};
226
227 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
228
229 AnyEvent::Util::fh_nonblocking $fh, 0;
230 syswrite $fh, $buf;
231 AnyEvent::Util::fh_nonblocking $fh, 1;
232
233 $msg =~ s/\s+$//;
234
235 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace;
238};
209 239
210############################################################################# 240#############################################################################
211 241
212sub status { 242sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
736} 766}
737 767
738sub dc_connect { 768sub dc_connect {
739 my ($host, $port) = @_; 769 my ($host, $port) = @_;
740 770
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapw = List::Util::min 48, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
772 my $maph = List::Util::min 48, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742 773
743 $CONN = 774 $CONN =
744 new DC::Protocol 775 new DC::Protocol
745 host => $host, 776 host => $host,
746 port => $port, 777 port => $port,
747 user => $PROFILE->{user}, 778 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 779 pass => $PROFILE->{password},
749 mapw => $mapsize, 780 mapw => $mapw,
750 maph => $mapsize, 781 maph => $maph,
751 782
752 client => "$DC::VERSION $] $^O", 783 client => "$DC::VERSION $] $^O",
753 784
754 map_widget => $MAPWIDGET, 785 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 786 statusbox => $STATUSBOX,
… …
800 dc_connect $host, $port; 831 dc_connect $host, $port;
801 } 832 }
802} 833}
803 834
804sub stop_game { 835sub stop_game {
836 crash "stop_game";
837
805 $LOGIN_BUTTON->set_text ("Login / Register"); 838 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 839 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 840 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 841 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 842 $SPELL_LIST->clear_spells;
… …
823} 856}
824 857
825sub graphics_setup { 858sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 859 my $vbox = new DC::UI::VBox;
827 860
861 {
862 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
863
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 864 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 865
830 my $row = 0; 866 my $row = 0;
831 867
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 869 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 870 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 871 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 872
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 874 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 875 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 876 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues " 877 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or " 878 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 879 . "by installing the right driver for your graphics card.");
844 880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
882 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
883 value => $CFG->{uitheme},
884 options => [
885 [wood => "Wood (the default)"],
886 [plain => "Plain (very)"],
887 [blue => "Blue (dark)"],
888 [metal => "Metal (light)"],
889 ],
890 tooltip => "Choose the User Interface theme that you like most :)",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
892 );
893
845 my $vidmode_tooltip = 894 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 895 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 896 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 897
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 898 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 900
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
853 force_w => $WIDTH * 0.1, expand => 1, 902 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 903 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 904 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 905 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 906 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 907 can_events => 1, tooltip => $vidmode_tooltip);
859 908
860 $MODE_SLIDER->connect (changed => sub { 909 $MODE_SLIDER->connect (changed => sub {
861 my ($self, $value) = @_;
862
863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
865 });
866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
867
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
870 state => $CFG->{fullscreen},
871 tooltip => "Bring the client into fullscreen mode.",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{force_opengl11},
878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
879 . "higher memory usage and slower performance. It will, however, help tremendously on "
880 . "cards that claim to support a feature but fall back to software rendering. "
881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_; 910 my ($self, $value) = @_;
911
912 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
913 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
914 });
915 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
916
917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
918 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
919 state => $CFG->{fullscreen},
920 tooltip => "Bring the client into fullscreen mode.",
921 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
922 );
923
924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
925 $table->add_at (1, $row++, new DC::UI::CheckBox
926 state => $CFG->{force_opengl11},
927 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
928 . "higher memory usage and slower performance. It will, however, help tremendously on "
929 . "cards that claim to support a feature but fall back to software rendering. "
930 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
931 . "but cards and drivers from other vendors (ATI) are often just as bad. "
932 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
933 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
934 );
935
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
937 $table->add_at (1, $row++, new DC::UI::CheckBox
938 state => $CFG->{disable_alpha},
939 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
940 . "by disabling a number of textures and transparency effects. Normally, these "
941 . "effects do not cost a lot of resources, but some graphics cards might fall "
942 . "back to extremely slow rendering if this is enabled. If disabling this option "
943 . "noticably improves the framerate of the client please report this! "
944 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
945 on_changed => sub {
946 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value; 947 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 948 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
949 0
900 0 950 }
901 } 951 );
902 );
903 952
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 955 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 956 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 957 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 958 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 959 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 961 );
913 962
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 964 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 965 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 966 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 967 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 968 );
920 969
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 971 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 972 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 973 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 974 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 975 );
927 976
928 $table->add_at (1, $row++, new DC::UI::Button 977 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 978 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 979 tooltip => "Apply the video settings above.",
931 on_activate => sub { 980 on_activate => sub {
932 video_shutdown (); 981 video_shutdown ();
933 video_init (); 982 video_init ();
983 0
934 0 984 }
935 } 985 );
936 ); 986 }
937 987
988 {
989 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
990
991 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
992
993 my $row = 0;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 996 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 997 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 999 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1001 );
946 1002
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
948 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
952 ); 1008 );
953 1009
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1011 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1012 state => $CFG->{map_smoothing},
957 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1013 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
958 . "This increases load on the graphics subsystem and works only with TRT servers. " 1014 . "This increases load on the graphics subsystem and works only with TRT servers. "
959 . "Changes take effect at next login only.", 1015 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1017 );
962 1018
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1021 state => $CFG->{fow_enable},
966 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1022 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1024 );
969 1025
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
971 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
973 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1029 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1031 );
976 1032
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
978 $table->add_at (1, $row++, new DC::UI::Slider 1034 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1035 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1036 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
981 . "but you still need to press apply to correctly re-layout the widget.", 1037 . "but you still need to press apply to correctly re-layout the widget.",
982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1038 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1039 );
984 1040
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1042 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1043 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1044 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1045 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1046 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1047 &set_gauge_window_fontsize;
1048 0
992 0 1049 }
993 } 1050 );
994 );
995 1051
996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1052 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
997 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1054 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1055 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1000 on_changed => sub { 1056 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1057 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1058 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1059 0
1003 0 1060 }
1004 } 1061 );
1005 ); 1062 }
1006 1063
1007 $vbox 1064 $vbox
1008} 1065}
1009 1066
1010our $AUDIO_HW_CHUNKSIZE; 1067our $AUDIO_HW_CHUNKSIZE;
… …
1589 1 1646 1
1590 }, 1647 },
1591 ); 1648 );
1592 1649
1593 $vbox->add (new DC::UI::FancyFrame 1650 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1651 label => "How to Play",
1595 min_h => 200, 1652 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1653 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1654 markup =>
1655 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1656 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1657 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1658 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1659 ),
1601 ); 1660 );
1602 1661
1603 $vbox 1662 $vbox
… …
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2183 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2184 );
2126 $hb->add (new DC::UI::Button 2185 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2186 text => "Quit anyway",
2128 expand => 1, 2187 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2188 on_activate => sub {
2189 crash "Quit anyway";
2190 EV::unloop EV::UNLOOP_ALL;
2191 },
2130 ); 2192 );
2131 } 2193 }
2132 2194
2133 $QUIT_DIALOG->show; 2195 $QUIT_DIALOG->show;
2134 $QUIT_DIALOG->grab_focus; 2196 $QUIT_DIALOG->grab_focus;
… …
2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2254 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2193 and die "SDL::Init failed!\n"; 2255 and die "SDL::Init failed!\n";
2194} 2256}
2195 2257
2196sub video_init { 2258sub video_init {
2259 DC::set_theme $CFG->{uitheme};
2260
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2261 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0; 2262 $SDL_REINIT = 0;
2199 2263
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2264 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2265 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2266 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2203 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2267 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2268
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2269 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206 2270
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2271 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2272 $CFG->{sdl_mode} = 0; # lowest resolution by default
2273
2274 # now choose biggest mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2275 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2276 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2277 $CFG->{sdl_mode} = $_;
2278 }
2211 } 2279 }
2212 } 2280 }
2213 2281
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2282 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2283
2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2284 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2217 $FULLSCREEN = $CFG->{fullscreen}; 2285 $FULLSCREEN = $CFG->{fullscreen};
2218 $FAST = $CFG->{fast}; 2286 $FAST = $CFG->{fast};
2219 2287
2288 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2220 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2289 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2290 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2221 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2291 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2222 2292
2223 $SDL_ACTIVE = 1; 2293 $SDL_ACTIVE = 1;
2224 $LAST_REFRESH = time - 0.01; 2294 $LAST_REFRESH = time - 0.01;
2225 2295
… …
2292 x => 0, 2362 x => 0,
2293 y => $FONTSIZE + 8, 2363 y => $FONTSIZE + 8,
2294 border_bg => [1, 1, 1, 192/255], 2364 border_bg => [1, 1, 1, 192/255],
2295 bg => [1, 1, 1, 0], 2365 bg => [1, 1, 1, 0],
2296 child => ($MAPMAP = new DC::MapWidget::MapMap 2366 child => ($MAPMAP = new DC::MapWidget::MapMap
2297 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2298 ), 2368 ),
2299 )->show; 2369 )->show;
2300 2370
2301 $MAPWIDGET = new DC::MapWidget; 2371 $MAPWIDGET = new DC::MapWidget;
2302 $MAPWIDGET->connect (activate_console => sub { 2372 $MAPWIDGET->connect (activate_console => sub {
… …
2401 $BUTTONBAR->show; 2471 $BUTTONBAR->show;
2402 $SETUP_DIALOG->show; 2472 $SETUP_DIALOG->show;
2403 $MESSAGE_WINDOW->show; 2473 $MESSAGE_WINDOW->show;
2404 } 2474 }
2405 2475
2406 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2407 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2408 2478
2409 $CAVEAT_LABEL->set_text ("None :)"); 2479 $CAVEAT_LABEL->set_text ("None :)");
2410 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2411 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2466 delete $animate_object{$widget}; 2536 delete $animate_object{$widget};
2467} 2537}
2468 2538
2469%SDL_CB = ( 2539%SDL_CB = (
2470 DC::SDL_QUIT => sub { 2540 DC::SDL_QUIT => sub {
2541 crash "SDL_QUIT";
2471 EV::unloop EV::UNLOOP_ALL; 2542 EV::unloop EV::UNLOOP_ALL;
2472 }, 2543 },
2473 DC::SDL_VIDEORESIZE => sub { 2544 DC::SDL_VIDEORESIZE => sub {
2474 }, 2545 },
2475 DC::SDL_VIDEOEXPOSE => sub { 2546 DC::SDL_VIDEOEXPOSE => sub {
… …
2515$SIG{INT} = $SIG{TERM} = sub { 2586$SIG{INT} = $SIG{TERM} = sub {
2516 EV::unloop; 2587 EV::unloop;
2517 #d# TODO calling exit here hangs the process in some futex 2588 #d# TODO calling exit here hangs the process in some futex
2518}; 2589};
2519 2590
2520{ 2591# due to mac os x + sdl combined briandamage, we need this contortion
2592sub main {
2593 {
2521 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522 2595
2523 if (-e "$Deliantra::VARDIR/client.cf") { 2596 if (-e "$Deliantra::VARDIR/client.cf") {
2524 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2597 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2525 } else { 2598 } else {
2526 #TODO: compatibility cruft 2599 #TODO: compatibility cruft
2527 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2600 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2528 print STDERR "INFO: used old configuration file\n"; 2601 print STDERR "INFO: used old configuration file\n";
2529 } 2602 }
2530 2603
2531 DC::DB::Server::run; 2604 DC::DB::Server::run;
2532 2605
2533 if ($CFG->{db_schema} < 1) { 2606 if ($CFG->{db_schema} < 1) {
2534 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2607 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535 DC::DB::nuke_db; 2608 DC::DB::nuke_db;
2536 $CFG->{db_schema} = 1; 2609 $CFG->{db_schema} = 1;
2537 DC::write_cfg; 2610 DC::write_cfg;
2538 } 2611 }
2539 2612
2540 DC::DB::open_db; 2613 DC::DB::open_db;
2541 2614
2542 DC::UI::set_layout ($::CFG->{layout}); 2615 DC::UI::set_layout ($::CFG->{layout});
2543 2616
2544 my %DEF_CFG = ( 2617 my %DEF_CFG = (
2545 sdl_mode => 0, 2618 sdl_mode => undef,
2546 fullscreen => 1, 2619 fullscreen => 1,
2547 fast => 0, 2620 fast => 0,
2548 force_opengl11 => undef, 2621 force_opengl11 => undef,
2549 disable_alpha => 0, 2622 disable_alpha => 0,
2550 smooth_movement => 1, 2623 smooth_movement => 1,
2551 texture_compression => 1, 2624 texture_compression => 1,
2552 map_scale => 1, 2625 map_scale => 1,
2553 fow_enable => 1, 2626 fow_enable => 1,
2554 fow_intensity => 0, 2627 fow_intensity => 0,
2555 map_smoothing => 1, 2628 map_smoothing => 1,
2556 gui_fontsize => 1, 2629 gui_fontsize => 1,
2557 log_fontsize => 0.7, 2630 log_fontsize => 0.7,
2558 gauge_fontsize => 1, 2631 gauge_fontsize => 1,
2559 gauge_size => 0.35, 2632 gauge_size => 0.35,
2560 stat_fontsize => 0.7, 2633 stat_fontsize => 0.7,
2561 mapsize => 100, 2634 mapsize => 100,
2562 audio_enable => 1, 2635 audio_enable => 1,
2563 audio_hw_channels => 0, 2636 audio_hw_channels => 0,
2564 audio_hw_frequency => 0, 2637 audio_hw_frequency => 0,
2565 audio_hw_chunksize => 0, 2638 audio_hw_chunksize => 0,
2566 audio_mix_channels => 8, 2639 audio_mix_channels => 8,
2567 effects_enable => 1, 2640 effects_enable => 1,
2568 effects_volume => 1, 2641 effects_volume => 1,
2569 bgm_enable => 1, 2642 bgm_enable => 1,
2570 bgm_volume => 0.5, 2643 bgm_volume => 0.5,
2571 output_rate => "", 2644 output_rate => "",
2572 pickup => 0, 2645 pickup => 0,
2573 inv_sort => "mtime", 2646 inv_sort => "mtime",
2574 default => "profile", # default profile 2647 default => "profile", # default profile
2575 show_tips => 1, 2648 show_tips => 1,
2576 logview_max_par => 1000, 2649 logview_max_par => 1000,
2577 shift_fire_stop => 0, 2650 shift_fire_stop => 0,
2651 uitheme => "wood",
2578 ); 2652 );
2579 2653
2580 while (my ($k, $v) = each %DEF_CFG) { 2654 while (my ($k, $v) = each %DEF_CFG) {
2581 $CFG->{$k} = $v unless exists $CFG->{$k}; 2655 $CFG->{$k} = $v unless exists $CFG->{$k};
2582 } 2656 }
2583 2657
2584 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2658 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2585 $PROFILE = $CFG->{profile}{default}; 2659 $PROFILE = $CFG->{profile}{default};
2586 2660
2587 # convert old bindings (only default profile matters) 2661 # convert old bindings (only default profile matters)
2588 if (my $bindings = delete $PROFILE->{bindings}) { 2662 if (my $bindings = delete $PROFILE->{bindings}) {
2589 while (my ($mod, $syms) = each %$bindings) { 2663 while (my ($mod, $syms) = each %$bindings) {
2590 while (my ($sym, $cmds) = each %$syms) { 2664 while (my ($sym, $cmds) = each %$syms) {
2591 push @{ $PROFILE->{macro} }, { 2665 push @{ $PROFILE->{macro} }, {
2592 accelkey => [$mod*1, $sym*1], 2666 accelkey => [$mod*1, $sym*1],
2593 action => $cmds, 2667 action => $cmds,
2668 };
2594 }; 2669 }
2595 } 2670 }
2596 } 2671 }
2597 }
2598 2672
2599 sdl_init; 2673 sdl_init;
2600 2674
2601 { 2675 {
2602 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2676 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2603 DejaVuSans.ttf 2677 DejaVuSans.ttf
2604 DejaVuSansMono.ttf 2678 DejaVuSansMono.ttf
2605 DejaVuSans-Bold.ttf 2679 DejaVuSans-Bold.ttf
2606 DejaVuSansMono-Bold.ttf 2680 DejaVuSansMono-Bold.ttf
2607 DejaVuSans-Oblique.ttf 2681 DejaVuSans-Oblique.ttf
2608 DejaVuSansMono-Oblique.ttf 2682 DejaVuSansMono-Oblique.ttf
2609 DejaVuSans-BoldOblique.ttf 2683 DejaVuSans-BoldOblique.ttf
2610 DejaVuSansMono-BoldOblique.ttf 2684 DejaVuSansMono-BoldOblique.ttf
2611 ); 2685 );
2612 2686
2613 DC::add_font $_ for @fonts; 2687 DC::add_font $_ for @fonts;
2614 2688
2615 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2689 $FONT_PROP = new_from_file DC::Font $fonts[0];
2616 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2690 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2617 2691
2618 $FONT_PROP->make_default; 2692 $FONT_PROP->make_default;
2619 2693
2620 DC::pango_init; 2694 DC::pango_init;
2621 } 2695 }
2622 2696
2623# compare mono (ft) vs. rgba (cairo) 2697# compare mono (ft) vs. rgba (cairo)
2624# ft - 1.8s, cairo 3s, even in alpha-only mode 2698# ft - 1.8s, cairo 3s, even in alpha-only mode
2625# for my $rgba (0..1) { 2699# for my $rgba (0..1) {
2626# my $t1 = Time::HiRes::time; 2700# my $t1 = Time::HiRes::time;
… …
2631# } 2705# }
2632# my $t2 = Time::HiRes::time; 2706# my $t2 = Time::HiRes::time;
2633# warn $t2-$t1; 2707# warn $t2-$t1;
2634# } 2708# }
2635 2709
2636 video_init; 2710 video_init;
2637 audio_init; 2711 audio_init;
2638} 2712 }
2639 2713
2640show_tip_of_the_day if $CFG->{show_tips}; 2714 show_tip_of_the_day if $CFG->{show_tips};
2641 2715
2642our $STARTUP_CANCEL = EV::idle sub { 2716 our $STARTUP_CANCEL = EV::idle sub {
2643 undef $::STARTUP_CANCEL; 2717 undef $::STARTUP_CANCEL;
2644 $startup_done->(); 2718 $startup_done->();
2645}; 2719 };
2646 2720
2647delete $SIG{__DIE__}; 2721 delete $SIG{__DIE__};
2648EV::loop; 2722 EV::loop;
2649 2723
2650#video_shutdown; 2724#video_shutdown;
2651#audio_shutdown; 2725#audio_shutdown;
2652DC::OpenGL::quit; 2726 DC::OpenGL::quit;
2653DC::SDL_Quit; 2727 DC::SDL_Quit;
2654DC::DB::Server::stop; 2728 DC::DB::Server::stop;
2729}
2730
2731DC::SDL_braino; # see sub above
2655 2732
2656=head1 NAME 2733=head1 NAME
2657 2734
2658deliantra - A Deliantra MORPG game client 2735deliantra - A Deliantra MORPG game client
2659 2736

Diff Legend

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