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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.150 by root, Sun Sep 2 03:55:02 2007 UTC vs.
Revision 1.166 by root, Wed Dec 26 18:20:45 2007 UTC

 package CFPlus;
 use Carp ();
 BEGIN {
-   $VERSION = '0.9842';
+   $VERSION = '0.9961';
    use XSLoader;
    XSLoader::load "CFPlus", $VERSION;
 }
 use AnyEvent ();
 use Pod::POM ();
 use File::Path ();
 use Storable (); # finally
 use Fcntl ();
-use JSON::XS qw(to_json from_json);
+use JSON::XS qw(encode_json decode_json);
 =item guard { BLOCK }
 Returns an object that executes the given block as soon as it is destroyed.
       or return;
    local $/;
    my $CFG = <$fh>;
-   if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
-      require YAML;
-      utf8::decode $CFG;
-      $::CFG = YAML::Load ($CFG);
-   } elsif ($CFG =~ /^\{/) {
-      $::CFG = from_json $CFG;
+   $::CFG = decode_json $CFG;
-   } else {
-      $::CFG = eval $CFG; ## todo comaptibility cruft
-   }
 }
 sub write_cfg {
    my ($file) = @_;
    $::CFG->{VERSION} = $::VERSION;
    open my $fh, ">:utf8", $file
       or return;
-   print $fh to_json $::CFG;
+   print $fh encode_json $::CFG;
 }
 sub http_proxy {
    my @proxy = win32_proxy_info;
 }
 package CFPlus::Layout;
+$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub {
+   glyph_cache_restore;
+};
 $CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
-   reset_glyph_cache;
+   glyph_cache_backup;
 };
 1;
 =back

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