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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.129 by root, Sun Nov 19 00:07:51 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

    }
 }
 use strict;
 use utf8;
+use Carp 'verbose';
 # do things only needed for single-binary version (par)
 BEGIN {
    if (%PAR::LibCache) {
       @INC = grep ref, @INC; # weed out all paths except pars loader refs
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
 $SIG{PIPE} = 'IGNORE';
 $Event::Eval = 0;
 $Event::DIED = sub {
-   # TODO: display dialog box or so
+   CFPlus::fatal Carp::longmess $_[1]
-   Carp::cluck $_[1];#d#TODO: remove when stable
-   return;#d#
-   CFPlus::fatal ($_[1]);
 };
 my $MAX_FPS = 60;
 my $MIN_FPS =  5; # unused as of yet
 our $INVENTORY_PAGE;
 our $STATS_PAGE;
 our $SKILL_PAGE;
 our $SPELL_PAGE;
+our $SPELL_LIST;
 our $HELP_WINDOW;
 our $MESSAGE_WINDOW;
 our $FLOORBOX;
 our $GAUGES;
 our $BIND_EDITOR;
 our $BIND_UPD_CB;
 our $PICKUP_CFG;
+our $IN_BUILD_MODE;
+our $BUILD_BUTTON;
 sub status {
    $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
 }
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
-   $SPELL_PAGE->clear_spells;
+   $SPELL_LIST->clear_spells;
    return unless $CONN;
    status "connection closed";
    $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
    $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
    $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
    $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
    $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
+   $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
    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) {
                on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
          );
       }
    }
+   $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
    $table
 }
 sub stats_window {
             ["Boots"                   => PICKUP_BOOTS],
             ["Gloves"                  => PICKUP_GLOVES],
             ["Cloaks"                  => PICKUP_CLOAK],
          ],
