--- deliantra/server/ext/reseller.ext	2006/12/21 22:41:34	1.3
+++ deliantra/server/ext/reseller.ext	2007/06/11 21:38:13	1.7
@@ -1,4 +1,4 @@
-#!perl
+#!perl # mandatory
 
 my %unit = (
    silver   => 1,
@@ -27,34 +27,34 @@
          $who->map->path, $who->name, $action, $info;
 }
 
+sub find_rec;
+
 sub find_rec {
    my ($ob, $cb) = @_;
 
-   my @unpaid;
+   my @found;
    for my $i ($ob->inv) {
-      push @unpaid, $i if $cb->($i);
-
-      push @unpaid, find_unpaid ($i, $cb)
-         if $i->inv;
+      push @found, $i if $cb->($i);
+      push @found, find_rec $i, $cb if $i->inv;
    }
-   return @unpaid;
+
+   return @found;
 }
 
 sub find_unpaid {
    my ($ob) = @_;
-   my @r = find_rec ($ob, sub { $_[0]->flag (cf::FLAG_UNPAID) });
-   return @r;
+   find_rec $ob, sub { $_[0]->flag (cf::FLAG_UNPAID) };
 }
 
 sub find_traded {
    my ($ob) = @_;
-   my @r = find_rec ($ob, sub { $_[0]->get_ob_key_value ('ext_reseller_seller') ne '' });
-   return @r;
+   find_rec $ob, sub { $_[0]->get_ob_key_value ('ext_reseller_seller') ne '' };
 }
 
 cf::register_script_function "reseller::list_sells" => sub {
    my ($who, $msg, $npc) = @_;
-   my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales');
+   my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales');
+   my $sells = $ext_re_sales && cf::from_json $ext_re_sales;
    my $hissells = $sells->{$who->name};
 
    unless (keys %{$hissells || {}}) {
@@ -74,7 +74,8 @@
 
 cf::register_script_function "reseller::pay_player" => sub {
    my ($who, $msg, $npc) = @_;
-   my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales');
+   my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales');
+   my $sells = $ext_re_sales && cf::from_json $ext_re_sales;
    my $hissells = $sells->{$who->name};
 
    unless (keys %{$hissells || {}}) {
@@ -92,7 +93,8 @@
 
    $sells->{$who->name} = {};
 
-   $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells);
+   $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells)
+      if $sells;
 
    0
 };
@@ -109,7 +111,8 @@
          return cf::override;
       }
 
-      my $sells = cf::from_json $obs[0]->get_ob_key_value ('ext_reseller_sales');
+      my $ext_re_sales = $obs[0]->get_ob_key_value ('ext_reseller_sales');
+      my $sells = $ext_re_sales && cf::from_json $ext_re_sales;
 
       my $unpaid_items = {};
 
@@ -154,7 +157,8 @@
       audit_log ($who, 'removed', (join ",", @seller_noted))
          if @seller_noted;
 
-      $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells);
+      $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells)
+         if $sells;
 
       cf::override;
    },