[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/deliantra

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.93 by root, Fri Jan 23 06:39:41 2009 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

          $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
       }
       require Win32::GUI::SplashScreen;
+      Win32::GUI::SplashScreen::Show (
+         -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
+      );
       # initialise the resolver now, as vista forces us back to the desktop
-      # when doing this.
+      # when doing this later.
       use AnyEvent::DNS ();
       AnyEvent::DNS::resolver;
-      Win32::GUI::SplashScreen::Show (
-         -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
-      );
       $startup_done = sub {
          Win32::GUI::SplashScreen::Done (1);
       };
    }
 }
-use strict;
+use common::sense;
-use utf8;
 use Carp 'verbose';
 # do things only needed for single-binary version (par)
 BEGIN {
       if ($^O eq "MSWin32") {
          # pango is relocatable on win32
       } else {
          # OS X
-         $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
-         $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
          $ENV{PANGO_RC_FILE} = "$root/pango.rc";
          $ENV{DYLD_LIBRARY_PATH} = $root;
          chdir $root; # for pango modules, maybe other things
       }
       unshift @INC, $root;
    }
 }
-# prepend private library directory
+# prepend private library directory and prepare env
 BEGIN {
    for (grep !ref, @INC) {
       my $path = "$_/Deliantra/Client/private";
       if (-d $path) {
          unshift @INC, $path;
    DC::fatal Carp::longmess $@;
 };
 my $MAX_FPS = 60;
+our $DEFAULT_SERVER = "gameserver.deliantra.net";
 our $META_SERVER = "http://metaserver.schmorp.de/current.json";
 our $LAST_REFRESH;
 our $NOW;
 our $CFG;
 our $PROFILE; # current profile
 our $FAST; # fast, low-quality mode, possibly useful for software-rendering
+our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
 our $WANT_REFRESH;
 our $MODE_SLIDER;
 our $CAVEAT_LABEL;
    sub audio_tab_update;
    audio_tab_update;
 }
 sub audio_shutdown {
+   if ($SDL_MIXER) {
+      DC::MixMusic::halt;
+      DC::Mix_AllocateChannels 0;
+   }
    undef $MUSIC_PLAYER;
    undef $MUSIC_PLAYING_META;
    undef $MUSIC_PLAYING_DATA;
    $MUSIC_WANT   = [];
          user => $PROFILE->{user},
          pass => $PROFILE->{password},
          mapw => $mapw,
          maph => $maph,
+         c_version => {
+            client     => "deliantra",
-         client => "$DC::VERSION $] $^O",
+            clientver  => $DC::VERSION,
+            gl_vendor  => DC::OpenGL::gl_vendor,
+            gl_version => DC::OpenGL::gl_version,
+         },
          map_widget => $MAPWIDGET,
          statusbox  => $STATUSBOX,
          map        => $MAP,
          mapmap     => $MAPMAP,
    ;
 }
 sub start_game {
    status "logging in...";
+   my $server = $PROFILE->{host} || $DEFAULT_SERVER;
+   my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
+      or return status "$server: unable to parse server address, try an empty field.";
    $LOGIN_BUTTON->set_text ("Logout");
    $SETUP_DIALOG->hide;
-   my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
    $MAP = new DC::Map;
    # hack to make SURE we find the IP address all right
    # can be removed once AnyEvent::DNS is proven stable.
    if ($host eq "gameserver.deliantra.net") {
       AnyEvent::DNS::a "dnstest.deliantra.net", sub {
-         if ($_[0] ne "80.101.114.108") { # Perl
+         if ($_[0] ne "80.101.114.108") { # P-e-r-l
+            status "dns failure, trying differently";
+            $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
+            unless (defined $host) {
-            status "dns failure, using hardcoded address";
+               status "dns failure, using hardcoded address";
-            $host = "129.13.162.95";
+               $host = "194.126.175.154";
+            }
          }
          dc_connect $host, $port;
       };
    } else {
                   . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
                   . "then disable this option. Changes take effect immdiately.",
          on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
       );
+      $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
+      $table->add_at (1, $row++, new DC::UI::CheckBox
+         state => $CFG->{smooth_transitions},
+         tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
+                  . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
+                  . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
+         on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
+      );
       $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
       $table->add_at (1, $row++, new DC::UI::Slider
          range      => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
          tooltip    => "Enlarge or shrink the displayed map. Changes are instant.",
          on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
       $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
       $table->add_at (1, $row++, new DC::UI::CheckBox
          state => $CFG->{fow_enable},
          tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
          on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
+      );
+      $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
+      $table->add_at (1, $row++, new DC::UI::ImageButton
+         tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
+         bg  => [0.3, 0.3, 0.2],
+         force_w => 64,
+         force_h => 64,
+         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.",
+         on_activate => sub {
+            my ($self) = @_;
+            $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
+            $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
+            $MAPWIDGET->update;
+         }
       );
       $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
       $table->add_at (1, $row++, new DC::UI::Slider
          range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
    ]);
    my $text = !$freq
       ? "audio is off"
       : "audio is enabled\n"
+         . "driver: " . DC::SDL_AudioDriverName . "\n"
-      . "frequency (Hz): $freq\n"
+         . "frequency (Hz): $freq\n"
-      . "channels: $chans";
+         . "channels: $chans\n"
+         . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
+         . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
    $AUDIO_INFO->set_text ($text);
 }
 sub audio_setup {
    );
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
    $table->add_at (1, $row, new DC::UI::CheckBox
       expand => 1, state => $CFG->{bgm_enable},
-      tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
+      tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
       on_changed => sub {
          $CFG->{bgm_enable} = $_[1];
          $CONN->update_fx_want if $CONN;
          audio_music_push;
          1
    &set_gauge_window_fontsize;
    $win
 }
+our $BW_WATCHER;
+sub debug_toggle($) {
+   $DELIANTRA_DEBUG ^= $_[0];
+   if ($DELIANTRA_DEBUG & 16) {
+      $BW_WATCHER = EV::periodic 0, 1, 0, sub {
+         return unless $CONN;
+         debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
+         $CONN->{octets_in} = 0;
+      };
+   } else {
+      undef $BW_WATCHER;
+   }
+}
 sub debug_setup {
    my $table = new DC::UI::Table;
    $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
-   $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
+   $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle  1; 0 });
    $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
-   $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
+   $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle  2; 0 });
    $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
