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.60 by root, Thu Aug 31 06:23:19 2006 UTC vs.
Revision 1.63 by root, Fri Sep 8 17:41:41 2006 UTC

… …
11use Event; 11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 12$Event::Eval = 1; # no idea why this is required, but it is
13 13
14use strict; 14use strict;
15 15
16_reload_1; 16_init_vars;
17 17
18our %COMMAND = (); 18our %COMMAND = ();
19our @EVENT; 19our @EVENT;
20our %PROP_TYPE;
21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl"; 20our $LIBDIR = maps_directory "perl";
23 21
24our $TICK = MAX_TIME * 1e-6; 22our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER; 23our $TICK_WATCHER;
26our $NEXT_TICK; 24our $NEXT_TICK;
… …
33 31
34 print STDERR "cfperl: $msg"; 32 print STDERR "cfperl: $msg";
35 LOG llevError, "cfperl: $msg"; 33 LOG llevError, "cfperl: $msg";
36 }; 34 };
37} 35}
38
39my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!
40
41# generate property mutators
42sub prop_gen {
43 my ($prefix, $class) = @_;
44
45 no strict 'refs';
46
47 for my $prop (keys %PROP_TYPE) {
48 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
49 my $sub = lc $1;
50
51 my $type = $PROP_TYPE{$prop};
52 my $idx = $PROP_IDX {$prop};
53
54 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
55 $_[0]->get_property ($type, $idx)
56 };
57
58 *{"$class\::set_$sub"} = sub {
59 $_[0]->set_property ($type, $idx, $_[1]);
60 } unless $ignore_set{$prop};
61 }
62}
63
64# auto-generate most of the API
65
66prop_gen OBJECT_PROP => "cf::object";
67# CFAPI_OBJECT_ANIMATION?
68prop_gen PLAYER_PROP => "cf::object::player";
69
70prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch";
72 36
73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 37@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
74 38
75# we bless all objects into (empty) derived classes to force a method lookup 39# we bless all objects into (empty) derived classes to force a method lookup
76# within the Safe compartment. 40# within the Safe compartment.
… …
509} 473}
510 474
511sub object_thawer_load { 475sub object_thawer_load {
512 my ($filename) = @_; 476 my ($filename) = @_;
513 477
478 local $/;
479
480 my $av;
481
482 #TODO: use sysread etc.
483 if (open my $data, "<:raw:perlio", $filename) {
484 $data = <$data>;
514 open my $fh, "<:raw:perlio", "$filename.pst" 485 if (open my $pst, "<:raw:perlio", "$filename.pst") {
515 or return; 486 $av = eval { (Storable::thaw <$pst>)->{objs} };
487 }
488 return ($data, $av);
489 }
516 490
517 eval { local $/; (Storable::thaw <$fh>)->{objs} } 491 ()
518} 492}
519 493
520attach_to_objects 494attach_to_objects
521 prio => -1000000, 495 prio => -1000000,
522 on_clone => sub { 496 on_clone => sub {
… …
718 #Symbol::delete_package __PACKAGE__; 692 #Symbol::delete_package __PACKAGE__;
719 693
720 # 7. reload cf.pm 694 # 7. reload cf.pm
721 $msg->("reloading cf.pm"); 695 $msg->("reloading cf.pm");
722 require cf; 696 require cf;
697
698 $msg->("load extensions");
699 cf::load_extensions;
700
701 $msg->("reattach");
702 _global_reattach;
723 }; 703 };
724 $msg->($@) if $@; 704 $msg->($@) if $@;
725 705
726 $msg->("reloaded"); 706 $msg->("reloaded");
727}; 707};
… …
918 898
919############################################################################# 899#############################################################################
920# the server's main() 900# the server's main()
921 901
922sub main { 902sub main {
903 load_extensions;
923 Event::loop; 904 Event::loop;
924} 905}
925 906
926############################################################################# 907#############################################################################
927# initialisation 908# initialisation
928 909
929register "<global>", __PACKAGE__; 910register "<global>", __PACKAGE__;
930 911
931unshift @INC, $LIBDIR; 912unshift @INC, $LIBDIR;
932
933load_extensions;
934 913
935$TICK_WATCHER = Event->timer ( 914$TICK_WATCHER = Event->timer (
936 prio => 1, 915 prio => 1,
937 at => $NEXT_TICK || 1, 916 at => $NEXT_TICK || 1,
938 cb => sub { 917 cb => sub {
… …
947 $TICK_WATCHER->at ($NEXT_TICK); 926 $TICK_WATCHER->at ($NEXT_TICK);
948 $TICK_WATCHER->start; 927 $TICK_WATCHER->start;
949 }, 928 },
950); 929);
951 930
952_reload_2;
953
9541 9311
955 932

Diff Legend

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