… | |
… | |
70 | @ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; |
70 | @ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; |
71 | @ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object'; |
71 | @ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object'; |
72 | |
72 | |
73 | # we bless all objects into derived classes to force a method lookup |
73 | # we bless all objects into derived classes to force a method lookup |
74 | # within the Safe compartment. |
74 | # within the Safe compartment. |
75 | for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region)) { |
75 | for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) { |
76 | no strict 'refs'; |
76 | no strict 'refs'; |
77 | @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
77 | @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
78 | } |
78 | } |
79 | |
79 | |
80 | $Event::DIED = sub { |
80 | $Event::DIED = sub { |
… | |
… | |
180 | |
180 | |
181 | sub unload_extension { |
181 | sub unload_extension { |
182 | my ($pkg) = @_; |
182 | my ($pkg) = @_; |
183 | |
183 | |
184 | warn "removing extension $pkg\n"; |
184 | warn "removing extension $pkg\n"; |
185 | |
|
|
186 | if (my $cb = $pkg->can ("on_unload")) { |
|
|
187 | $cb->($pkg); |
|
|
188 | } |
|
|
189 | |
185 | |
190 | # remove hooks |
186 | # remove hooks |
191 | for my $idx (0 .. $#EVENT) { |
187 | for my $idx (0 .. $#EVENT) { |
192 | delete $hook[$idx]{$pkg}; |
188 | delete $hook[$idx]{$pkg}; |
193 | } |
189 | } |
… | |
… | |
206 | } |
202 | } |
207 | |
203 | |
208 | # remove extcmds |
204 | # remove extcmds |
209 | for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { |
205 | for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { |
210 | delete $extcmd{$name}; |
206 | delete $extcmd{$name}; |
|
|
207 | } |
|
|
208 | |
|
|
209 | if (my $cb = $pkg->can ("on_unload")) { |
|
|
210 | eval { |
|
|
211 | $cb->($pkg); |
|
|
212 | 1 |
|
|
213 | } or warn "$pkg unloaded, but with errors: $@"; |
211 | } |
214 | } |
212 | |
215 | |
213 | Symbol::delete_package $pkg; |
216 | Symbol::delete_package $pkg; |
214 | } |
217 | } |
215 | |
218 | |