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.94 by root, Sun Mar 29 22:28:13 2009 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 );
25
22 # initialise the resolver now, as vista forces us back to the desktop 26 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this. 27 # when doing this later.
24 use AnyEvent::DNS (); 28 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver; 29 AnyEvent::DNS::resolver;
26
27 Win32::GUI::SplashScreen::Show (
28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
29 );
30 30
31 $startup_done = sub { 31 $startup_done = sub {
32 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
33 }; 33 };
34 } 34 }
35} 35}
36 36
37use strict; 37use common::sense;
38use utf8;
39 38
40use Carp 'verbose'; 39use Carp 'verbose';
41 40
42# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
43BEGIN { 42BEGIN {
… …
134 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
135}; 134};
136 135
137my $MAX_FPS = 60; 136my $MAX_FPS = 60;
138 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
139our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
140 141
141our $LAST_REFRESH; 142our $LAST_REFRESH;
142our $NOW; 143our $NOW;
143 144
144our $CFG; 145our $CFG;
145our $PROFILE; # current profile 146our $PROFILE; # current profile
146our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
147 149
148our $WANT_REFRESH; 150our $WANT_REFRESH;
149 151
150our $MODE_SLIDER; 152our $MODE_SLIDER;
151our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
539 sub audio_tab_update; 541 sub audio_tab_update;
540 audio_tab_update; 542 audio_tab_update;
541} 543}
542 544
543sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
544 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
545 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
546 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
547 554
548 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
800 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
801 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
802 mapw => $mapw, 809 mapw => $mapw,
803 maph => $maph, 810 maph => $maph,
804 811
812 c_version => {
813 client => "deliantra",
805 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
806 818
807 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
808 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
809 map => $MAP, 821 map => $MAP,
810 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
… …
828 ; 840 ;
829} 841}
830 842
831sub start_game { 843sub start_game {
832 status "logging in..."; 844 status "logging in...";
845
846 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
847 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
848 or return status "$server: unable to parse server address, try an empty field.";
833 849
834 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
835 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
836
837 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
838 852
839 $MAP = new DC::Map; 853 $MAP = new DC::Map;
840 854
841 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
842 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
843 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
844 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
845 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # P-e-r-l
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
846 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
847 $host = "129.13.162.95"; 864 $host = "194.126.175.154";
865 }
848 } 866 }
849 867
850 dc_connect $host, $port; 868 dc_connect $host, $port;
851 }; 869 };
852 } else { 870 } else {
… …
1021 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1039 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1022 . "then disable this option. Changes take effect immdiately.", 1040 . "then disable this option. Changes take effect immdiately.",
1023 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1024 ); 1042 );
1025 1043
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{smooth_transitions},
1047 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1048 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1049 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1050 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1051 );
1052
1053
1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1027 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
1028 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1029 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1058 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1043 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
1044 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
1045 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1073 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1046 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1075 );
1076
1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1078 $table->add_at (1, $row++, new DC::UI::ImageButton
1079 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1080 bg => [0.3, 0.3, 0.2],
1081 force_w => 64,
1082 force_h => 64,
1083 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.",
1084 on_activate => sub {
1085 my ($self) = @_;
1086 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1087 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1088 $MAPWIDGET->update;
1089 }
1047 ); 1090 );
1048 1091
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1102 ]); 1145 ]);
1103 1146
1104 my $text = !$freq 1147 my $text = !$freq
1105 ? "audio is off" 1148 ? "audio is off"
1106 : "audio is enabled\n" 1149 : "audio is enabled\n"
1150 . "driver: " . DC::SDL_AudioDriverName . "\n"
1107 . "frequency (Hz): $freq\n" 1151 . "frequency (Hz): $freq\n"
1108 . "channels: $chans"; 1152 . "channels: $chans\n"
1153 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1154 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1109 1155
1110 $AUDIO_INFO->set_text ($text); 1156 $AUDIO_INFO->set_text ($text);
1111} 1157}
1112 1158
1113sub audio_setup { 1159sub audio_setup {
… …
1142 ); 1188 );
1143 1189
1144 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1190 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1145 $table->add_at (1, $row, new DC::UI::CheckBox 1191 $table->add_at (1, $row, new DC::UI::CheckBox
1146 expand => 1, state => $CFG->{bgm_enable}, 1192 expand => 1, state => $CFG->{bgm_enable},
1147 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1193 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1148 on_changed => sub { 1194 on_changed => sub {
1149 $CFG->{bgm_enable} = $_[1]; 1195 $CFG->{bgm_enable} = $_[1];
1150 $CONN->update_fx_want if $CONN; 1196 $CONN->update_fx_want if $CONN;
1151 audio_music_push; 1197 audio_music_push;
1152 1 1198 1
… …
1289 &set_gauge_window_fontsize; 1335 &set_gauge_window_fontsize;
1290 1336
1291 $win 1337 $win
1292} 1338}
1293 1339
1340our $BW_WATCHER;
1341
1342sub debug_toggle($) {
1343 $DELIANTRA_DEBUG ^= $_[0];
1344
1345 if ($DELIANTRA_DEBUG & 16) {
1346 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1347 return unless $CONN;
1348 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1349 $CONN->{octets_in} = 0;
1350 };
1351 } else {
1352 undef $BW_WATCHER;
1353 }
1354
1355}
1356
1294sub debug_setup { 1357sub debug_setup {
1295 my $table = new DC::UI::Table; 1358 my $table = new DC::UI::Table;
1296 1359
1297 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1360 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1298 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1361 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1299 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1362 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1300 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1363 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1301 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1364 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1302 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1365 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1303 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1366 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1304 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1367 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1368 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1369 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1370
1305 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1371 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1306
1307 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1372 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1308 1373
1309 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1374 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1310 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1375 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1311 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1376 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1312 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1377 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1633 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1698 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1634 ); 1699 );
1635 1700
1636 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1701 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1637 $table->add_at (1, 4, new DC::UI::Entry 1702 $table->add_at (1, 4, new DC::UI::Entry
1638 text => $CFG->{profile}{default}{user}, 1703 text => $PROFILE->{user},
1639 tooltip => "The name of your character on the server. The name is case-sensitive!", 1704 tooltip => "The name of your character on the server. The name is case-sensitive!",
1640 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1705 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1641 ); 1706 );
1642 1707
1643 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1708 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1644 $table->add_at (1, 5, new DC::UI::Entry 1709 $table->add_at (1, 5, new DC::UI::Entry
1645 text => $CFG->{profile}{default}{password}, 1710 text => $PROFILE->{password},
1646 hidden => 1, 1711 hidden => 1,
1647 tooltip => "The password for your character.", 1712 tooltip => "The password for your character.",
1648 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1713 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1649 ); 1714 );
1650 1715
1651 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1716 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1652 expand => 1, 1717 expand => 1,
1653 text => "Login / Register", 1718 text => "Login / Register",
… …
1689 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1754 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1690 1755
1691 $vbox->add ( 1756 $vbox->add (
1692 $HOST_ENTRY = new DC::UI::Entry 1757 $HOST_ENTRY = new DC::UI::Entry
1693 expand => 1, 1758 expand => 1,
1694 text => $CFG->{profile}{default}{host}, 1759 text => $PROFILE->{host},
1695 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1760 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1696 on_changed => sub { 1761 on_changed => sub {
1697 my ($self, $value) = @_; 1762 my ($self, $value) = @_;
1698 $CFG->{profile}{default}{host} = $value; 1763 $PROFILE->{host} = $value;
1699 1 1764 1
1700 } 1765 }
1701 ); 1766 );
1702 1767
1703 if (0) { #d# disabled 1768 if (0) { #d# disabled
… …
1902 $r 1967 $r
1903} 1968}
1904 1969
1905my %SORT_ORDER = ( 1970my %SORT_ORDER = (
1906 type => sub { 1971 type => sub {
1972 use sort 'stable';
1907 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1973 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1908 }, 1974 },
1909 mtime => sub { 1975 mtime => sub {
1976 use sort 'stable';
1910 my $NOW = time; 1977 my $NOW = time;
1911 sort { 1978 sort {
1912 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1979 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1913 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1980 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1914 1981
1915 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1982 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1916 or $btime <=> $atime 1983 or $btime <=> $atime
1917 or $a->{type} <=> $b->{type} 1984 or $a->{type} <=> $b->{type}
1918 } @_ 1985 } @_
1919 }, 1986 },
1920 weight => sub { sort { 1987 weight => sub {
1988 use sort 'stable';
1989 sort {
1921 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1990 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1922 or $a->{type} <=> $b->{type} 1991 or $a->{type} <=> $b->{type}
1923 } @_ }, 1992 } @_
1993 },
1924); 1994);
1925 1995
1926sub inventory_widget { 1996sub inventory_widget {
1927 my $hb = new DC::UI::HBox homogeneous => 1; 1997 my $hb = new DC::UI::HBox homogeneous => 1;
1928 1998
… …
2442 2512
2443 $DEBUG_STATUS = new DC::UI::Label 2513 $DEBUG_STATUS = new DC::UI::Label
2444 padding => 0, 2514 padding => 0,
2445 z => 100, 2515 z => 100,
2446 force_x => "max", 2516 force_x => "max",
2447 force_y => 0; 2517 force_y => 20;
2448 $DEBUG_STATUS->show; 2518 $DEBUG_STATUS->show;
2449 2519
2450 $STATUSBOX = new DC::UI::Statusbox; 2520 $STATUSBOX = new DC::UI::Statusbox;
2451 2521
2452 $MODBOX = new DC::UI::Label 2522 $MODBOX = new DC::UI::Label
… …
2559 2629
2560 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2630 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2561 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2631 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2562 2632
2563 $CAVEAT_LABEL->set_text ("None :)"); 2633 $CAVEAT_LABEL->set_text ("None :)");
2634 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2635 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2564 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2636 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2565 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2637 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2566 2638
2567 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2639 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2568} 2640}
… …
2578my $animate_timer; 2650my $animate_timer;
2579 2651
2580my $fps = 9; 2652my $fps = 9;
2581 2653
2582sub force_refresh { 2654sub force_refresh {
2583 if ($ENV{CFPLUS_DEBUG} & 4) { 2655 if ($DELIANTRA_DEBUG & 4) {
2584 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2656 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2585 debug sprintf "%3.2f", $fps; 2657 debug sprintf "%3.2f", $fps;
2586 } 2658 }
2587 2659
2588 undef $WANT_REFRESH; 2660 undef $WANT_REFRESH;
… …
2701 fullscreen => 1, 2773 fullscreen => 1,
2702 fast => 0, 2774 fast => 0,
2703 force_opengl11 => undef, 2775 force_opengl11 => undef,
2704 disable_alpha => 0, 2776 disable_alpha => 0,
2705 smooth_movement => 1, 2777 smooth_movement => 1,
2778 smooth_transitions => 1,
2706 texture_compression => 1, 2779 texture_compression => 1,
2707 map_scale => 1, 2780 map_scale => 1,
2708 fow_enable => 1, 2781 fow_enable => 1,
2709 fow_intensity => 0, 2782 fow_intensity => 0,
2783 fow_texture => 0,
2710 map_smoothing => 1, 2784 map_smoothing => 1,
2711 gui_fontsize => 1, 2785 gui_fontsize => 1,
2712 log_fontsize => 0.7, 2786 log_fontsize => 0.7,
2713 gauge_fontsize => 1, 2787 gauge_fontsize => 1,
2714 gauge_size => 0.35, 2788 gauge_size => 0.35,
… …
2732 shift_fire_stop => 0, 2806 shift_fire_stop => 0,
2733 uitheme => "wood", 2807 uitheme => "wood",
2734 map_shift_x => -24, # arbitrary 2808 map_shift_x => -24, # arbitrary
2735 map_shift_y => +24, # arbitrary 2809 map_shift_y => +24, # arbitrary
2736 ); 2810 );
2737 2811
2738 while (my ($k, $v) = each %DEF_CFG) { 2812 while (my ($k, $v) = each %DEF_CFG) {
2739 $CFG->{$k} = $v unless exists $CFG->{$k}; 2813 $CFG->{$k} = $v unless exists $CFG->{$k};
2740 } 2814 }
2741 2815
2742 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2816 my @args = @ARGV;
2817
2818 my $profile = 'default';
2819
2820 for (my $i = 0; $i < @args; $i++) {
2821 if ($args[$i] =~ /^--?profile$/) {
2822 $profile = $args[$i + 1];
2823 splice @args, $i, 2, ();
2824 $i = 0;
2825 } elsif ($args[$i] =~ /^--?h/) {
2826 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2827 exit 0;
2828 }
2829 }
2830
2831 $CFG->{profile}{$profile} ||= {};
2743 $PROFILE = $CFG->{profile}{default}; 2832 $PROFILE = $CFG->{profile}{$profile};
2833 $PROFILE->{host} ||= "gameserver.deliantra.net";
2834
2835 $PROFILE->{host} = $args[0] if @args > 0;
2836 $PROFILE->{user} = $args[1] if @args > 1;
2837 $PROFILE->{password} = $args[2] if @args > 2;
2744 2838
2745 # convert old bindings (only default profile matters) 2839 # convert old bindings (only default profile matters)
2746 if (my $bindings = delete $PROFILE->{bindings}) { 2840 if (my $bindings = delete $PROFILE->{bindings}) {
2747 while (my ($mod, $syms) = each %$bindings) { 2841 while (my ($mod, $syms) = each %$bindings) {
2748 while (my ($sym, $cmds) = each %$syms) { 2842 while (my ($sym, $cmds) = each %$syms) {
… …
2771 DejaVuSansMono-BoldOblique.ttf 2865 DejaVuSansMono-BoldOblique.ttf
2772 mona.ttf 2866 mona.ttf
2773 ); 2867 );
2774 2868
2775 DC::add_font $_ for @fonts; 2869 DC::add_font $_ for @fonts;
2776 2870
2777 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2871 $FONT_PROP = new_from_file DC::Font $fonts[0];
2778 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2872 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2779 2873
2780 $FONT_PROP->make_default; 2874 $FONT_PROP->make_default;
2781 2875
… …
2804 our $STARTUP_CANCEL = EV::idle sub { 2898 our $STARTUP_CANCEL = EV::idle sub {
2805 undef $::STARTUP_CANCEL; 2899 undef $::STARTUP_CANCEL;
2806 $startup_done->(); 2900 $startup_done->();
2807 }; 2901 };
2808 2902
2903 debug_toggle 0;
2904
2809 delete $SIG{__DIE__}; 2905 delete $SIG{__DIE__};
2810 EV::loop; 2906 EV::loop;
2811 2907
2812 DC::write_cfg if $CFG->{config_autosave}; 2908 DC::write_cfg if $CFG->{config_autosave};
2813 2909
… …
2825 2921
2826deliantra - A Deliantra MORPG game client 2922deliantra - A Deliantra MORPG game client
2827 2923
2828=head1 SYNOPSIS 2924=head1 SYNOPSIS
2829 2925
2830Just run it - no commandline arguments are supported. 2926 deliantra [--profile name] [host [user [password]]]
2927 deliantra --help
2831 2928
2832=head1 USAGE 2929=head1 USAGE
2833 2930
2834deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2931The deliantra client utilises OpenGL for all UI elements and the game. It
2835be used in fullscreen mode and interactively. 2932is supposed to be used in fullscreen mode and interactively.
2836 2933
2837=head1 DEBUGGING 2934=head1 DEBUGGING
2838 2935
2839
2840CFPLUS_DEBUG - environment variable 2936DELIANTRA_DEBUG - environment variable
2841 2937
2842 1 draw borders around widgets 2938 1 draw borders around widgets
2843 2 add low-level widget info to tooltips 2939 2 add low-level widget info to tooltips
2844 4 show fps 2940 4 show fps
2845 8 suppress tooltips 2941 8 suppress tooltips
2942 16 show bandwidth downstream
2846 2943
2847=head1 AUTHOR 2944=head1 AUTHOR
2848 2945
2849Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2946Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2850 2947

Diff Legend

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