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.100 by root, Tue Dec 22 01:37:42 2009 UTC vs.
Revision 1.117 by root, Tue Aug 31 14:31:50 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 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
27 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
29 ); 24 );
25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 require AnyEvent::DNS;
29 AnyEvent::DNS::resolver ();
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 {
… …
144our $NOW; 143our $NOW;
145 144
146our $CFG; 145our $CFG;
147our $PROFILE; # current profile 146our $PROFILE; # current profile
148our $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;
149 149
150our $WANT_REFRESH; 150our $WANT_REFRESH;
151 151
152our $MODE_SLIDER; 152our $MODE_SLIDER;
153our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
518 audio_music_push; 518 audio_music_push;
519} 519}
520 520
521sub audio_init { 521sub audio_init {
522 if ($CFG->{audio_enable}) { 522 if ($CFG->{audio_enable}) {
523 if (length $CFG->{audio_driver}) {
524 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
525 DC::SDL_Init DC::SDL_INIT_AUDIO
526 and die "SDL::Init failed!\n";
527 } else {
528 DC::SDL_Init DC::SDL_INIT_AUDIO
529 and die "SDL::Init failed!\n";
530 }
531
523 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
524 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
525 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
526 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
527 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
… …
541 sub audio_tab_update; 550 sub audio_tab_update;
542 audio_tab_update; 551 audio_tab_update;
543} 552}
544 553
545sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
546 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
547 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
548 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
549 563
550 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
551 @MUSIC_JINGLE = (); 565 @MUSIC_JINGLE = ();
552 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
553 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
554 568
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
557 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
558 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
559} 573}
560 574
561############################################################################# 575#############################################################################
562 576
563sub destroy_query_dialog { 577sub destroy_query_dialog {
… …
804 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
805 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
806 mapw => $mapw, 820 mapw => $mapw,
807 maph => $maph, 821 maph => $maph,
808 822
823 c_version => {
824 client => "deliantra",
809 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
810 829
811 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
812 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
813 map => $MAP, 832 map => $MAP,
814 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
… …
846 865
847 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
848 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
849 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
850 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
851 if ($_[0] ne "80.101.114.108") { # Perl 870 if ($_[0] ne "80.101.114.108") { # P-e-r-l
852 status "dns failure, trying differently"; 871 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" }; 872 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) { 873 unless (defined $host) {
855 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
856 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
857 } 876 }
858 } 877 }
859 878
860 dc_connect $host, $port; 879 dc_connect $host, $port;
861 }; 880 };
… …
1137 ]); 1156 ]);
1138 1157
1139 my $text = !$freq 1158 my $text = !$freq
1140 ? "audio is off" 1159 ? "audio is off"
1141 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1142 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1143 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1144 1166
1145 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1146} 1168}
1147 1169
1148sub audio_setup { 1170sub audio_setup {
… …
1151 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1173 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
1152 1174
1153 my $row = 0; 1175 my $row = 0;
1154 1176
1155 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable"); 1177 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
1156 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1157 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1158 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1180 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
1159 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1181 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
1182 );
1183 $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
1184
1185 $driver->add (new DC::UI::Label align => 1, text => " Audio driver override");
1186 $driver->add (new DC::UI::Entry
1187 text => $CFG->{audio_driver},
1188 template => "dsound1234",
1189 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1190 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1191 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1192 . "or other system-specific drivers. Selecting the wrong driver here will simply result"
1193 . "in no sound.",
1194 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1160 ); 1195 );
1161 1196
1162 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1197 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
1163 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1164 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
… …
1177 ); 1212 );
1178 1213
1179 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1214 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1180 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1181 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1182 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1217 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1183 on_changed => sub { 1218 on_changed => sub {
1184 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1185 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1186 audio_music_push; 1221 audio_music_push;
1187 1 1222 1
… …
1198 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1199 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1200 options => [ 1235 options => [
1201 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1202 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1203 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1204 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1205 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1206 ], 1241 ],
1207 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1242 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1208 on_changed => sub { 1243 on_changed => sub {
1209 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1210 audio_tab_update; 1245 audio_tab_update;
… …
1234 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency"); 1269 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1235 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1270 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1236 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1237 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1238 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1273 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1239 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1240 on_changed => sub { 1275 on_changed => sub {
1241 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1242 audio_tab_update; 1277 audio_tab_update;
1243 1 1278 1
1244 } 1279 }
… …
1324 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1325 1360
1326 $win 1361 $win
1327} 1362}
1328 1363
1364our $BW_WATCHER;
1365
1366sub debug_toggle($) {
1367 $DELIANTRA_DEBUG ^= $_[0];
1368
1369 if ($DELIANTRA_DEBUG & 16) {
1370 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1371 return unless $CONN;
1372 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1373 $CONN->{octets_in} = 0;
1374 };
1375 } else {
1376 undef $BW_WATCHER;
1377 }
1378
1379}
1380
1329sub debug_setup { 1381sub debug_setup {
1330 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1331 1383
1332 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1384 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1333 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1385 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1334 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1386 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1335 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1387 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1336 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1388 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1337 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1389 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1338 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1390 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1339 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1391 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1392 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1393 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1394
1340 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1395 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1341
1342 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1396 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1343 1397
1344 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1398 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1345 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1399 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1346 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1400 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1347 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1401 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1468 para => ["Paralysation", 1522 para => ["Paralysation",
1469 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1523 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1470 deat => ["Death", 1524 deat => ["Death",
1471 "<b>Death</b> (resistance against death spells)"], 1525 "<b>Death</b> (resistance against death spells)"],
1472 phys => ["Physical", 1526 phys => ["Physical",
1473 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"], 1527 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed as the 'Arm' secondary stat.)"],
1474 blind => ["Blind", 1528 blind => ["Blind",
1475 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1529 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1476 fear => ["Fear", 1530 fear => ["Fear",
1477 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"], 1531 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1478 tund => ["Turn undead", 1532 tund => ["Turn undead",
… …
1668 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1722 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1669 ); 1723 );
1670 1724
1671 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1725 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1672 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1673 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1674 tooltip => "The name of your character on the server. The name is case-sensitive!", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1675 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1676 ); 1730 );
1677 1731
1678 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1732 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1679 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1680 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1681 hidden => 1, 1735 hidden => 1,
1682 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1683 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1684 ); 1738 );
1685 1739
1686 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1687 expand => 1, 1741 expand => 1,
1688 text => "Login / Register", 1742 text => "Login / Register",
… …
1724 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1725 1779
1726 $vbox->add ( 1780 $vbox->add (
1727 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1728 expand => 1, 1782 expand => 1,
1729 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1730 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1784 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1731 on_changed => sub { 1785 on_changed => sub {
1732 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1733 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1734 1 1788 1
1735 } 1789 }
1736 ); 1790 );
1737 1791
1738 if (0) { #d# disabled 1792 if (0) { #d# disabled
… …
1937 $r 1991 $r
1938} 1992}
1939 1993
1940my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1941 type => sub { 1995 type => sub {
1996 use sort 'stable';
1942 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1943 }, 1998 },
1944 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1945 my $NOW = time; 2001 my $NOW = time;
1946 sort { 2002 sort {
1947 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 2003 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1948 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 2004 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1949 2005
1950 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1951 or $btime <=> $atime 2007 or $btime <=> $atime
1952 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1953 } @_ 2009 } @_
1954 }, 2010 },
1955 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1956 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1957 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1958 } @_ }, 2016 } @_
2017 },
1959); 2018);
1960 2019
1961sub inventory_widget { 2020sub inventory_widget {
1962 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1963 2022
… …
2404 2463
2405 $dialog->show; 2464 $dialog->show;
2406 }; 2465 };
2407} 2466}
2408 2467
2409sub sdl_init {
2410 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2411 and die "SDL::Init failed!\n";
2412}
2413
2414sub video_init { 2468sub video_init {
2415 DC::set_theme $CFG->{uitheme}; 2469 DC::set_theme $CFG->{uitheme};
2416 2470
2417 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2418 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
… …
2477 2531
2478 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2479 padding => 0, 2533 padding => 0,
2480 z => 100, 2534 z => 100,
2481 force_x => "max", 2535 force_x => "max",
2482 force_y => 0; 2536 force_y => 20;
2483 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2484 2538
2485 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2486 2540
2487 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
… …
2615my $animate_timer; 2669my $animate_timer;
2616 2670
2617my $fps = 9; 2671my $fps = 9;
2618 2672
2619sub force_refresh { 2673sub force_refresh {
2620 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2621 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2675 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2622 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2623 } 2677 }
2624 2678
2625 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
… …
2771 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2772 uitheme => "wood", 2826 uitheme => "wood",
2773 map_shift_x => -24, # arbitrary 2827 map_shift_x => -24, # arbitrary
2774 map_shift_y => +24, # arbitrary 2828 map_shift_y => +24, # arbitrary
2775 ); 2829 );
2776 2830
2777 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2778 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2779 } 2833 }
2780 2834
2781 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2836
2837 # OS X passes some process serial number of other shit. they
2838 # could have used an env var or any other sane mechanism. but
2839 # would it be os x then? no...
2840 shift @args if $args[0] =~ /^-psn_/;
2841
2842 my $profile = 'default';
2843
2844 for (my $i = 0; $i < @args; $i++) {
2845 if ($args[$i] =~ /^--?profile$/) {
2846 $profile = $args[$i + 1];
2847 splice @args, $i, 2, ();
2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2852 }
2853 }
2854
2855 $CFG->{profile}{$profile} ||= {};
2782 $PROFILE = $CFG->{profile}{default}; 2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2858
2859 $PROFILE->{host} = $args[0] if @args > 0;
2860 $PROFILE->{user} = $args[1] if @args > 1;
2861 $PROFILE->{password} = $args[2] if @args > 2;
2783 2862
2784 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2785 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2786 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2787 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
… …
2790 action => $cmds, 2869 action => $cmds,
2791 }; 2870 };
2792 } 2871 }
2793 } 2872 }
2794 } 2873 }
2795
2796 sdl_init;
2797 2874
2798 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf"; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2799 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts"; 2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2800 2877
2801 { 2878 {
… …
2810 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2811 mona.ttf 2888 mona.ttf
2812 ); 2889 );
2813 2890
2814 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2815 2892
2816 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2817 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2818 2895
2819 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2820 2897
… …
2832# } 2909# }
2833# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2834# warn $t2-$t1; 2911# warn $t2-$t1;
2835# } 2912# }
2836 2913
2914 DC::IMG_Init;
2837 video_init; 2915 video_init;
2838 audio_init; 2916 audio_init;
2839 } 2917 }
2840 2918
2841 show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
… …
2843 our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2844 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2845 $startup_done->(); 2923 $startup_done->();
2846 }; 2924 };
2847 2925
2926 debug_toggle 0;
2927
2848 delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2849 EV::loop; 2929 EV::loop;
2850 2930
2851 DC::write_cfg if $CFG->{config_autosave}; 2931 DC::write_cfg if $CFG->{config_autosave};
2852 2932
… …
2864 2944
2865deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2866 2946
2867=head1 SYNOPSIS 2947=head1 SYNOPSIS
2868 2948
2869Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2870 2951
2871=head1 USAGE 2952=head1 USAGE
2872 2953
2873deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2954The deliantra client utilises OpenGL for all UI elements and the game. It
2874be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2875 2956
2876=head1 DEBUGGING 2957=head1 DEBUGGING
2877 2958
2878
2879CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2880 2960
2881 1 draw borders around widgets 2961 1 draw borders around widgets
2882 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2883 4 show fps 2963 4 show fps
2884 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2885 2966
2886=head1 AUTHOR 2967=head1 AUTHOR
2887 2968
2888Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2889 2970

Diff Legend

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