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.84 by root, Fri Jan 9 22:38:17 2009 UTC vs.
Revision 1.102 by elmex, Sat Mar 20 00:50:06 2010 UTC

… …
56 56
57 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
58 # pango is relocatable on win32 58 # pango is relocatable on win32
59 } else { 59 } else {
60 # OS X 60 # OS X
61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
63 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
64 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
65 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
66 } 64 }
67 65
68 unshift @INC, $root; 66 unshift @INC, $root;
69 } 67 }
70} 68}
71 69
72# prepend private library directory 70# prepend private library directory and prepare env
73BEGIN { 71BEGIN {
74 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
75 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
76 if (-d $path) { 74 if (-d $path) {
77 unshift @INC, $path; 75 unshift @INC, $path;
… …
136 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
137}; 135};
138 136
139my $MAX_FPS = 60; 137my $MAX_FPS = 60;
140 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
141our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
142 142
143our $LAST_REFRESH; 143our $LAST_REFRESH;
144our $NOW; 144our $NOW;
145 145
… …
166 166
167our $MAP; 167our $MAP;
168our $MAPMAP; 168our $MAPMAP;
169our $MAPWIDGET; 169our $MAPWIDGET;
170our $COMPLETER; 170our $COMPLETER;
171our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
172our $METASERVER; 175our $METASERVER;
173our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
174our $QUIT_DIALOG; 177our $QUIT_DIALOG;
175our $HOST_ENTRY; 178our $HOST_ENTRY;
176our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
202our $FLOORBOX; 205our $FLOORBOX;
203our $GAUGES; 206our $GAUGES;
204our $STATWIDS; 207our $STATWIDS;
205 208
206our $SDL_ACTIVE; 209our $SDL_ACTIVE;
207our %SDL_CB; 210our @SDL_CB;
208 211
209our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
210our $STATUSBOX; 213our $STATUSBOX;
211our $MODBOX; 214our $MODBOX;
212our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
343 or return; 346 or return;
344 347
345 $meta->{data} 348 $meta->{data}
346 or return; 349 or return;
347 350
348 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
349 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
350 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
351 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
352 &audio_music_push ($face); 355 &audio_music_push ($face);
353 } 356 }
354 } else { 357 } else {
355 # fetch from database 358 # fetch from database
356 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
357 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
358 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
359 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
360 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
361 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
362 365
363 audio_sound_push ($face); 366 audio_sound_push ($face);
364 }; 367 };
… …
411 414
412 audio_music_update_volume; 415 audio_music_update_volume;
413 416
414 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
415 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
416 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
417 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
418 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
419 425
420 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
421 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
422 428
… …
535 sub audio_tab_update; 541 sub audio_tab_update;
536 audio_tab_update; 542 audio_tab_update;
537} 543}
538 544
539sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
540 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
541 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
542 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
543 554
544 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
812 823
813 on_connect => sub { 824 on_connect => sub {
814 if ($_[0]) { 825 if ($_[0]) {
815 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
816 827
817 status "login successful"; 828 status "successfully connected to the server";
818 } else { 829 } else {
819 undef $CONN; 830 undef $CONN;
820 status "unable to connect: $!"; 831 status "unable to connect: $!";
821 stop_game(); 832 stop_game();
822 } 833 }
… …
824 ; 835 ;
825} 836}
826 837
827sub start_game { 838sub start_game {
828 status "logging in..."; 839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
829 844
830 $LOGIN_BUTTON->set_text ("Logout"); 845 $LOGIN_BUTTON->set_text ("Logout");
831 $SETUP_DIALOG->hide; 846 $SETUP_DIALOG->hide;
832
833 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
834 847
835 $MAP = new DC::Map; 848 $MAP = new DC::Map;
836 849
837 # hack to make SURE we find the IP address all right 850 # hack to make SURE we find the IP address all right
838 # can be removed once AnyEvent::DNS is proven stable. 851 # can be removed once AnyEvent::DNS is proven stable.
839 if ($host eq "gameserver.deliantra.net") { 852 if ($host eq "gameserver.deliantra.net") {
840 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
841 if ($_[0] ne "80.101.114.108") { # Perl 854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
842 status "dns failure, using hardcoded address"; 858 status "dns failure, using hardcoded address";
843 $host = "129.13.162.95"; 859 $host = "129.13.162.95";
860 }
844 } 861 }
845 862
846 dc_connect $host, $port; 863 dc_connect $host, $port;
847 }; 864 };
848 } else { 865 } else {
… …
915 932
916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
917 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 934 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
918 935
919 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 936 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
937 c_rescale => 1,
920 force_w => $WIDTH * 0.1, expand => 1, 938 force_w => $WIDTH * 0.1, expand => 1,
921 range => [ ($CFG->{sdl_mode}) x 3 ], 939 range => [ ($CFG->{sdl_mode}) x 3 ],
922 tooltip => $vidmode_tooltip); 940 tooltip => $vidmode_tooltip);
923 $hbox->add (my $mode_label = new DC::UI::Label 941 $hbox->add (my $mode_label = new DC::UI::Label
924 height => 0.8, template => "9999x9999@9+9", 942 height => 0.8, template => "9999x9999@9+9",
… …
1016 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1017 . "then disable this option. Changes take effect immdiately.", 1035 . "then disable this option. Changes take effect immdiately.",
1018 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1019 ); 1037 );
1020 1038
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1041 state => $CFG->{smooth_transitions},
1042 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1043 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1044 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1045 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1046 );
1047
1048
1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1022 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
1023 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1024 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1038 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
1039 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
1040 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1068 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1041 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1070 );
1071
1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1073 $table->add_at (1, $row++, new DC::UI::ImageButton
1074 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1075 bg => [0.3, 0.3, 0.2],
1076 force_w => 64,
1077 force_h => 64,
1078 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1079 on_activate => sub {
1080 my ($self) = @_;
1081 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1082 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1083 $MAPWIDGET->update;
1084 }
1042 ); 1085 );
1043 1086
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1045 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
1046 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1098 1141
1099 my $text = !$freq 1142 my $text = !$freq
1100 ? "audio is off" 1143 ? "audio is off"
1101 : "audio is enabled\n" 1144 : "audio is enabled\n"
1102 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1103 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1104 1149
1105 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1106} 1151}
1107 1152
1108sub audio_setup { 1153sub audio_setup {
… …
1248} 1293}
1249 1294
1250sub make_gauge_window { 1295sub make_gauge_window {
1251 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1296 my $gh = int $HEIGHT * $CFG->{gauge_size};
1252 1297
1253 my $win = new DC::UI::Frame ( 1298 $GAUGES->{win} = my $win = new DC::UI::Frame (
1254 force_x => 0, 1299 force_x => 0,
1255 force_y => "max", 1300 force_y => "max",
1256 force_w => $WIDTH, 1301 force_w => $WIDTH,
1257 force_h => $gh, 1302 force_h => $gh,
1258 ); 1303 );
… …
1274 (new DC::UI::Empty expand => 1), 1319 (new DC::UI::Empty expand => 1),
1275 (my $hb = new DC::UI::HBox), 1320 (my $hb = new DC::UI::HBox),
1276 ], 1321 ],
1277 ); 1322 );
1278 1323
1279 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1324 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1280 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1325 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1281 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1326 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1282 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1327 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1283
1284 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1285 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1286 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1287 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1288
1289 $GAUGES = {
1290 exp => $exp, prg => $prg, sklprg => $sklprg,
1291 win => $win, range => $rng,
1292 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1293 };
1294 1328
1295 &set_gauge_window_fontsize; 1329 &set_gauge_window_fontsize;
1296 1330
1297 $win 1331 $win
1298} 1332}
… …
1640 ); 1674 );
1641 1675
1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1676 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1643 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1644 text => $CFG->{profile}{default}{user}, 1678 text => $CFG->{profile}{default}{user},
1645 tooltip => "The name of your character on the server.", 1679 tooltip => "The name of your character on the server. The name is case-sensitive!",
1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1680 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1647 ); 1681 );
1648 1682
1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1683 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1650 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
… …
1752 1786
1753 my $row = 0; 1787 my $row = 0;
1754 1788
1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1789 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1756 $table->add_at (1, $row++, new DC::UI::CheckBox 1790 $table->add_at (1, $row++, new DC::UI::CheckBox
1791 c_colspan => 2,
1757 state => $CFG->{show_tips}, 1792 state => $CFG->{show_tips},
1758 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1793 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1759 on_changed => sub { 1794 on_changed => sub {
1760 my ($self, $value) = @_; 1795 my ($self, $value) = @_;
1761 $CFG->{show_tips} = $value; 1796 $CFG->{show_tips} = $value;
… …
1763 } 1798 }
1764 ); 1799 );
1765 1800
1766 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1801 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1767 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1802 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1803 c_colspan => 2,
1768 text => $CFG->{logview_max_par}, 1804 text => $CFG->{logview_max_par},
1769 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1805 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1770 . "sends more messages than this number, older messages get removed to save memory and " 1806 . "sends more messages than this number, older messages get removed to save memory and "
1771 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1807 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1772 on_changed => sub { 1808 on_changed => sub {
… …
1774 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1810 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1775 0 1811 0
1776 }, 1812 },
1777 ); 1813 );
1778 1814
1815 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1816 $table->add_at (1, $row, new DC::UI::CheckBox
1817 state => $CFG->{config_autosave},
1818 tooltip => "Normally, configuration settings and the user interface layout "
1819 . "are saved on client exit. You can disable this behaviour by "
1820 . "unchecking this checkbox.",
1821 on_changed => sub {
1822 my ($self, $value) = @_;
1823 $CFG->{config_autosave} = $value;
1824 0
1825 }
1826 );
1827 $table->add_at (2, $row++, new DC::UI::Button
1828 text => "Save Now",
1829 tooltip => "Use this to manually save configuration and UI layout when "
1830 . "autosave is disabled.",
1831 on_activate => sub {
1832 DC::write_cfg;
1833 0
1834 }
1835 );
1836
1779 $table 1837 $table
1780} 1838}
1781 1839
1782sub autopickup_setup { 1840sub autopickup_setup {
1783 my $r = new DC::UI::ScrolledWindow ( 1841 my $r = new DC::UI::ScrolledWindow (
… …
1789 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1790 ); 1848 );
1791 1849
1792 for ( 1850 for (
1793 ["General", 0, 0, 1851 ["General", 0, 0,
1794 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1795 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1796 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1797 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1798 ], 1855 ],
1799 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1800 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
… …
1848 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1849 } else { 1906 } else {
1850 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1851 } 1908 }
1852 1909
1853 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1854 if defined $::CONN; 1911 if defined $::CONN;
1855 1912
1856 0 1913 0
1857 }); 1914 });
1858 1915
… …
1875 }); 1932 });
1876 1933
1877 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1878 text => "set", 1935 text => "set",
1879 on_activate => sub { 1936 on_activate => sub {
1880 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1881 if defined $::CONN; 1938 if defined $::CONN;
1882 0 1939 0
1883 }); 1940 });
1884 1941
1885 $r 1942 $r
… …
1998 $PL_NOTEBOOK->set_current_page ($widget); 2055 $PL_NOTEBOOK->set_current_page ($widget);
1999 $PL_WINDOW->show; 2056 $PL_WINDOW->show;
2000 } 2057 }
2001} 2058}
2002 2059
2003sub player_window { 2060sub make_playerbook {
2004 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2061 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2005 x => "center", 2062 x => "center",
2006 y => "center", 2063 y => "center",
2007 force_w => $WIDTH * 9/10, 2064 force_w => $WIDTH * 9/10,
2008 force_h => $HEIGHT * 9/10, 2065 force_h => $HEIGHT * 9/10,
… …
2042 "License, Author and Source info for media sent by the server."); 2099 "License, Author and Source info for media sent by the server.");
2043 2100
2044 $ntb->set_current_page ($INVENTORY_PAGE); 2101 $ntb->set_current_page ($INVENTORY_PAGE);
2045 2102
2046 $plwin->add ($ntb); 2103 $plwin->add ($ntb);
2047 $plwin
2048} 2104}
2049 2105
2050sub keyboard_setup { 2106sub keyboard_setup {
2051 DC::Macro::keyboard_setup 2107 DC::Macro::keyboard_setup
2052} 2108}
2053 2109
2054sub help_window { 2110sub make_help_window {
2055 my $win = new DC::UI::Toplevel 2111 my $win = new DC::UI::Toplevel
2056 x => 'center', 2112 x => 'center',
2057 y => 'center', 2113 y => 'center',
2058 z => 4, 2114 z => 4,
2059 name => 'doc_browser', 2115 name => 'doc_browser',
… …
2148 2204
2149 $load_node->((DC::Pod::find @path)[0]); 2205 $load_node->((DC::Pod::find @path)[0]);
2150 $win->show; 2206 $win->show;
2151 }; 2207 };
2152 2208
2153 $win 2209 $HELP_WINDOW = $win;
2154}
2155
2156sub open_string_query {
2157 my ($title, $cb, $txt, $tooltip) = @_;
2158 my $dialog = new DC::UI::Toplevel
2159 x => "center",
2160 y => "center",
2161 z => 50,
2162 force_w => $WIDTH * 4/5,
2163 title => $title;
2164
2165 $dialog->add (
2166 my $e = new DC::UI::Entry
2167 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2168 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2169 tooltip => $tooltip
2170 );
2171
2172 $e->grab_focus;
2173 $e->set_text ($txt) if $txt;
2174 $dialog->show;
2175} 2210}
2176 2211
2177sub open_quit_dialog { 2212sub open_quit_dialog {
2178 unless ($QUIT_DIALOG) { 2213 unless ($QUIT_DIALOG) {
2179 $QUIT_DIALOG = new DC::UI::Toplevel 2214 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2212 2247
2213 $QUIT_DIALOG->show; 2248 $QUIT_DIALOG->show;
2214 $QUIT_DIALOG->grab_focus; 2249 $QUIT_DIALOG->grab_focus;
2215} 2250}
2216 2251
2252sub make_menubar {
2253 $MENUFRAME = new DC::UI::Toplevel
2254 border => 0,
2255 force_x => 0,
2256 force_y => 0,
2257 force_w => $::WIDTH,
2258 child => ($MENUBAR = new DC::UI::HBox),
2259 ;
2260
2261 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2262
2263 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2264 make_gauge_window->show;
2265
2266# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2267# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2268
2269 make_playerbook;
2270
2271 $MENUPOPUP = DC::UI::Menu->new (items => [
2272 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2273 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2274 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2275 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2276 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2277 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2278 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2279 ["Quit…" , sub {
2280 if ($CONN) {
2281 open_quit_dialog;
2282 } else {
2283 EV::unloop EV::UNLOOP_ALL;
2284 }
2285 }],
2286 ]);
2287
2288 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2289 tooltip => "Shows the main menu",
2290 on_button_down => sub {
2291 my ($self, $ev) = @_;
2292 local $ev->{x} = 0;
2293 local $ev->{y} = 0;
2294 $MENUPOPUP->popup ($ev);
2295 },
2296 );
2297
2298 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2299 padding_x => 6,
2300 padding_y => 3,
2301 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2302 template => " Exp: 888,888,888,888 (lvl 188) ",
2303 );
2304
2305 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2306 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2307 . "will automatically pick up items as defined by your item pickup settings "
2308 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2309 . "disable autopickup by disabling this checkbox.",
2310 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2311 on_changed => sub {
2312 my ($self, $value) = @_;
2313 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2314 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2315 $CONN->send_pickup ($CFG->{pickup})
2316 if $CONN;
2317 },
2318 );
2319
2320 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2321 c_rescale => 1,
2322 padding_x => 6,
2323 padding_y => 3,
2324 force_w => $::WIDTH * 0.2,
2325 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2326 template => "two handed weapons 99%",
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2330 expand => 1,
2331 align => 1, can_hover => 1, can_events => 1,
2332 text => "Range and Combat Slots",
2333 tooltip => "#stat_ranged",
2334 );
2335
2336 $MENUFRAME->show;
2337}
2338
2339sub open_string_query {
2340 my ($title, $cb, $txt, $tooltip) = @_;
2341 my $dialog = new DC::UI::Toplevel
2342 x => "center",
2343 y => "center",
2344 z => 50,
2345 force_w => $WIDTH * 4/5,
2346 title => $title;
2347
2348 $dialog->add (
2349 my $e = new DC::UI::Entry
2350 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2351 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2352 tooltip => $tooltip
2353 );
2354
2355 $e->grab_focus;
2356 $e->set_text ($txt) if $txt;
2357 $dialog->show;
2358}
2359
2217sub show_tip_of_the_day { 2360sub show_tip_of_the_day {
2218 # find all tips 2361 # find all tips
2219 my @tod = DC::Pod::find tip_of_the_day => "*"; 2362 my @tod = DC::Pod::find tip_of_the_day => "*";
2220 2363
2221 DC::DB::get state => "tip_of_the_day", sub { 2364 DC::DB::get state => "tip_of_the_day", sub {
… …
2360 2503
2361 (new DC::UI::Frame 2504 (new DC::UI::Frame
2362 bg => [0, 0, 0, 0.4], 2505 bg => [0, 0, 0, 0.4],
2363 force_x => 0, 2506 force_x => 0,
2364 force_y => "max", 2507 force_y => "max",
2365 child => (my $LR = new DC::UI::VBox), 2508 child => (my $LL = new DC::UI::VBox),
2366 )->show; 2509 )->show;
2367 2510
2368 $LR->add ($STATUSBOX); 2511 $LL->add ($STATUSBOX);
2369 $LR->add ($MODBOX); 2512 $LL->add ($MODBOX);
2370 $LR->add (new DC::UI::Label 2513 $LL->add (new DC::UI::Label
2371 align => 0, 2514 align => 0,
2372 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2515 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2373 fontsize => 0.5, 2516 fontsize => 0.5,
2374 fg => [1, 1, 0, 0.7], 2517 fg => [1, 1, 0, 0.7],
2375 ); 2518 );
2376 2519
2377 DC::UI::Toplevel->new ( 2520 DC::UI::Toplevel->new (
2378 title => "Minimap", 2521 title => "Minimap",
2379 name => "mapmap", 2522 name => "mapmap",
2380 x => 0, 2523 x => 0,
2381 y => $FONTSIZE + 8, 2524 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2382 border_bg => [1, 1, 1, 192/255], 2525 border_bg => [1, 1, 1, 192/255],
2383 bg => [1, 1, 1, 0], 2526 bg => [1, 1, 1, 0],
2384 child => ($MAPMAP = new DC::MapWidget::MapMap 2527 child => ($MAPMAP = new DC::MapWidget::MapMap
2385 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2528 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2386 ), 2529 ),
… …
2415 $METASERVER = metaserver_dialog; 2558 $METASERVER = metaserver_dialog;
2416 # the name is changed to not conflict with the older name as users could have hidden it 2559 # the name is changed to not conflict with the older name as users could have hidden it
2417 $MESSAGE_WINDOW = new DC::UI::Dockbar 2560 $MESSAGE_WINDOW = new DC::UI::Dockbar
2418 name => "message_window2", 2561 name => "message_window2",
2419 title => 'Messages', 2562 title => 'Messages',
2563 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2420 force_w => $::WIDTH * 0.6, 2564 force_w => $::WIDTH * 0.6,
2421 force_h => $::HEIGHT * 0.25, 2565 force_h => $::HEIGHT * 0.25,
2422 ; 2566 ;
2423 2567
2424 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2568 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2444 . "After pressing the combo the binding will be saved automatically and the " 2588 . "After pressing the combo the binding will be saved automatically and the "
2445 . "binding editor closes"); 2589 . "binding editor closes");
2446 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2590 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2447 "Some debuggin' options. Do not ask."); 2591 "Some debuggin' options. Do not ask.");
2448 2592
2449 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2593 make_help_window;
2594 make_menubar;
2450 2595
2451 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2452 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2453
2454# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2455# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2456
2457 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
2458
2459 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2460 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2461
2462 $BUTTONBAR->add (new DC::UI::Button
2463 text => "Save Config",
2464 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2465 on_activate => sub {
2466 $::CFG->{layout} = DC::UI::get_layout;
2467 DC::write_cfg;
2468 status "Configuration Saved";
2469 0
2470 },
2471 );
2472
2473 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2474 tooltip => "View Documentation");
2475
2476 $BUTTONBAR->add (new DC::UI::Button
2477 text => "Quit",
2478 tooltip => "Terminates the program",
2479 on_activate => sub {
2480 if ($CONN) {
2481 open_quit_dialog;
2482 } else {
2483 EV::unloop EV::UNLOOP_ALL;
2484 }
2485 0
2486 },
2487 );
2488
2489 $BUTTONBAR->show;
2490 $SETUP_DIALOG->show; 2596 $SETUP_DIALOG->show;
2491 $MESSAGE_WINDOW->show; 2597 $MESSAGE_WINDOW->show;
2492 } 2598 }
2493 2599
2494 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2600 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2495 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2601 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2496 2602
2497 $CAVEAT_LABEL->set_text ("None :)"); 2603 $CAVEAT_LABEL->set_text ("None :)");
2604 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2605 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2498 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2606 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2499 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2607 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2500 2608
2501 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2609 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2502} 2610}
… …
2530my $want_refresh = EV::prepare_ns \&force_refresh; 2638my $want_refresh = EV::prepare_ns \&force_refresh;
2531 2639
2532my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2640my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2533 $NOW = EV::now; 2641 $NOW = EV::now;
2534 2642
2535 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2643 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2536 for DC::poll_events; 2644 for DC::poll_events;
2537 2645
2538 if (%animate_object) { 2646 if (%animate_object) {
2539 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2647 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2540 $WANT_REFRESH = 1; 2648 $WANT_REFRESH = 1;
… …
2552sub animation_stop { 2660sub animation_stop {
2553 my ($widget) = @_; 2661 my ($widget) = @_;
2554 delete $animate_object{$widget}; 2662 delete $animate_object{$widget};
2555} 2663}
2556 2664
2557%SDL_CB = (
2558 DC::SDL_QUIT => sub { 2665$SDL_CB[DC::SDL_QUIT] = sub {
2559 crash "SDL_QUIT"; 2666 crash "SDL_QUIT";
2560 EV::unloop EV::UNLOOP_ALL; 2667 EV::unloop EV::UNLOOP_ALL;
2561 }, 2668};
2562 DC::SDL_VIDEORESIZE => sub { 2669$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2563 },
2564 DC::SDL_VIDEOEXPOSE => sub { 2670$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2565 DC::UI::full_refresh; 2671 DC::UI::full_refresh;
2566 }, 2672};
2567 DC::SDL_ACTIVEEVENT => sub { 2673$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2568# not useful, as APPACTIVE includes only iconified state, not unmapped 2674# not useful, as APPACTIVE includes only iconified state, not unmapped
2569# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2675# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2570# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2676# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2571# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2677# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2572# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2678# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2573# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2679# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2574 }, 2680};
2575 DC::SDL_KEYDOWN => sub { 2681$SDL_CB[DC::SDL_KEYDOWN] = sub {
2576 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2682 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2577 # alt-enter 2683 # alt-enter
2578 video_shutdown; 2684 video_shutdown;
2579 $FULLSCREEN_ENABLE->toggle; 2685 $FULLSCREEN_ENABLE->toggle;
2580 video_init; 2686 video_init;
2581 } else { 2687 } else {
2582 &DC::UI::feed_sdl_key_down_event; 2688 &DC::UI::feed_sdl_key_down_event;
2583 } 2689 }
2584 update_modbox; 2690 update_modbox;
2585 }, 2691};
2586 DC::SDL_KEYUP => sub { 2692$SDL_CB[DC::SDL_KEYUP] = sub {
2587 &DC::UI::feed_sdl_key_up_event; 2693 &DC::UI::feed_sdl_key_up_event;
2588 update_modbox; 2694 update_modbox;
2589 }, 2695};
2590 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2696$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2591 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2592 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2698$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2593 DC::SDL_USEREVENT => sub { 2699$SDL_CB[DC::SDL_USEREVENT] = sub {
2594 if ($_[0]{code} == 1) { 2700 if ($_[0]{code} == 1) {
2595 audio_channel_finished $_[0]{data1}; 2701 audio_channel_finished $_[0]{data1};
2596 } elsif ($_[0]{code} == 0) { 2702 } elsif ($_[0]{code} == 0) {
2597 audio_music_finished; 2703 audio_music_finished;
2598 }
2599 }, 2704 }
2600); 2705};
2601 2706
2602############################################################################# 2707#############################################################################
2603 2708
2604$SIG{INT} = $SIG{TERM} = sub { 2709$SIG{INT} = $SIG{TERM} = sub {
2605 EV::unloop; 2710 EV::unloop;
… …
2631 DC::DB::open_db; 2736 DC::DB::open_db;
2632 2737
2633 DC::UI::set_layout ($::CFG->{layout}); 2738 DC::UI::set_layout ($::CFG->{layout});
2634 2739
2635 my %DEF_CFG = ( 2740 my %DEF_CFG = (
2741 config_autosave => 1,
2636 sdl_mode => undef, 2742 sdl_mode => undef,
2637 fullscreen => 1, 2743 fullscreen => 1,
2638 fast => 0, 2744 fast => 0,
2639 force_opengl11 => undef, 2745 force_opengl11 => undef,
2640 disable_alpha => 0, 2746 disable_alpha => 0,
2641 smooth_movement => 1, 2747 smooth_movement => 1,
2748 smooth_transitions => 1,
2642 texture_compression => 1, 2749 texture_compression => 1,
2643 map_scale => 1, 2750 map_scale => 1,
2644 fow_enable => 1, 2751 fow_enable => 1,
2645 fow_intensity => 0, 2752 fow_intensity => 0,
2753 fow_texture => 0,
2646 map_smoothing => 1, 2754 map_smoothing => 1,
2647 gui_fontsize => 1, 2755 gui_fontsize => 1,
2648 log_fontsize => 0.7, 2756 log_fontsize => 0.7,
2649 gauge_fontsize => 1, 2757 gauge_fontsize => 1,
2650 gauge_size => 0.35, 2758 gauge_size => 0.35,
… …
2658 effects_enable => 1, 2766 effects_enable => 1,
2659 effects_volume => 1, 2767 effects_volume => 1,
2660 bgm_enable => 1, 2768 bgm_enable => 1,
2661 bgm_volume => 0.5, 2769 bgm_volume => 0.5,
2662 output_rate => "", 2770 output_rate => "",
2663 pickup => 0, 2771 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2664 inv_sort => "mtime", 2772 inv_sort => "mtime",
2665 default => "profile", # default profile 2773 default => "profile", # default profile
2666 show_tips => 1, 2774 show_tips => 1,
2667 logview_max_par => 1000, 2775 logview_max_par => 1000,
2668 shift_fire_stop => 0, 2776 shift_fire_stop => 0,
2669 uitheme => "wood", 2777 uitheme => "wood",
2670 ); 2778 map_shift_x => -24, # arbitrary
2779 map_shift_y => +24, # arbitrary
2671 2780 );
2781
2672 while (my ($k, $v) = each %DEF_CFG) { 2782 while (my ($k, $v) = each %DEF_CFG) {
2673 $CFG->{$k} = $v unless exists $CFG->{$k}; 2783 $CFG->{$k} = $v unless exists $CFG->{$k};
2674 } 2784 }
2675 2785
2676 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2786 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2677 $PROFILE = $CFG->{profile}{default}; 2787 $PROFILE = $CFG->{profile}{default};
2788
2789 $PROFILE->{host} = $ARGV[0] if @ARGV > 0;
2790 $PROFILE->{user} = $ARGV[1] if @ARGV > 1;
2791 $PROFILE->{password} = $ARGV[2] if @ARGV > 2;
2678 2792
2679 # convert old bindings (only default profile matters) 2793 # convert old bindings (only default profile matters)
2680 if (my $bindings = delete $PROFILE->{bindings}) { 2794 if (my $bindings = delete $PROFILE->{bindings}) {
2681 while (my ($mod, $syms) = each %$bindings) { 2795 while (my ($mod, $syms) = each %$bindings) {
2682 while (my ($sym, $cmds) = each %$syms) { 2796 while (my ($sym, $cmds) = each %$syms) {
… …
2688 } 2802 }
2689 } 2803 }
2690 2804
2691 sdl_init; 2805 sdl_init;
2692 2806
2807 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2808 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2809
2693 { 2810 {
2694 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2811 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2695 DejaVuSans.ttf 2812 DejaVuSans.ttf
2696 DejaVuSansMono.ttf 2813 DejaVuSansMono.ttf
2697 DejaVuSans-Bold.ttf 2814 DejaVuSans-Bold.ttf
2698 DejaVuSansMono-Bold.ttf 2815 DejaVuSansMono-Bold.ttf
2699 DejaVuSans-Oblique.ttf 2816 DejaVuSans-Oblique.ttf
2700 DejaVuSansMono-Oblique.ttf 2817 DejaVuSansMono-Oblique.ttf
2701 DejaVuSans-BoldOblique.ttf 2818 DejaVuSans-BoldOblique.ttf
2702 DejaVuSansMono-BoldOblique.ttf 2819 DejaVuSansMono-BoldOblique.ttf
2820 mona.ttf
2703 ); 2821 );
2704 2822
2705 DC::add_font $_ for @fonts; 2823 DC::add_font $_ for @fonts;
2706 2824
2707 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2825 $FONT_PROP = new_from_file DC::Font $fonts[0];
2708 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2826 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2709 2827
2710 $FONT_PROP->make_default; 2828 $FONT_PROP->make_default;
2711 2829
… …
2737 }; 2855 };
2738 2856
2739 delete $SIG{__DIE__}; 2857 delete $SIG{__DIE__};
2740 EV::loop; 2858 EV::loop;
2741 2859
2860 DC::write_cfg if $CFG->{config_autosave};
2861
2742#video_shutdown; 2862 #video_shutdown;
2743#audio_shutdown; 2863 #audio_shutdown;
2864
2744 DC::OpenGL::quit; 2865 DC::OpenGL::quit;
2745 DC::SDL_Quit; 2866 DC::SDL_Quit;
2746 DC::DB::Server::stop; 2867 DC::DB::Server::stop;
2747} 2868}
2748 2869

Diff Legend

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