[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.191 by root, Wed Sep 3 06:07:39 2008 UTC vs.
Revision 1.192 by root, Wed Sep 3 10:36:25 2008 UTC

 }
 package DC;
 our $RC_THEME;
-our $THEME;
+our %THEME;
 our @RC_PATH;
 our $RC_BASE;
 for (grep !ref, @INC) {
    $RC_BASE = "$_/Deliantra/Client/private/resources";
    }
    die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
 }
+sub load_json($) {
+   my ($file) = @_;
+   open my $fh, $file
+      or return;
+   local $/;
+   JSON::XS->new->utf8->relaxed->decode (<$fh>)
+}
 sub set_theme($) {
    return if $RC_THEME eq $_[0];
    $RC_THEME = $_[0];
+   # kind of hacky, find the main theme file, then load all theme files and merge them
+   %THEME = ();
    @RC_PATH = "theme-$RC_THEME";
-   {
+   my $theme = load_json find_rcfile "theme.json"
-      open my $fh, "<:raw", find_rcfile "theme.json"
+      or die "FATAL: theme resource file not found";
-         or die "cannot open theme description file";
-      local $/;
-      $THEME = JSON::XS->new->utf8->relaxed->decode (<$fh>);
-   }
-   @RC_PATH = @{ $THEME->{path} } if $THEME->{path};
+   @RC_PATH = @{ $theme->{path} } if $theme->{path};
+   for (@RC_PATH, "") {
+      my $theme = load_json "$RC_BASE/$_/theme.json"
+         or next;
+      %THEME = ( %$theme, %THEME );
+   }
 }
 sub read_cfg {
    my ($file) = @_;
-   open my $fh, $file
+   $::CFG = load_json $file;
-      or return;
-   local $/;
-   my $CFG = <$fh>;
-   $::CFG = decode_json $CFG;
 }
 sub write_cfg {
    my $file = "$Deliantra::VARDIR/client.cf";

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