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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.224 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC

 our $INVR;
 our $INVR_LBL;
 our $OPENCONT;
 sub status {
-   $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
+   $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
 }
 sub debug {
    $DEBUG_STATUS->set_text ($_[0]);
    my ($w, $h) = $DEBUG_STATUS->size_request;
          maph => $mapsize,
       ;
    };
    if ($CONN) {
+      CFClient::lowdelay fileno $CONN->{fh};
       $LOGIN_BUTTON->set_text ("Logout");
       status "login successful";
-      CFClient::lowdelay fileno $CONN->{fh};
+      $BUTTONBAR->{children}[1]->emit ("activate")
+         if $BUTTONBAR->{children}[1]->{state};
    } else {
       status "unable to connect";
       stop_game();
    }
 }
    status "connection closed";
    $LOGIN_BUTTON->set_text ("Login");
    $CONN->destroy;
    $CONN = 0; # false, does not autovivify
+   $BUTTONBAR->{children}[1]->emit ("activate")
+      unless $BUTTONBAR->{children}[1]->{state};
    undef $MAPCACHE;
    undef $MAP;
 }
          $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
       },
    );
+   $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
+   $table->add (1, 8, new CFClient::UI::Entry
+      text => $CFG->{output_count},
+      tooltip => "Should be set to 1 unless you know what you are doing",
+      connect_changed => sub { $CFG->{output_count} = $_[1] },
+   );
+   $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
+   $table->add (1, 9, new CFClient::UI::Entry
+      text => $CFG->{output_sync},
+      tooltip => "Should be set to 1 unless you know what you are doing",
+      connect_changed => sub { $CFG->{output_sync} = $_[1] },
+   );
-   $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
+   $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
       expand => 1,
       align => 0,
       text => "Login",
       connect_activate => sub {
          $CONN ? stop_game
       bg        => [0, 0, 0, 0.5],
       user_w    => int $::WIDTH  / 3,
       user_h    => int $::HEIGHT / 5,
       child     => (my $vbox = new CFClient::UI::VBox);
-   $vbox->add ($LOGVIEW = new CFClient::UI::TextView
+   $vbox->add ($LOGVIEW);
-      expand   => 1,
-      font     => $FONT_FIXED,
-      fontsize => $::CFG->{log_fontsize},
-   );
    $vbox->add (my $input = new CFClient::UI::Entry
       connect_focus_in => sub {
          my ($input, $prev_focus) = @_;
 sub make_inventory_window {
    my $invwin = new CFClient::UI::FancyFrame
       user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
-   $invwin->add (my $hb = new CFClient::UI::HBox);
+   $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
    $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
    $vb1->add (my $lbl = new CFClient::UI::Label);
    $lbl->set_text ("Player");
    $vb1->add ($INV  = new CFClient::UI::Inventory expand => 1);
    ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
    $FULLSCREEN = $CFG->{fullscreen};
    $FAST       = $CFG->{fast};
    CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
-      or die "SDL_SetVideoMode failed!\n";
+      or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
    $SDL_ACTIVE = 1;
    $LAST_REFRESH = time - 0.01;
    CFClient::gl_init;
          }
       });
       $MAPWIDGET->show;
       $MAPWIDGET->focus_in;
+      $LOGVIEW = new CFClient::UI::TextView
+         expand   => 1,
+         font     => $FONT_FIXED,
+         fontsize => $::CFG->{log_fontsize},
+      ;
       $BUTTONBAR = new CFClient::UI::HBox;
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup",   other => client_setup);
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup",   other => server_setup);
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
 my $bgmusic;#TODO#hack#d#
 sub audio_channel_finished {
    my ($channel) = @_;
-   warn "channel $channel finished\n";#d#
+   #warn "channel $channel finished\n";#d#
 }
 sub audio_music_finished {
    return unless $CFG->{bgm_enable};
 my %animate_object;
 my $animate_timer;
 my $fps = 9;
+my %demo;#d#
 sub force_refresh {
    $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
    debug sprintf "%3.2f", $fps;
    $CFClient::UI::ROOT->draw;
-   CFClient::SDL_GL_SwapBuffers;
    $WANT_REFRESH = 0;
    $CAN_REFRESH = 0;
    $LAST_REFRESH = $NOW;
+0 && do {
+   # some weird model-drawing code, just a joke right now
+   use CFClient::OpenGL;
+   $demo{t}{eye_auv}  ||= new_from_file CFClient::Texture "eye2.png" or die;
+   $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
+   $demo{r} ||= do {
+      my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
+      $mod->{v} = pack "f*", @{$mod->{v}};
+      $_ = [scalar @$_, pack "S!*", @$_]
+         for values %{$mod->{g}};
+      $mod
+   };
+   my $r = $demo{r} or die;
+   glDepthMask 1;
+   glClear GL_DEPTH_BUFFER_BIT;
+   glEnable GL_TEXTURE_2D;
+   glEnable GL_DEPTH_TEST;
+   glEnable GL_CULL_FACE;
+   glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
+   #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
+   glPushMatrix;
+   glTranslate 0, 0, -800;
+   glScale 1, -1, 1;
+   glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
+   glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
+   glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
+   glScale 50, 50, 50;
+   glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
+   while (my ($k, $v) = each %{$r->{g}}) {
+      glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
+      glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
+   }
+   glPopMatrix;
+   glShadeModel GL_FLAT;
+   glDisable GL_DEPTH_TEST;
+   glDisable GL_TEXTURE_2D;
+   glDepthMask 0;
+   $WANT_REFRESH++;
+};
+   CFClient::SDL_GL_SwapBuffers;
 }
 my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
    $NOW = time;
    my ($widget) = @_;
    delete $animate_object{$widget};
 }
 @conn::ISA = Crossfire::Protocol::;
+sub conn::new {
+   my $class = shift;
+   my $self = $class->Crossfire::Protocol::new (@_);
+   $MAPWIDGET->clr_commands;
+   my $parser = new Pod::POM;
+   my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
+   for my $head2 ($pod->head2) {
+      $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
+         or next;
+      my $cmd = $1;
+      my @args = split /\|/, $2;
+      @args = (".*") unless @args;
+      my $text = CFClient::pod_to_pango $head2->content;
+      for my $arg (@args) {
+         $arg = $arg eq ".*" ? "" : " $arg";
+         $MAPWIDGET->add_command ("$cmd$arg", $text);
+      }
+   }
+   $self
+}
 sub conn::stats_update {
    my ($self, $stats) = @_;
    if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
          $self->set_texture ($id => $data);
       }
    }
 }
+# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
+# (server resource,s latency, bandwidth), so this hack is warranted.
+# the right fix is to make real tiled maps with an overview file
+sub conn::send_mapinfo {
+   my ($self, $data, $cb) = @_;
+   if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
+      my ($wx, $wy) = ($1, $2);
+      if ($data =~ /^spatial ([1-4]+)$/) {
+         my @dx = (0, 0, 1, 0, -1);
+         my @dy = (0, -1, 0, 1, 0);
+         my ($dx, $dy);
+         for (split //, $1) {
+            $dx += $dx[$_];
+            $dy += $dy[$_];
+         }
+         $cb->(spatial => 15,
+            $self->{map_info}[1] - $MAP->ox + $dx * 50,
+            $self->{map_info}[2] - $MAP->oy + $dy * 50,
+            50, 50,
+            sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
+         );
+         return;
+      }
+   }
+   $self->SUPER::send_mapinfo ($data, $cb);
+}
 # this method does a "flood fill" into every tile direction
 # it assumes that tiles are arranged in a rectangular grid,
 # i.e. a map is the same as the left of the right map etc.
 # failure to comply are harmless and result in display errors
 # at worst.
 sub conn::flood_fill {
-   my ($self, $gx, $gy, $path, $hash, $flags) = @_;
+   my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
    # the server does not allow map paths > 6
    return if 7 <= length $path;
    my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
    for (
-      [1,  0, -1],
+      [1, 3,  0, -1],
-      [2,  1,  0],
+      [2, 4,  1,  0],
-      [3,  0,  1],
+      [3, 1,  0,  1],
-      [4, -1,  0],
+      [4, 2, -1,  0],
    ) {
-      my ($tile, $dx, $dy) = @$_;
+      my ($tile, $tile2, $dx, $dy) = @$_;
+      next if $block & (1 << $tile);
+      my $block = $block | (1 << $tile2);
       my $gx = $gx + $dx;
       my $gy = $gy + $dy;
       next unless $flags & (1 << ($tile - 1));
       my $neigh = $self->{neigh_map}{$hash} ||= [];
       if (my $info = $neigh->[$tile]) {
          my ($flags, $x, $y, $w, $h, $hash) = @$info;
-         $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
+         $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
             if $x >= $x0 && $x + $w < $x1 && $y >= $y0  && $y + $h < $y1;
       } else {
          $self->send_mapinfo ("spatial $path$tile", sub {
             my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
             return if $mode ne "spatial";
             $x += $MAP->ox;
             $y += $MAP->oy;
             $self->load_map ($hash, $x, $y)
                unless $self->{neigh_map}{$hash}[5]++;#d#
             $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
-            $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
+            $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
                if $x >= $x0 && $x + $w < $x1 && $y >= $y0  && $y + $h < $y1;
          });
       }
    }
 }
       $ox - $mapmapw * 0.5,      $oy - $mapmapw * 0.5,
       $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
    ];
    delete $self->{neigh_grid};
-   $self->flood_fill (0, 0, "", $hash, $flags);
    $x += $ox;
    $y += $oy;
    $self->{map_info} = [$hash, $x, $y, $w, $h];
-   my $map = $self->{map_info}[0];
-   $map =~ s/^.*?\/([^\/]+)$/\1/;
+   (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
    $STATWIDS->{map}->set_text ("Map: " . $map);
    $self->load_map ($hash, $x, $y);
+   $self->flood_fill (0, 0, 0, "", $hash, $flags);
 }
 sub conn::face_find {
    my ($self, $facenum, $face) = @_;
 }
 sub conn::addme_success {
    my ($self) = @_;
-   $MAPWIDGET->clr_commands;
+   $self->send ("command output-sync $CFG->{output_sync}");
+   $self->send ("command output-count $CFG->{output_count}");
    for my $skill (values %{$self->{skill_info}}) {
       $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
       $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
-   }
-   $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
-   $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
-   $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
-   $MAPWIDGET->add_command ("killpets", "Kill your pets");
-   $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
-   $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
-   $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
-   my $parser = new Pod::POM;
-   my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
-   for my $head2 ($pod->head2) {
-      $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
-         or next;
-      my $cmd = $1;
-      my @args = split /\|/, $2;
-      @args = (".*") unless @args;
-      my $text = CFClient::pod_to_pango $head2;
-      for my $arg (@args) {
-         $arg = $arg eq ".*" ? "" : " $arg";
-         $MAPWIDGET->add_command ("$cmd$arg", $text);
-      }
    }
 }
 sub conn::eof {
    $MAPWIDGET->clr_commands;
       sdl_mode      => 0,
       width         => 640,
       height        => 480,
       fullscreen    => 0,
       fast          => 0,
-      map_scale     => 0.5,
+      map_scale     => 1,
       fow_enable    => 1,
       fow_intensity => 0.45,
       fow_smooth    => 0,
       gui_fontsize  => 1,
       log_fontsize  => 1,
       host          => "crossfire.schmorp.de",
       say_command   => 'say',
       audio_enable  => 1,
       bgm_enable    => 1,
       bgm_volume    => 0.25,
+      output_sync   => 1,
+      output_count  => 1,
    );
    while (my ($k, $v) = each %DEF_CFG) {
       $CFG->{$k} = $v unless exists $CFG->{$k};
    }
 Typing B<climb> will display a list of commands with I<climb> in their
 name, such as I<ready_skill climbing> and I<use_skill climbing>.
 You can abbreviate commands by typing only the first character of every
-word. For example, typing I<iwor> will likely select I<invoke word of
+word (or even characters within the word - the client will try to make
-recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
+a good guess, as long as the characters are in order). For example,
-will likely select I<ready_skill climbing> and I<usl> will give you
+typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
-I<use_skill levitation>.
+will select I<cast create food>. Likewise, I<rscli> will likely select
+I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
+You can enter space and other text as arguemnt to the command. For
+example, C<cfoo waybread> will expand to C<cast create food waybread>.
 =head2 The map overview
 #TODO#

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.224 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.224 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC