[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.71 by root, Sun Oct 1 10:59:30 2006 UTC vs.
Revision 1.75 by root, Mon Oct 2 00:22:01 2006 UTC

 use Storable;
 use Opcode;
 use Safe;
 use Safe::Hole;
+use YAML::Syck ();
 use Time::HiRes;
 use Event;
 $Event::Eval = 1; # no idea why this is required, but it is
+# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
+$YAML::Syck::ImplicitUnicode = 1;
 use strict;
 _init_vars;
 sub cf::player::exists($) {
    cf::player::find $_[0]
       or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
 }
-=item $player->reply ($npc, $msg[, $flags])
+=item $object->reply ($npc, $msg[, $flags])
 Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
 can be C<undef>. Does the right thing when the player is currently in a
 dialogue with the given NPC character.
 }
 #############################################################################
 # the server's main()
+sub cfg_load {
+   open my $fh, "<:utf8", cf::confdir . "/config"
+      or return;
+   local $/;
+   *CFG = YAML::Syck::Load <$fh>;
+}
 sub main {
+   cfg_load;
    db_load;
    load_extensions;
    Event::loop;
 }
       # reload cf.pm
       $msg->("reloading cf.pm");
       require cf;
-      # load database again
+      # load config and database again
+      cf::cfg_load;
       cf::db_load;
       # load extensions
       $msg->("load extensions");
       cf::load_extensions;

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