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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.588 by root, Thu Nov 1 13:02:52 2012 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC

… …
3509############################################################################# 3509#############################################################################
3510# the server's init and main functions 3510# the server's init and main functions
3511 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server 3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513 3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3535
3514sub load_facedata($) { 3536sub load_facedata($) {
3515 my ($path) = @_; 3537 my ($path) = @_;
3516 3538
3517 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3518 # for this (global event?) 3540 # for this (global event?)
… …
3525 my $facedata = decode_storable load_file $path; 3547 my $facedata = decode_storable load_file $path;
3526 3548
3527 $facedata->{version} == 2 3549 $facedata->{version} == 2
3528 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3529 3551
3530 # patch in the exptable
3531 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3532 $facedata->{resource}{"res/exp_table"} = {
3533 type => FT_RSRC,
3534 data => $exp_table,
3535 hash => (cf::face::mangle_chksum Digest::MD5::md5 $exp_table),
3536 };
3537 cf::cede_to_tick; 3552 cf::cede_to_tick;
3538 3553
3539 { 3554 {
3540 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3541 3556
… …
3587 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3588 if (defined (my $type = $info->{type})) { 3603 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue 3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3590 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3591 3606
3607 cf::face::set_type $idx, $type;
3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d# 3610 $FACEHASH{$info->{hash}} = $idx;#d#
3596 } else { 3611 } else {
3597# $RESOURCE{$name} = $info; # unused 3612# $RESOURCE{$name} = $info; # unused
3598 } 3613 }
… …
3622 cf::arch::commit_load; 3637 cf::arch::commit_load;
3623 3638
3624 $status 3639 $status
3625} 3640}
3626 3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3653}
3654
3627sub reload_regions { 3655sub reload_regions {
3628 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3629 # for this (global event?) 3657 # for this (global event?)
3630 %ext::player_env::MUSIC_FACE_CACHE = (); 3658 %ext::player_env::MUSIC_FACE_CACHE = ();
3631 3659
… …
3644} 3672}
3645 3673
3646sub reload_archetypes { 3674sub reload_archetypes {
3647 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3648 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3649} 3686}
3650 3687
3651sub reload_treasures { 3688sub reload_treasures {
3652 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3653 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
… …
3674} 3711}
3675 3712
3676sub reload_resources { 3713sub reload_resources {
3677 trace "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3678 3715
3679 reload_exp_table;
3680 reload_materials; 3716 reload_materials;
3681 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3682 reload_sound; 3719 reload_sound;
3683 reload_archetypes; 3720 reload_archetypes;
3684 reload_regions; 3721 reload_regions;
3685 reload_treasures; 3722 reload_treasures;
3686 3723

Diff Legend

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