Fixes for image generation

[shipsimu.git] / application / ship-simu / main / class_Merchant.php

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index 8f23118a3216c02cbf50fc074ca07fb98097ff52..52982537df6dca49986c1617474392cf06e21f2e 100644 (file)
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -36,12 +36,6 @@ class Merchant extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set description
-               $this->setObjectDescription("Händler");
-
-               // Generate unique ID number
-               $this->generateUniqueId();
-
                // Clean up a little
                $this->removeSystemArray();
        }
@@ -56,7 +50,7 @@ class Merchant extends BaseFrameworkSystem {
 
                // Debug message
                if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) {
-                       $merchantInstance->getDebugInstance()->output(sprintf("[%s:%d] Ein H&auml;ndler <strong>%s</strong> wird angelegt und soll sich am <strong>%s</strong> niederlassen.",
+                       $merchantInstance->debugOutput(sprintf("[%s:%d] Ein H&auml;ndler <strong>%s</strong> wird angelegt und soll sich am <strong>%s</strong> niederlassen.",
                                __CLASS__,
                                __LINE__,
                                $merchantName,
@@ -105,54 +99,12 @@ class Merchant extends BaseFrameworkSystem {
 
        // Add new item to merchant's price list
        public function addItemToPriceList (TradeableItem $itemInstance, $price) {
-               // Secure pricing
-               $price = (float) $price;
-
-               // Debug message
-               if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndler <strong>%s</strong> kann nun das Schiffsteil <strong>%s</strong> &quot;<strong>%s</strong>&quot; zu <strong>%s</strong> verkaufen.",
-                       __CLASS__,
-                       __LINE__,
-                       $this->getMerchantName(),
-                       $itemInstance->__toString(),
-                       $itemInstance->getObjectDescription(),
-                       $this->formatCurrency($price)
-               ));
-
-               // Construct pricing item and add it to the list
-               $this->priceList->append(array(
-                       'item'  => $itemInstance,
-                       'price' => $price
-               ));
-
-               // Remove price attribute
-               $itemInstance->removePrice();
+               $this->makeDeprecated();
        }
 
        // Get a price from the merchant's list
        public final function getPriceFromList (TradeableItem $itemInstance) {
-               $price = 0;
-
-               // Iterate throw whole list
-               for ($iter = $this->priceList->getIterator(); $iter->valid(); $iter->next()) {
-                       // Get current item
-                       $item = $iter->current();
-
-                       // Does this item match? The unique ID may not work...
-                       if ($item['item']->itemMatches($itemInstance)) {
-                               // Extract price and stop searching
-                               $price = $item['price'];
-                               break;
-                       }
-               }
-
-               // Was the item found?
-               if ($price === 0) {
-                       // Throw exception
-                       throw new ItemNotInPriceListException($itemInstance, self::EXCEPTION_ITEM_NOT_IN_PRICE_LIST);
-               }
-
-               // Return price
-               return $price;
+               $this->makeDeprecated();
        }
 }