Difference for lib/collect.pl.in from version 1.8 to 1.9


version 1.8 version 1.9
Line 32
 
Line 32
 $animations = "animations";  $animations = "animations";
 $paths = $bmaps."."."paths";  $paths = $bmaps."."."paths";
 $faceExt = "\\.[a-zA-Z0-9][A-Z0-9][A-Z0-9]";  $faceExt = "\\.[a-zA-Z0-9][A-Z0-9][A-Z0-9]";
   $smooths = "smooth";
   
 ### main  ### main
 &info("looking ...");  &info("looking ...");
Line 58
 
Line 59
     &facesOut;      &facesOut;
     close(FACES);      close(FACES);
   
       &info("$smooths");
       open(SMOOTHS,">".$smooths) || &die("cannot open ".$smooths);
       &smoothOut;
       close(SMOOTHS);
   
     &info("$treasures");      &info("$treasures");
     # We still support the old consolidated treasure information      # We still support the old consolidated treasure information
     # so copy it over.      # so copy it over.
Line 274
 
Line 280
      if ($var eq "face" && ! $faces{$values[0]}) {       if ($var eq "face" && ! $faces{$values[0]}) {
  &warn($arch." is missing face ".$values[0])   &warn($arch." is missing face ".$values[0])
      }       }
           if ($var eq "smoothface"){
               if ($smoothing{$values[0]} && ($smoothing{$values[0]} ne $values[1])){
                   &warn($arch." duplicate smoothface for ".$values[0].": ".$smoothing{$values[0]}." and ".$values[1]);
               }elsif ( ($values[0] eq "") || ($values[1] eq "")){
                       &warn ($arch." incomplete smoothface entry found: ".$values[0]." ".$values[1]);
               }else{
                   $smoothing{$values[0]}=$values[1]
               }
           }
      print ARCH $_,"\n";       print ARCH $_,"\n";
  }   }
  close(ARC);   close(ARC);
Line 408
 
Line 423
  $animationsNum++;   $animationsNum++;
     }      }
 }  }
   sub smoothOut {
       local ($sm);
       print SMOOTHS "##########################################################\n";
       print SMOOTHS "# Do not touch this file.                                #\n";
       print SMOOTHS "# It has been generated from the informations present    #\n";
       print SMOOTHS "# in the archetype files.                                #\n";
       print SMOOTHS "# To add new entries, simply add                         #\n";
       print SMOOTHS "#     smoothface xxx yyy                                 #\n";
       print SMOOTHS "# to an archetype and collect.pl will put below an entry #\n";
       print SMOOTHS "#      xxx yyy                                           #\n";
       print SMOOTHS "##########################################################\n\n";
       print SMOOTHS "# default smooth. Needed for fallbacking\n";
       print SMOOTHS "default_smoothed.111 sdefault.001\n";
       print SMOOTHS "\n# Data extracted from arch files\n";
       foreach $sm (sort (keys %smoothing)){
           print SMOOTHS "$sm $smoothing{$sm}\n";
           $smoothNum++;
       }
   }
   
 ### print out statical information  ### print out statical information
 sub stats {  sub stats {
Line 417
 
Line 451
     &info(Animations.":\t".$animationsNum);      &info(Animations.":\t".$animationsNum);
     &info(Treasures.":\t".($#treasure_files+1));      &info(Treasures.":\t".($#treasure_files+1));
     &info(Trash.":\t".$trashNum);      &info(Trash.":\t".$trashNum);
       &info(Smooths.":\t".$smoothNum);
 }  }


Legend:
line(s) removed in v.1.8 
line(s) changed
 line(s) added in v.1.9

File made using version 1.98 of cvs2html by leaf at 2011-07-21 18:44