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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.64 by root, Wed Jun 7 06:28:30 2006 UTC vs.
Revision 1.73 by root, Sat Jun 17 15:07:54 2006 UTC

 our $CONSOLE;
 our $METASERVER;
 our $LOGIN_BUTTON;
 our $QUIT_DIALOG;
 our $HOST_ENTRY;
+our $SERVER_INFO;
 our $SETUP_DIALOG;
 our $SETUP_NOTEBOOK;
 our $SETUP_SERVER;
 our $SETUP_KEYBOARD;
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $INV_WINDOW->hide;
+   $SETUP_SPELLS->clear_spells;
    return unless $CONN;
    status "connection closed";
    &set_gauge_window_fontsize;
    $win
 }
+sub debug_setup {
+   my $table = new CFClient::UI::Table;
+   $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
+   $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
+   $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
+   $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
+   $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
+   $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
+   $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
+   $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
+   my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
+   for my $x (0..2) {
+      for my $y (0 .. 2) {
+         $table->add ($x + 3, $y,
+            new CFClient::UI::Entry
+               text       => $default_smooth[$x * 3 + $y],
+               on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
+         );
+      }
+   }
+   $table
+}
 sub stats_window {
    my $tgw = new CFClient::UI::FancyFrame
       y     => $HEIGHT * (2/8),
       x     => "max",
    $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
    $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
    $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
-   # TODO: replace by CS_STAT_RES_xxx constants
    my %tbl = (
-      phys  => 100,
+      phys  => CS_STAT_RES_PHYS,
-      magic => 101,
+      magic => CS_STAT_RES_MAG,
-      fire  => 102,
+      fire  => CS_STAT_RES_FIRE,
-      elec  => 103,
+      elec  => CS_STAT_RES_ELEC,
-      cold  => 104,
+      cold  => CS_STAT_RES_COLD,
-      conf  => 105,
+      conf  => CS_STAT_RES_CONF,
-      acid  => 106,
+      acid  => CS_STAT_RES_ACID,
-      drain => 107,
+      drain => CS_STAT_RES_DRAIN,
-      ghit  => 108,
+      ghit  => CS_STAT_RES_GHOSTHIT,
-      pois  => 109,
+      pois  => CS_STAT_RES_POISON,
-      slow  => 110,
+      slow  => CS_STAT_RES_SLOW,
-      para  => 111,
+      para  => CS_STAT_RES_PARA,
-      tund  => 112,
+      tund  => CS_STAT_TURN_UNDEAD,
-      fear  => 113,
+      fear  => CS_STAT_RES_FEAR,
-      depl  => 113,
+      depl  => CS_STAT_RES_DEPLETE,
-      deat  => 115,
+      deat  => CS_STAT_RES_DEATH,
-      holyw => 116,
+      holyw => CS_STAT_RES_HOLYWORD,
-      blind => 117,
+      blind => CS_STAT_RES_BLIND,
    );
    $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
       for keys %tbl;
 }
          my ($self, $value) = @_;
          $CFG->{say_command} = $value;
       }
    );
+   $vbox->add (new CFClient::UI::Label
+      text      => "Server Info",
+      fontsize  => 1.2,
+      padding_y => 8,
+      fg        => [1, 1, 0, 1],
+   );
+   $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
    $vbox
 }
 sub message_window {
    my $window = new CFClient::UI::FancyFrame
             ["Potions"                 => PICKUP_POTION],
             ["Magic Devices"           => PICKUP_MAGIC_DEVICE],
             ["Ignore cursed"           => PICKUP_NOT_CURSED],
             ["Jewelery"                => PICKUP_JEWELS],
          ],
+         ["Weight/Value ratio", 2, 17]
        )
    {
       my ($title, $x, $y, @bits) = @$_;
       $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
                $::CONN->send_command ("pickup $::CFG->{pickup}")
                   if defined $::CONN;
             });
       }
    }
+   $table->add (2, 18, new CFClient::UI::ValSlider
+      range => [0, 0, 16, 1, 1],
+      to_value => sub { ">= " . 5 * $_[0] },
+      on_changed => sub {
+         my ($slider, $value) = @_;
+         $::CFG->{pickup} &= ~0x7;
+         $::CFG->{pickup} |= int $value
+            if $value;
+         1;
+      });
+   $table->add (3, 18, new CFClient::UI::Button
+      text => "set",
+      on_activate => sub {
+         $::CONN->send_command ("pickup $::CFG->{pickup}")
+            if defined $::CONN;
+        1;
+      });
    $table
 }
 sub inventory_window {
          }
       }
    };
    my $vb = new CFClient::UI::VBox;
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
+   $hb->add (new CFClient::UI::CheckBox
+         expand => 1,
+         state => $CFG->{shift_fire_stop},
+         tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
+         on_changed => sub {
+            my ($cbox, $value) = @_;
+            $CFG->{shift_fire_stop} = $value;
+         });
    $vb->add ($binding_list);
    $vb->add (my $hb = new CFClient::UI::HBox);
    $hb->add (new CFClient::UI::Button
       text => "record new",
          name      => "mapmap",
          x         => 0,
          y         => $FONTSIZE + 8,
          border_bg => [1, 1, 1, 192/255],
          bg        => [1, 1, 1, 0],
+         no_close_button => 1,
          child     => ($MAPMAP = new CFClient::MapWidget::MapMap
             tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
          ),
       )->show;
        . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
        . "After pressing the combo the binding will be saved automatically and the "
        . "binding editor closes");
       $SETUP_NOTEBOOK->add (Spells   => $SETUP_SPELLS = spell_setup,
          "Displays all spells you have and lets you edit keyboard shortcuts for them.");
+      $SETUP_NOTEBOOK->add (Debug    => debug_setup,
+         "Some debuggign options. Do not ask.");
       $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
          tooltip => "Toggles a dialog where you can configure all aspects of this client.");
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
 sub video_shutdown {
+   CFClient::OpenGL::shutdown;
    undef $SDL_ACTIVE;
 }
 my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
 my $bgmusic;#TODO#hack#d#
    video_init;
    audio_init;
 }
 Event::loop;
+#CFClient::SDL_Quit;
+#CFClient::_exit 0;
 END { CFClient::SDL_Quit }
 =head1 NAME

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.64 by root, Wed Jun 7 06:28:30 2006 UTC vs. Revision 1.73 by root, Sat Jun 17 15:07:54 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.64 by root, Wed Jun 7 06:28:30 2006 UTC vs.
Revision 1.73 by root, Sat Jun 17 15:07:54 2006 UTC