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.10 by root, Fri Mar 24 18:20:41 2006 UTC vs.
Revision 1.20 by root, Sun Jul 16 17:29:02 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 ($data) = @_; 80 my $extension = shift;
81 my $event_code = shift;
73 82
74 my $cb = $hook[$data->{event_code}]{$data->{extension}} 83 my $cb = $hook[$event_code]{$extension}
75 or return; 84 or return;
76 85
77 $cb->($data) 86 &$cb
78} 87}
79 88
80sub inject_global_event { 89sub inject_global_event {
81 my ($data) = @_; 90 my $event = shift;
82 91
83 my $cb = $hook[$data->{event_code}] 92 my $cb = $hook[$event]
84 or return; 93 or return;
85 94
86 List::Util::max map $_->($data), values %$cb 95 List::Util::max map &$_, values %$cb
87} 96}
88 97
89sub inject_command { 98sub inject_command {
90 my ($name, $obj, $params) = @_; 99 my ($name, $obj, $params) = @_;
91 100
… …
98 107
99sub register_command { 108sub register_command {
100 my ($name, $time, $cb) = @_; 109 my ($name, $time, $cb) = @_;
101 110
102 my $caller = caller; 111 my $caller = caller;
103
104 warn "registering command '$name/$time' to '$caller'"; 112 #warn "registering command '$name/$time' to '$caller'";
105 113
106 push @{ $command{$name} }, [$time, $cb, $caller]; 114 push @{ $command{$name} }, [$time, $cb, $caller];
107 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} }; 115 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
108} 116}
109 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
110sub register { 127sub register {
111 my ($base, $pkg) = @_; 128 my ($base, $pkg) = @_;
112 129
113 for my $idx (0 .. $#EVENT) { 130 for my $idx (0 .. $#EVENT) {
114 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) { 131 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
115 warn "registering $EVENT[$idx] hook to '$pkg'\n"; 132 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
116 $hook[$idx]{$base} = $ref; 133 $hook[$idx]{$base} = $ref;
117 } 134 }
118 } 135 }
119} 136}
120 137
… …
171 delete $command{$name}; 188 delete $command{$name};
172 delete $COMMAND{"$name\000"}; 189 delete $COMMAND{"$name\000"};
173 } 190 }
174 } 191 }
175 192
193 # remove extcmds
194 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
195 delete $extcmd{$name};
196 }
197
176 Symbol::delete_package $pkg; 198 Symbol::delete_package $pkg;
177} 199}
178 200
179sub load_extensions { 201sub load_extensions {
180 my $LIBDIR = maps_directory "perl"; 202 my $LIBDIR = maps_directory "perl";
… …
194 if ($who->flag (FLAG_WIZ)) { 216 if ($who->flag (FLAG_WIZ)) {
195 $who->message ("reloading..."); 217 $who->message ("reloading...");
196 218
197 warn "reloading...\n"; 219 warn "reloading...\n";
198 eval { 220 eval {
221 $_->cancel for Event::all_watchers;
222
199 unload_extension $_ for @exts; 223 unload_extension $_ for @exts;
200 delete $INC{"cf.pm"}; 224 delete $INC{"cf.pm"};
201 225
202 # don't, removes xs symbols, too 226 # don't, removes xs symbols, too
203 #Symbol::delete_package $pkg; 227 #Symbol::delete_package $pkg;
… …
213 $who->message ("Intruder Alert!"); 237 $who->message ("Intruder Alert!");
214 } 238 }
215}; 239};
216 240
217############################################################################# 241#############################################################################
242# extcmd framework, basically convert ext <id> <pkg> arg1 args
243# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
244
245sub on_extcmd {
246 my ($pl, $buf) = @_;
247
248 my ($type) = $buf =~ s/^(\S+) // ? $1 : "";
249
250 $extcmd{$type}[0]->($pl, $buf)
251 if $extcmd{$type};
252}
253
254#############################################################################
218# load/save/clean perl data associated with a map 255# load/save/clean perl data associated with a map
219 256
220*on_mapclean = sub { 257*on_mapclean = sub {
221 my $map = shift->{map}; 258 my ($map) = @_;
222 259
223 my $path = $map->tmpname; 260 my $path = $map->tmpname;
224 defined $path or return; 261 defined $path or return;
225 262
226 unlink "$path.cfperl"; 263 unlink "$path.cfperl";
227}; 264};
228 265
229*on_mapin = 266*on_mapin =
230*on_mapload = sub { 267*on_mapload = sub {
231 my $map = shift->{map}; 268 my ($map) = @_;
232 269
233 my $path = $map->tmpname; 270 my $path = $map->tmpname;
234 $path = $map->path unless defined $path; 271 $path = $map->path unless defined $path;
235 272
236 open my $fh, "<:raw", "$path.cfperl" 273 open my $fh, "<:raw", "$path.cfperl"
… …
243 280
244 $map->_set_obs ($data->{obs}); 281 $map->_set_obs ($data->{obs});
245}; 282};
246 283
247*on_mapout = sub { 284*on_mapout = sub {
248 my $map = shift->{map}; 285 my ($map) = @_;
249 286
250 my $path = $map->tmpname; 287 my $path = $map->tmpname;
251 $path = $map->path unless defined $path; 288 $path = $map->path unless defined $path;
252 289
253 my $obs = $map->_get_obs; 290 my $obs = $map->_get_obs;
… …
273 310
274############################################################################# 311#############################################################################
275# load/save perl data associated with player->ob objects 312# load/save perl data associated with player->ob objects
276 313
277*on_player_load = sub { 314*on_player_load = sub {
278 my ($event) = @_; 315 my ($ob, $path) = @_;
279 my $path = $event->{message};
280 my $ob = $event->{who};
281 316
282 open my $fh, "<:raw", "$path.cfperl" 317 if (open my $fh, "<:raw", "$path.cfperl") {
283 or return; # no perl data
284 318
319 #d##TODO#remove
320
285 my $data = Storable::thaw do { local $/; <$fh> }; 321 my $data = Storable::thaw do { local $/; <$fh> };
286 322
287 $data->{version} <= 1 323 $data->{version} <= 1
288 or return; # too new 324 or return; # too new
289 325
290 %$ob = %{$data->{ob}}; 326 %$ob = %{$data->{ob}};
327 return;
328 }
329
330 for my $o ($ob, $ob->inv) {
331 if (my $value = $o->get_ob_key_value ("_perl_data")) {
332 $o->set_ob_key_value ("_perl_data");
333
334 %$o = %{ Storable::thaw pack "H*", $value };
335 }
336 }
291}; 337};
292 338
293*on_player_save = sub { 339*on_player_save = sub {
294 my ($event) = @_; 340 my ($ob, $path) = @_;
295 my $path = $event->{message};
296 my $ob = $event->{who};
297 341
298 if (keys %$ob) { 342 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
299 open my $fh, ">:raw", "$path.cfperl" 343 for grep %$_, $ob, $ob->inv;
300 or die "$path.cfperl: $!";
301 344
302 stat $path; 345 unlink "$path.cfperl";#d##TODO#remove
303
304 print $fh Storable::nfreeze {
305 size => (stat _)[7],
306 time => (stat _)[9],
307 version => 1,
308 ob => $ob,
309 };
310
311 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
312 } else {
313 unlink "$path.cfperl";
314 }
315}; 346};
316 347
317register "<global>", __PACKAGE__; 348register "<global>", __PACKAGE__;
318 349
350unshift @INC, maps_directory "perl";
351
319load_extensions; 352load_extensions;
320 353
3211 3541
322 355

Diff Legend

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