ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/collect.pl.in
(Generate patch)

Comparing deliantra/server/lib/collect.pl.in (file contents):
Revision 1.6 by root, Thu Feb 8 03:09:32 2007 UTC vs.
Revision 1.7 by elmex, Sun Feb 11 09:31:28 2007 UTC

258 } 258 }
259 } 259 }
260 if ($walkon && !$nopick) { 260 if ($walkon && !$nopick) {
261 &warn("File $arch has an object with walk_on set which can be picked up\n"); 261 &warn("File $arch has an object with walk_on set which can be picked up\n");
262 } 262 }
263 print ARCH "editor_folder $pathto\n" if $pathto ne "";
263 # Process the color/face info now 264 # Process the color/face info now
264 } elsif ($var eq "color_fg") { 265 } elsif ($var eq "color_fg") {
265 $lfg = $values[0]; 266 $lfg = $values[0];
266 next line; 267 next line;
267 } elsif ($var eq "color_bg") { 268 } elsif ($var eq "color_bg") {
268 $lbg = $values[0]; 269 $lbg = $values[0];
269 next line; 270 next line;
270 } elsif ($var eq "end") {
271 print ARCH "editor_folder $pathto\n" if $pathto ne "";
272 } elsif ($var eq "visibility") { 271 } elsif ($var eq "visibility") {
273 $lvis = $values[0]; 272 $lvis = $values[0];
274 next line; 273 next line;
275 } elsif ($var eq "magicmap") { 274 } elsif ($var eq "magicmap") {
276 $mm = $values[0]; 275 $mm = $values[0];
295 # through 294 # through
296 } elsif ($var eq "no_pick") { 295 } elsif ($var eq "no_pick") {
297 $nopick = $values[0]; 296 $nopick = $values[0];
298 } elsif ($var eq "walk_on") { 297 } elsif ($var eq "walk_on") {
299 $walkon = $values[0]; 298 $walkon = $values[0];
299 } elsif ($var eq "face" && ! $faces{$values[0]}) {
300 &warn($arch." is missing face ".$values[0])
300 } elsif ($var eq "face") { 301 } elsif ($var eq "face") {
301 $lface[$#lface++] = $values[0] 302 $lface[$#lface++] = $values[0]
302 } elsif ($var eq "anim") { 303 } elsif ($var eq "anim") {
303 if ($anim{$arch}) { 304 if ($anim{$arch}) {
304 &warn("$arch is a duplicate animation name"); 305 &warn("$arch is a duplicate animation name");
317 } 318 }
318 $anim{$arch} .= "$var\n"; 319 $anim{$arch} .= "$var\n";
319 } 320 }
320 print ARCH "animation $arch\n"; 321 print ARCH "animation $arch\n";
321 next line; # don't want the mina 322 next line; # don't want the mina
322 } elsif ($var eq "face" && ! $faces{$values[0]}) {
323 &warn($arch." is missing face ".$values[0])
324 } elsif ($var eq "smoothface") { 323 } elsif ($var eq "smoothface") {
325 if ($smoothing{$values[0]} && ($smoothing{$values[0]} ne $values[1])) { 324 if ($smoothing{$values[0]} && ($smoothing{$values[0]} ne $values[1])) {
326 &warn($arch." duplicate smoothface for ".$values[0].": ".$smoothing{$values[0]}." and ".$values[1]); 325 &warn($arch." duplicate smoothface for ".$values[0].": ".$smoothing{$values[0]}." and ".$values[1]);
327 } elsif ( ($values[0] eq "") || ($values[1] eq "")) { 326 } elsif ( ($values[0] eq "") || ($values[1] eq "")) {
328 &warn ($arch." incomplete smoothface entry found: ".$values[0]." ".$values[1]); 327 &warn ($arch." incomplete smoothface entry found: ".$values[0]." ".$values[1]);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines