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

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.16 by root, Wed Jan 18 00:51:41 2012 UTC vs.
Revision 1.17 by root, Wed Jan 18 13:42:19 2012 UTC

       $table->add_at (2, $row++, new DC::UI::Button
          text    => "Save Now",
          tooltip => "Use this to manually save configuration and UI layout when "
                   . "autosave is disabled.",
          on_activate => sub {
-            DC::write_cfg;
+            DC::save_cfg;
             0
          }
       );
    }
 # due to mac os x + sdl combined braindamage, we need this contortion
 sub DC::Main::main {
    {
       DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
-      if (-e "$Deliantra::VARDIR/client.cf") {
+      DC::load_cfg;
-         DC::read_cfg "$Deliantra::VARDIR/client.cf";
-      } else {
-         #TODO: compatibility cruft
-         DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
-         print STDERR "INFO: used old configuration file\n";
-      }
       DC::DB::Server::run;
       if ($CFG->{db_schema} < 1) {
          warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
          DC::DB::nuke_db;
          $CFG->{db_schema} = 1;
-         DC::write_cfg;
+         DC::save_cfg;
       }
       DC::upgrade_cfg;
       DC::DB::open_db;
    debug_toggle 0;
    delete $SIG{__DIE__};
    EV::loop;
-   DC::write_cfg if $CFG->{config_autosave};
+   DC::save_cfg if $CFG->{config_autosave};
    #video_shutdown;
    #audio_shutdown;
    DC::OpenGL::quit;

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