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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.11 by root, Mon Mar 12 14:55:43 2007 UTC vs.
Revision 1.13 by root, Mon Mar 12 17:33:12 2007 UTC

… …
67} 67}
68 68
69sub inst_maps($) { 69sub inst_maps($) {
70 my (undef, $path) = @_; 70 my (undef, $path) = @_;
71 71
72 print "installing '$path' to '$DATADIR/maps'\n\n"; 72 print "installing '$path' to '$DATADIR/maps'\n";
73 73
74 if (!-f "$path/regions") { 74 if (!-f "$path/regions") {
75 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 75 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
76 exit 1 unless $FORCE; 76 exit 1 unless $FORCE;
77 } 77 }
78 78
79 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"; 79 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
80 or die "map installation failed.\n";
81
82 print "maps installed successfully.\n";
80} 83}
81 84
82{ 85{
83 our %PNG32; 86 our %PNG32;
84 our %FACEINFO; 87 our %FACEINFO;
85 our @ARC; 88 our @ARC;
89 our $TRS;
86 our $NFILE; 90 our $NFILE;
87 our %ANIM; 91 our %ANIM;
92 our $SMOOTH;
88 93
89 our (@png, @trs, @arc); # files we are interested in 94 our (@png, @trs, @arc); # files we are interested in
90 95
91 sub commit_png { 96 sub commit_png {
92 my ($name, $data) = @_; 97 my ($name, $data) = @_;
… …
250 my $info = $FACEINFO{$face} ||= {}; 255 my $info = $FACEINFO{$face} ||= {};
251 256
252 $info->{visibility} = $visibility if defined $visibility; 257 $info->{visibility} = $visibility if defined $visibility;
253 $info->{magicmap} = $magicmap if defined $magicmap; 258 $info->{magicmap} = $magicmap if defined $magicmap;
254 } 259 }
260
261 if (my $smooth = delete $o->{smoothface}) {
262 $SMOOTH .= "$smooth\n";
263 }
255 } 264 }
256 } 265 }
257 } 266 }
258 } 267 }
259 268
260 sub process_trs { 269 sub process_trs {
261 while (@trs) { 270 while (@trs) {
262 my ($dir, $file) = @{pop @trs}; 271 my ($dir, $file) = @{pop @trs};
272 my $path = "$dir/$file";
273
274 my $trs;
275 if (0 > aio_load $path, $trs) {
276 warn "$path: $!, skipping.\n";
277 next;
278 }
279
280 $TRS .= $trs;
263 } 281 }
264 } 282 }
265 283
266 sub find_files; 284 sub find_files;
267 sub find_files { 285 sub find_files {
… …
289 } 307 }
290 308
291 sub inst_arch($) { 309 sub inst_arch($) {
292 my (undef, $path) = @_; 310 my (undef, $path) = @_;
293 311
294 print "installing '$path' to '$DATADIR'\n\n"; 312 print "installing '$path' to '$DATADIR'\n";
295 313
296 if (!-d "$path/treasures") { 314 if (!-d "$path/treasures") {
297 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 315 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
298 exit 1 unless $FORCE; 316 exit 1 unless $FORCE;
299 } 317 }
… …
319 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 337 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
320 print $fh Crossfire::archlist_to_string \@ARC; 338 print $fh Crossfire::archlist_to_string \@ARC;
321 } 339 }
322 340
323 { 341 {
342 open my $fh, ">:utf8", "$DATADIR/smooth~"
343 or die "$DATADIR/smooth~: $!";
344 print $fh $SMOOTH;
345 }
346
347 {
348 open my $fh, ">:utf8", "$DATADIR/treasures~"
349 or die "$DATADIR/treasures~: $!";
350 print $fh $TRS;
351 }
352
353 {
324 while (my ($k, $v) = each %FACEINFO) { 354 while (my ($k, $v) = each %FACEINFO) {
325 $v->{data32} ||= delete $PNG32{$k}; 355 $v->{data32} ||= delete $PNG32{$k};
326 } 356 }
327 357
328 while (my ($k, $v) = each %FACEINFO) { 358 while (my ($k, $v) = each %FACEINFO) {
329 length $v->{data32} or warn "$k: face has no png32. this will crash the server.\n"; 359 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
330 360
331 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 361 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
332 } 362 }
333 363
334 open my $fh, ">:perlio", "$DATADIR/faces~" 364 open my $fh, ">:perlio", "$DATADIR/faces~"
335 or die "$DATADIR/faces~: $!"; 365 or die "$DATADIR/faces~: $!";
336 366
337 print $fh Storable::nfreeze \%FACEINFO; 367 print $fh Storable::nfreeze \%FACEINFO;
338
339 #use PApp::Util; warn PApp::Util::dumpval \%FACEINFO;
340 } 368 }
341 369
342 for (qw(archetypes faces animations)) { 370 for (qw(archetypes faces animations treasures smooth)) {
343 chmod 0644, "$DATADIR/$_~"; 371 chmod 0644, "$DATADIR/$_~";
344 rename "$DATADIR/$_~", "$DATADIR/$_"; 372 rename "$DATADIR/$_~", "$DATADIR/$_"
373 or die "$DATADIR/$_: $!";
345 } 374 }
346 375
347 die "--install-arch not fully implemented\n"; 376 print "archetype data installed successfully.\n";
348 } 377 }
349} 378}
350 379
351Getopt::Long::Configure ("bundling", "no_ignore_case"); 380Getopt::Long::Configure ("bundling", "no_ignore_case");
352GetOptions ( 381GetOptions (

Diff Legend

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