[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.6 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.18 by root, Sat Mar 17 19:57:02 2007 UTC

 use Crossfire;
 use Coro;
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
+use Storable; $Storable::canonical = 1;
 sub usage {
    warn <<EOF;
 Usage: cfutil [-v] [-q] [--force] [--cache]
               [--install-arch path]
 }
 sub inst_maps($) {
    my (undef, $path) = @_;
-   print "installing '$path' to '$DATADIR/maps'\n\n";
+   print "installing '$path' to '$DATADIR/maps'\n";
    if (!-f "$path/regions") {
       warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
       exit 1 unless $FORCE;
    }
-   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded";
+   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+      and die "map installation failed.\n";
+   print "maps installed successfully.\n";
 }
 {
    our %PNG32;
    our %FACEINFO;
    our @ARC;
+   our $TRS;
    our $NFILE;
    our %ANIM;
    our (@png, @trs, @arc); # files we are interested in
          my ($w, $h) = unpack "NN", $1;
          (my $face = $path) =~ s/^.*\///;
          my $T = 32;
-         unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
+         unless ($face =~ s/\.32x32\.png$//) {
             warn "$path: weird filename, skipping.\n";
             next;
          }
          if ($w < $T || $h < $T) {
                      (map {
                         (
                            "(",
                            "+clone",
                            -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
+                           "+repage",
                            -write => "png:$_->[2]~",
                            "+delete",
                            ")",
                         )
                      } @todo),
          my $arc = read_arch "$dir/$file";
          for my $o (values %$arc) {
             push @ARC, $o;
+            $o->{editor_folder} = $dir;
             my $visibility = delete $o->{visibility};
             my $magicmap   = delete $o->{magicmap};
             # find upper left corner :/
             # omg, this is sooo broken
                my $x = $o->{x} - $dx;
                my $y = $o->{y} - $dy;
                my $ext = $x|$y ? "+$x+$y" : "";
-               $o->{face} .= $ext;
+               $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
                my $visibility = delete $o->{visibility} if exists $o->{visibility};
                my $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
                my $anim = delete $o->{anim};
                if ($anim) {
-                  $o->{animation} = "$o->{_name}$ext";
+                  $o->{animation} = "$o->{_name}";
                   for (@$anim) {
-                     $_ .= $ext unless /^facings\s/;
+                     $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/;
                   }
                   $ANIM{"$o->{_name}$ext"} =
                      join "", map "$_\n",
-                        "anim $o->{_name}$ext",
+                        "anim $o->{_name}",
                         @$anim,
                         "mina";
                }
                for my $face ($o->{face} || (), @{$anim || []}) {
-                  next if /^facings\s/;
+                  next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
                   my $info = $FACEINFO{$face} ||= {};
                   $info->{visibility} = $visibility if defined $visibility;
                   $info->{magicmap}   = $magicmap   if defined $magicmap;
+               }
+               if (my $smooth = delete $o->{smoothface}) {
+                  my ($face, $smooth) = split /\s+/, $smooth;
+                  # skip empty_S.x11, it seems to server no purpose whatsoever
+                  # but increases bandwidth demands and worse.
+                  unless ($smooth eq "empty_S.x11") {
+                     $FACEINFO{$face}{smooth} = $smooth;
+                  }
                }
             }
          }
       }
    }
    sub process_trs {
       while (@trs) {
          my ($dir, $file) = @{pop @trs};
+         my $path = "$dir/$file";
+         my $trs;
+         if (0 > aio_load $path, $trs) {
+            warn "$path: $!, skipping.\n";
+            next;
+         }
+         $TRS .= $trs;
       }
    }
    sub find_files;
    sub find_files {
    }
    sub inst_arch($) {
       my (undef, $path) = @_;
-      print "installing '$path' to '$DATADIR'\n\n";
+      print "installing '$path' to '$DATADIR'\n";
       if (!-d "$path/treasures") {
          warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
          exit 1 unless $FORCE;
       }
       }
       {
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
+         substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
          print $fh Crossfire::archlist_to_string \@ARC;
+      }
+      {
+         open my $fh, ">:utf8", "$DATADIR/treasures~"
+            or die "$DATADIR/treasures~: $!";
+         print $fh $TRS;
       }
       {
          while (my ($k, $v) = each %FACEINFO) {
             $v->{data32} ||= delete $PNG32{$k};
          }
          while (my ($k, $v) = each %FACEINFO) {
-            exists $v->{data32} or warn "$k: face has no png32. this will crash the server.\n";
+            length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
             $v->{chksum32} = Digest::MD5::md5 $v->{data32};
          }
          open my $fh, ">:perlio", "$DATADIR/faces~"
             or die "$DATADIR/faces~: $!";
+         $FACEINFO{""} = { version => 1};
          print $fh Storable::nfreeze \%FACEINFO;
-         #use PApp::Util; warn PApp::Util::dumpval \%FACEINFO;
       }
-      for (qw(archetypes faces animations)) {
+      for (qw(archetypes faces animations treasures)) {
          chmod 0644, "$DATADIR/$_~";
-         rename "$DATADIR/$_~", "$DATADIR/$_";
+         rename "$DATADIR/$_~", "$DATADIR/$_"
+            or die "$DATADIR/$_: $!";
       }
-      die "--install-arch not fully implemented\n";
+      print "archetype data installed successfully.\n";
    }
 }
 Getopt::Long::Configure ("bundling", "no_ignore_case");
 GetOptions (

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.6 by root, Sun Mar 11 02:12:45 2007 UTC vs. Revision 1.18 by root, Sat Mar 17 19:57:02 2007 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.6 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.18 by root, Sat Mar 17 19:57:02 2007 UTC