From 19316744ce2d6598cd2f8ee2c2276bd7ddb68009 Mon Sep 17 00:00:00 2001
From: "Igor Barkov [iwork]" <lopar.4ever@gmail.com>
Date: Mon, 14 Jan 2019 15:52:41 +0200
Subject: [PATCH] it works?!

---
 classes/InventoryItem.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/classes/InventoryItem.php b/classes/InventoryItem.php
index 2b28af0..0bf483f 100644
--- a/classes/InventoryItem.php
+++ b/classes/InventoryItem.php
@@ -5,7 +5,6 @@ class InventoryItem extends Item
     private $present;
     private $artefact;
     private $item_id;
-    private $magic;
 
     public function __construct($row)
     {
@@ -13,7 +12,6 @@ class InventoryItem extends Item
         $this->present = $row['present'];
         $this->artefact = $row['artefact'];
         $this->item_id = $row['id'];
-        $this->magic = $row['magic'];
 
         if ($this->artefact) $this->name = <<<NAME
 <b style='color: crimson;'>{$this->name}</b> <img src="//{$_SERVER['SERVER_NAME']}/i/artefact1.gif">
@@ -25,6 +23,7 @@ NAME;
         parent::printBaseInfo();
         parent::printRequirements();
         parent::printBonuses();
+        parent::printMagic();
         if ($this->present) echo "<p style='color: maroon; font-style: italic'>Это подарок от {$this->present}. Вы не можете передать его кому-либо ещё.</p>";
     }
 
@@ -48,10 +47,4 @@ NAME;
                                    onclick="location='/admin.php'">
 BTN;
     }
-
-    private function ShowMagicInfo($id)
-    {
-        $row = db::c()->query('SELECT * FROM `magic` WHERE `id` = ?i',$id)->fetch_assoc();
-        $this->magicname = $row['name'];
-    }
 }
\ No newline at end of file