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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.90 by root, Mon Jan 12 03:49:35 2009 UTC vs.
Revision 1.99 by root, Tue Dec 22 00:35:44 2009 UTC

       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;
    crash "CRASH/EV::DIED: $@" => 0;
    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;
    $MUSIC_WANT   = [];
    @MUSIC_JINGLE = ();
    %AUDIO_PLAY   = ();
    %AUDIO_CHUNK  = ();
+   DC::MixMusic::halt;
+   DC::Mix_AllocateChannels 0;
    DC::Mix_CloseAudio if $SDL_MIXER;
    undef $SDL_MIXER;
 }
 #############################################################################
          on_connect => sub {
             if ($_[0]) {
                DC::lowdelay fileno $CONN->{fh};
-               status "login successful";
+               status "successfully connected to the server";
             } else {
                undef $CONN;
                status "unable to connect: $!";
                stop_game();
             }
    ;
 }
 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
+            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 = "129.13.162.95";
+            }
          }
          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 1.4 or up. 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}]);
+         }
       );
       $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],
       DC::UI::Toplevel->new (
          title     => "Minimap",
          name      => "mapmap",
          x         => 0,
-         y         => $FONTSIZE + 8,
+         y         => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
          border_bg => [1, 1, 1, 192/255],
          bg        => [1, 1, 1, 0],
          child     => ($MAPMAP = new DC::MapWidget::MapMap
             tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
          ),
       $METASERVER = metaserver_dialog;
       # the name is changed to not conflict with the older name as users could have hidden it
       $MESSAGE_WINDOW = new DC::UI::Dockbar
          name    => "message_window2",
          title   => 'Messages',
+         y       => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
          force_w => $::WIDTH  * 0.6,
          force_h => $::HEIGHT * 0.25,
       ;
       $MESSAGE_DIST   = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
    $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]);
 }
          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,
          default             => "profile", # default profile
          show_tips           => 1,
          logview_max_par     => 1000,
          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};
       }
          }
       }
       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];

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.90 by root, Mon Jan 12 03:49:35 2009 UTC vs. Revision 1.99 by root, Tue Dec 22 00:35:44 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.90 by root, Mon Jan 12 03:49:35 2009 UTC vs.
Revision 1.99 by root, Tue Dec 22 00:35:44 2009 UTC