-   $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
+   $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle  4; 0 });
    $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
-   $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
+   $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle  8; 0 });
+   $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
+   $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
-   $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
+   $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
-   $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
+   $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
    $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
    $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
    $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
    $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
       child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
    );
    $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
    $table->add_at (1, 4, new DC::UI::Entry
-      text => $CFG->{profile}{default}{user},
+      text => $PROFILE->{user},
       tooltip => "The name of your character on the server. The name is case-sensitive!",
-      on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
+      on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
    );
    $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
    $table->add_at (1, 5, new DC::UI::Entry
-      text => $CFG->{profile}{default}{password},
+      text => $PROFILE->{password},
       hidden => 1,
       tooltip => "The password for your character.",
-      on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
+      on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
    );
    $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
       expand => 1,
       text => "Login / Register",
       $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
       $vbox->add (
          $HOST_ENTRY = new DC::UI::Entry
             expand => 1,
-            text => $CFG->{profile}{default}{host},
+            text => $PROFILE->{host},
             tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
             on_changed => sub {
                my ($self, $value) = @_;
-               $CFG->{profile}{default}{host} = $value;
+               $PROFILE->{host} = $value;
                1
             }
       );
       if (0) { #d# disabled
    $r
 }
 my %SORT_ORDER = (
    type   => sub {
+      use sort 'stable';
       sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
    },
    mtime  => sub {
+      use sort 'stable';
-                my $NOW = time;
+      my $NOW = time;
-                sort {
+      sort {
-                   my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
+         my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
-                   my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
+         my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
-                   ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
+         ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
-                      or $btime <=> $atime
+            or $btime <=> $atime
-                      or $a->{type} <=> $b->{type}
+            or $a->{type} <=> $b->{type}
-                } @_
+      } @_
-             },
+   },
-   weight => sub { sort {
+   weight => sub {
+      use sort 'stable';
+      sort {
-                $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+         $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
-                   or $a->{type} <=> $b->{type}
+            or $a->{type} <=> $b->{type}
-             } @_ },
+      } @_
+   },
 );
 sub inventory_widget {
    my $hb = new DC::UI::HBox homogeneous => 1;
       $DEBUG_STATUS = new DC::UI::Label
          padding => 0,
          z       => 100,
          force_x => "max",
-         force_y => 0;
+         force_y => 20;
       $DEBUG_STATUS->show;
       $STATUSBOX = new DC::UI::Statusbox;
       $MODBOX = new DC::UI::Label
    $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
    $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
    $CAVEAT_LABEL->set_text ("None :)");
+   $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
+      if $DC::OpenGL::APPLE_NVIDIA_BUG;
    $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
       unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
 my $animate_timer;
 my $fps = 9;
 sub force_refresh {
-   if ($ENV{CFPLUS_DEBUG} & 4) {
+   if ($DELIANTRA_DEBUG & 4) {
       $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
       debug sprintf "%3.2f", $fps;
    }
    undef $WANT_REFRESH;
          fullscreen          => 1,
          fast                => 0,
          force_opengl11      => undef,
          disable_alpha       => 0,
          smooth_movement     => 1,
+         smooth_transitions  => 1,
          texture_compression => 1,
          map_scale           => 1,
          fow_enable          => 1,
          fow_intensity       => 0,
+         fow_texture         => 0,
          map_smoothing       => 1,
          gui_fontsize        => 1,
          log_fontsize        => 0.7,
          gauge_fontsize      => 1,
          gauge_size          => 0.35,
          shift_fire_stop     => 0,
          uitheme             => "wood",
          map_shift_x         => -24, # arbitrary
          map_shift_y         => +24, # arbitrary
       );
       while (my ($k, $v) = each %DEF_CFG) {
          $CFG->{$k} = $v unless exists $CFG->{$k};
       }
-      $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
+      my @args = @ARGV;
+      my $profile = 'default';
+      for (my $i = 0; $i < @args; $i++) {
+         if ($args[$i] =~ /^--?profile$/) {
+            $profile = $args[$i + 1];
+            splice @args, $i, 2, ();
+            $i = 0;
+         } elsif ($args[$i] =~ /^--?h/) {
+            print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
+            exit 0;
+         }
+      }
+      $CFG->{profile}{$profile} ||= {};
-      $PROFILE = $CFG->{profile}{default};
+      $PROFILE = $CFG->{profile}{$profile};
+      $PROFILE->{host} ||= "gameserver.deliantra.net";
+      $PROFILE->{host}     = $args[0] if @args > 0;
+      $PROFILE->{user}     = $args[1] if @args > 1;
+      $PROFILE->{password} = $args[2] if @args > 2;
       # convert old bindings (only default profile matters)
       if (my $bindings = delete $PROFILE->{bindings}) {
          while (my ($mod, $syms) = each %$bindings) {
             while (my ($sym, $cmds) = each %$syms) {
          }
       }
       sdl_init;
+      $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
+      $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
       {
          my @fonts = map DC::find_rcfile "fonts/$_", qw(
             DejaVuSans.ttf
             DejaVuSansMono.ttf
             DejaVuSans-Bold.ttf
             DejaVuSansMono-Bold.ttf
             DejaVuSans-Oblique.ttf
             DejaVuSansMono-Oblique.ttf
             DejaVuSans-BoldOblique.ttf
             DejaVuSansMono-BoldOblique.ttf
+            mona.ttf
          );
          DC::add_font $_ for @fonts;
          $FONT_PROP  = new_from_file DC::Font $fonts[0];
          $FONT_FIXED = new_from_file DC::Font $fonts[1];
          $FONT_PROP->make_default;
    our $STARTUP_CANCEL = EV::idle sub {
       undef $::STARTUP_CANCEL;
       $startup_done->();
    };
+   debug_toggle 0;
    delete $SIG{__DIE__};
    EV::loop;
    DC::write_cfg if $CFG->{config_autosave};
 deliantra - A Deliantra MORPG game client
 =head1 SYNOPSIS
-Just run it - no commandline arguments are supported.
+   deliantra [--profile name] [host [user [password]]]
+   deliantra --help
 =head1 USAGE
-deliantra utilises OpenGL for all UI elements and the game. It is supposed to
+The deliantra client utilises OpenGL for all UI elements and the game. It
-be used in fullscreen mode and interactively.
+is supposed to be used in fullscreen mode and interactively.
 =head1 DEBUGGING
-CFPLUS_DEBUG - environment variable
+DELIANTRA_DEBUG - environment variable
    1   draw borders around widgets
    2   add low-level widget info to tooltips
    4   show fps
    8   suppress tooltips
+  16   show bandwidth downstream
 =head1 AUTHOR
 Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.93 by root, Fri Jan 23 06:39:41 2009 UTC vs. Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.93 by root, Fri Jan 23 06:39:41 2009 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC