--- deliantra/server/lib/cf/mapscript.pm	2009/11/03 23:44:21	1.7
+++ deliantra/server/lib/cf/mapscript.pm	2010/01/10 19:21:47	1.8
@@ -42,7 +42,7 @@
 
 =cut
 
-package safe::mapscript;
+package cf::mapscript::eval;
 
 use common::sense;
 
@@ -66,7 +66,7 @@
 
 =cut
 
-our ($self, $state, $activator, $originator);
+use vars qw($self $state $activator $originator);
 
 =item @obs = find $id_or_object
 
@@ -108,16 +108,20 @@
 
 package cf::mapscript;
 
-use strict qw(subs vars);
+use common::sense;
+
+*{"main::safe::cf::mapscript::eval::"} = \%{"main::cf::mapscript::eval::"};
 
 our %CACHE;
 
 sub activate($$$) {
+   package cf::mapscript::eval;
+
    ($self, $state, $activator, $originator) = @_;
 
    (
       $CACHE{$self->msg} ||= cf::safe_eval
-         "package mapscript; sub {\n"
+         "package cf::mapscript::eval; sub {\n"
          . "#line 1 '" . ($self->debug_desc) . "'\n"
          . $self->msg
          . "\n}"