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.14 by root, Fri Mar 31 22:47:35 2006 UTC vs.
Revision 1.22 by root, Wed Jul 19 08:50:42 2006 UTC

1package cf; 1package cf;
2 2
3use Symbol; 3use Symbol;
4use List::Util; 4use List::Util;
5use Storable; 5use Storable;
6
7use Event;
8$Event::Eval = 1; # no idea why this is required, but it is
6 9
7use strict; 10use strict;
8 11
9our %COMMAND; 12our %COMMAND;
10our @EVENT; 13our @EVENT;
… …
61# guessed hierarchies 64# guessed hierarchies
62 65
63@cf::object::player::ISA = 'cf::object'; 66@cf::object::player::ISA = 'cf::object';
64@cf::object::map::ISA = 'cf::object'; 67@cf::object::map::ISA = 'cf::object';
65 68
69$Event::DIED = sub {
70 warn "error in event callback: @_";
71};
72
66my %ext_pkg; 73my %ext_pkg;
67my @exts; 74my @exts;
68my @hook; 75my @hook;
69my %command; 76my %command;
77my %extcmd;
70 78
71sub inject_event { 79sub inject_event {
72 my $extension = shift; 80 my $extension = shift;
73 my $event_code = shift; 81 my $event_code = shift;
74 82
… …
99 107
100sub register_command { 108sub register_command {
101 my ($name, $time, $cb) = @_; 109 my ($name, $time, $cb) = @_;
102 110
103 my $caller = caller; 111 my $caller = caller;
104
105 warn "registering command '$name/$time' to '$caller'"; 112 #warn "registering command '$name/$time' to '$caller'";
106 113
107 push @{ $command{$name} }, [$time, $cb, $caller]; 114 push @{ $command{$name} }, [$time, $cb, $caller];
108 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} }; 115 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
109} 116}
110 117
118sub register_extcmd {
119 my ($name, $cb) = @_;
120
121 my $caller = caller;
122 #warn "registering extcmd '$name' to '$caller'";
123
124 $extcmd{$name} = [$cb, $caller];
125}
126
111sub register { 127sub register {
112 my ($base, $pkg) = @_; 128 my ($base, $pkg) = @_;
113 129
114 for my $idx (0 .. $#EVENT) { 130 for my $idx (0 .. $#EVENT) {
115 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) { 131 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
116 warn "registering $EVENT[$idx] hook to '$pkg'\n"; 132 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
117 $hook[$idx]{$base} = $ref; 133 $hook[$idx]{$base} = $ref;
118 } 134 }
119 } 135 }
120} 136}
121 137
… …
153 169
154sub unload_extension { 170sub unload_extension {
155 my ($pkg) = @_; 171 my ($pkg) = @_;
156 172
157 warn "removing extension $pkg\n"; 173 warn "removing extension $pkg\n";
174
175 if (my $cb = $pkg->can ("on_unload")) {
176 $cb->($pkg);
177 }
158 178
159 # remove hooks 179 # remove hooks
160 for my $idx (0 .. $#EVENT) { 180 for my $idx (0 .. $#EVENT) {
161 delete $hook[$idx]{$pkg}; 181 delete $hook[$idx]{$pkg};
162 } 182 }
… …
172 delete $command{$name}; 192 delete $command{$name};
173 delete $COMMAND{"$name\000"}; 193 delete $COMMAND{"$name\000"};
174 } 194 }
175 } 195 }
176 196
197 # remove extcmds
198 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
199 delete $extcmd{$name};
200 }
201
177 Symbol::delete_package $pkg; 202 Symbol::delete_package $pkg;
178} 203}
179 204
180sub load_extensions { 205sub load_extensions {
181 my $LIBDIR = maps_directory "perl"; 206 my $LIBDIR = maps_directory "perl";
… …
195 if ($who->flag (FLAG_WIZ)) { 220 if ($who->flag (FLAG_WIZ)) {
196 $who->message ("reloading..."); 221 $who->message ("reloading...");
197 222
198 warn "reloading...\n"; 223 warn "reloading...\n";
199 eval { 224 eval {
225 $_->cancel for Event::all_watchers;
226
200 unload_extension $_ for @exts; 227 unload_extension $_ for @exts;
201 delete $INC{"cf.pm"}; 228 delete $INC{"cf.pm"};
202 229
203 # don't, removes xs symbols, too 230 # don't, removes xs symbols, too
204 #Symbol::delete_package $pkg; 231 #Symbol::delete_package __PACKAGE__;
205 232
206 require cf; 233 require cf;
207 }; 234 };
208 warn $@ if $@; 235 warn $@ if $@;
209 $who->message ($@) if $@; 236 $who->message ($@) if $@;
… …
212 $who->message ("reloaded"); 239 $who->message ("reloaded");
213 } else { 240 } else {
214 $who->message ("Intruder Alert!"); 241 $who->message ("Intruder Alert!");
215 } 242 }
216}; 243};
244
245#############################################################################
246# extcmd framework, basically convert ext <id> <pkg> arg1 args
247# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
248
249sub on_extcmd {
250 my ($pl, $buf) = @_;
251
252 my ($type) = $buf =~ s/^(\S+) // ? $1 : "";
253
254 $extcmd{$type}[0]->($pl, $buf)
255 if $extcmd{$type};
256}
217 257
218############################################################################# 258#############################################################################
219# load/save/clean perl data associated with a map 259# load/save/clean perl data associated with a map
220 260
221*on_mapclean = sub { 261*on_mapclean = sub {
… …
307 for grep %$_, $ob, $ob->inv; 347 for grep %$_, $ob, $ob->inv;
308 348
309 unlink "$path.cfperl";#d##TODO#remove 349 unlink "$path.cfperl";#d##TODO#remove
310}; 350};
311 351
352#############################################################################
353# core extensions - in perl
354
355# rough implementation of a future "reply" method that works
356# with dialog boxes.
357sub cf::object::player::reply($$;$) {
358 my ($self, $msg, $flags) = @_;
359
360 $flags = cf::NDI_WHITE unless @_ >= 3;
361
362 $self->message ($msg, $flags);
363}
364
365#############################################################################
366# initialisation
367
312register "<global>", __PACKAGE__; 368register "<global>", __PACKAGE__;
313 369
370unshift @INC, maps_directory "perl";
371
314load_extensions; 372load_extensions;
315 373
3161 3741
317 375

Diff Legend

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