-         ["Readables", 2, 2,
+         ["Readables", 2, 0,
             ["Spellbooks"              => PICKUP_SPELLBOOK],
             ["Skillscrolls"            => PICKUP_SKILLSCROLL],
             ["Normal Books/Scrolls"    => PICKUP_READABLES],
          ],
-         ["Misc", 2, 7,
+         ["Misc", 2, 5,
             ["Food"                    => PICKUP_FOOD],
             ["Drinks"                  => PICKUP_DRINK],
             ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
             ["Keys"                    => PICKUP_KEY],
             ["Magical Items"           => PICKUP_MAGICAL],
             ["Potions"                 => PICKUP_POTION],
             ["Magic Devices"           => PICKUP_MAGIC_DEVICE],
             ["Ignore cursed"           => PICKUP_NOT_CURSED],
             ["Jewelery"                => PICKUP_JEWELS],
+            ["Flesh"                   => PICKUP_FLESH],
          ],
          ["Weight/Value ratio", 2, 17]
        )
    {
       my ($title, $x, $y, @bits) = @$_;
    $table
 }
 my %SORT_ORDER = (
    type   => undef,
-   mtime  => sub { sort {
+   mtime  => sub {
+                my $NOW = time;
+                sort {
+                   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;
-                ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
+                   ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
-                   or $b->{mtime} <=> $a->{mtime}
+                      or $btime <=> $atime
-                   or $a->{type} <=> $b->{type}
+                      or $a->{type} <=> $b->{type}
+                } @_
-             } @_ },
+             },
    weight => sub { sort {
                 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
                    or $a->{type} <=> $b->{type}
              } @_ },
 );
    $ntb->add (
       "Skills (F3)" => $SKILL_PAGE = skill_window,
       "Shows all your Skills."
    );
-   my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+   my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
-   $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
+   $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
    $ntb->add (
       "Spellbook (F4)" => $spellsw,
       "Displays all spells you have and lets you edit keyboard shortcuts for them."
    );
    $ntb->add (
       );
       $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
          tooltip => "View Documentation");
       $BUTTONBAR->add (new CFPlus::UI::Button
          text        => "Quit",
          tooltip     => "Terminates the program",
          on_activate => sub {
             if ($CONN) {
    }
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
+sub setup_build_button {
+   my ($enabled) = @_;
+   if ($enabled) {
+      $BUILD_BUTTON ||= new CFPlus::UI::Button
+         text        => "Build",
+         tooltip     => "Opens the ingame builder",
+         on_activate => sub {
+            if ($CONN) {
+               $CONN->send_ext_req (builder_player_items => sub {
+                  open_ingame_editor ($_[0]) if exists $_[0]->{items};
+               });
+            }
+            0
+         };
+      $BUTTONBAR->add ($BUILD_BUTTON);
+   } else {
+      $BUILD_BUTTON->hide if $BUILD_BUTTON;
+   }
+}
+sub open_ingame_editor {
+   my ($msg) = @_;
+   my $win = new CFPlus::UI::Toplevel
+      x       => 0,
+      y       => 'center',
+      z       => 4,
+      name    => 'builder_window',
+      force_w => int $WIDTH  * 1/4,
+      force_h => int $HEIGHT * 3/4,
+      title   => "In game builder",
+      has_close_button => 1;
+   my $r = new CFPlus::UI::ScrolledWindow (
+      expand => 1,
+      scroll_y => 1
+   );
+   $r->add (my $vb = new CFPlus::UI::VBox);
+   $win->add ($r);
+   $vb->add (
+      new CFPlus::UI::Button
+         text => "Disable build mode",
+         on_activate => sub { $::IN_BUILD_MODE = undef }
+   );
+   $vb->add (
+      new CFPlus::UI::Button
+         text => "ERASE",
+         on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
+   );
+   for my $itemarchname (
+      sort {
+         $msg->{items}->{$a}->{build_arch_name}
+            cmp $msg->{items}->{$b}->{build_arch_name}
+      } keys %{$msg->{items}}
+   ) {
+      my $info = $msg->{items}->{$itemarchname};
+      $vb->add (
+         new CFPlus::UI::Button text => $info->{build_arch_name},
+         on_activate => sub {
+            $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
+            if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
+               build_mode_query_arch_info ();
+            }
+         }
+      );
+   }
+   $win->show;
+}
+sub build_mode_query_arch_info {
+   my ($iteminfo) = $::IN_BUILD_MODE;
+   my $itemarchname = $iteminfo->{item};
+   my $info = $iteminfo->{info};
+   my $dialog = new CFPlus::UI::Toplevel
+      x     => "center",
+      y     => "center",
+      z     => 50,
+      force_w => int $WIDTH  * 1/2,
+      title => "Enter information for placement of '$itemarchname'",
+      has_close_button => 1;
+   $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
+   $vb->add (my $table = new CFPlus::UI::Table expand => 1);
+      my $row = 0;
+      if ($info->{has_name}) {
+         $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
+         $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
+      }
+      if ($info->{has_text}) {
+         $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
+         $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
+      }
+      if ($info->{has_connection}) {
+         $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
+         $table->add (1, $row++,
+            new CFPlus::UI::Entry
+               expand => 1,
+               on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
+               tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
+         );
+      }
+   $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+   $hb->add (new CFPlus::UI::Button
+      text => "Close",
+      expand => 1,
+      on_activate => sub { $dialog->hide; 0 },
+   );
+   $dialog->show;
+}
 sub video_shutdown {
    CFPlus::OpenGL::shutdown;
    undef $SDL_ACTIVE;
 }
          audio_music_finished;
          local $_;
          while (<$fh>) {
-            last;
             next if /^\s*#/;
             next if /^\s*$/;
             my ($file, $volume, $event) = split /\s+/, $_, 3;

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.129 by root, Sun Nov 19 00:07:51 2006 UTC vs. Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.129 by root, Sun Nov 19 00:07:51 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC