[419] Changes in Characters::LoadInventory() and Item::LoadFromDB() r…

…elated to Trinity`s 10654 commit
Shadez · Dec 18, 2010 · a65b527 · Vasago · Dec 18, 2010 · a65b527
1 parent 5087421
commit a65b527
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/includes/classes/class.characters.php b/includes/classes/class.characters.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 415
+ * @revision 419
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -2930,10 +2930,26 @@ public function GetModelData() {
         }
     }
 
+    /**
+     * Checks for spell ID in character's spellbook
+     * @category Characters class
+     * @access   public
+     * @param    int $spell_id
+     * @return   bool
+     **/
     public function HasSpell($spell_id) {
-        return $this->db->selectCell("SELECT 1 FROM `character_spell` WHERE `spell`=%d AND `guid`=%d AND `active`=1 AND `disabled`=0 LIMIT 1", $spell_id, $this->guid);;
+        return (bool) $this->db->selectCell("SELECT 1 FROM `character_spell` WHERE `spell`=%d AND `guid`=%d AND `active`=1 AND `disabled`=0 LIMIT 1", $spell_id, $this->guid);;
     }
 
+    /**
+     * Checks for talent ID in active or all specs
+     * @category Characters class
+     * @access   public
+     * @param    int $talent_id
+     * @param    bool $active_spec = true
+     * @param    int $rank = -1
+     * @return   bool
+     **/
     public function HasTalent($talent_id, $active_spec = true, $rank = -1) {
         if($active_spec) {
             if($rank == -1) {
@@ -2951,9 +2967,17 @@ public function HasTalent($talent_id, $active_spec = true, $rank = -1) {
                 $has = $this->db->selectCell("SELECT 1 FROM `character_talent` WHERE `talent_id`=%d AND `guid`=%d AND `current_rank`=%d", $talent_id, $this->guid, $rank);
             }
         }
-        return $has;
+        return (bool) $has;
     }
 
+    /**
+     * Returns talent rank by talent ID (if player have this talent)
+     * @category Characters class
+     * @access   public
+     * @param    int $talent_id
+     * @param    bool $active_spec = true
+     * @return   int
+     **/
     public function GetTalentRankByID($talent_id, $active_spec = true) {
         if($active_spec) {
             $rank = $this->db->selectCell("SELECT `current_rank` FROM `character_talent` WHERE `talent_id`=%d AND `guid`=%d AND `spec`=%d LIMIT 1", $talent_id, $this->guid, $this->activeSpec);
@@ -2967,6 +2991,13 @@ public function GetTalentRankByID($talent_id, $active_spec = true) {
         return $rank;
     }
 
+    /**
+     * Returns skill value by skill ID (if player have this skill)
+     * @category Characters class
+     * @access   public
+     * @param    int $skill
+     * @return   int
+     **/
     public function GetSkillValue($skill) {
         return $this->db->selectCell("SELECT `value` FROM `character_skills` WHERE `guid`=%d AND `skill`=%d", $this->guid, $skill);
     }
@@ -3006,7 +3037,13 @@ private function LoadInventory() {
             $this->armory->Log()->writeError('%s : player guid is not defined.', __METHOD__);
             return false;
         }
-        $inv = $this->db->select("SELECT `item`, `slot`, `item_template`, `bag` FROM `character_inventory` WHERE `bag` = 0 AND `slot` < %d AND `guid` = %d", INV_MAX, $this->guid);
+        switch($this->m_server) {
+            case SERVER_MANGOS:
+                $inv = $this->db->select("SELECT `item`, `slot`, `item_template`, `bag` FROM `character_inventory` WHERE `bag` = 0 AND `slot` < %d AND `guid` = %d", INV_MAX, $this->guid);
+                break;
+            case SERVER_TRINITY:
+                $inv = $this->db->select("SELECT `item`, `slot`, `bag`, FROM `character_inventory` WHERE `bag` = 0 AND `slot` < %d AND `guid` = %d", INV_MAX, $this->guid);
+        }
         if(!$inv) {
             return false;
         }

diff --git a/includes/classes/class.item.php b/includes/classes/class.item.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 400
+ * @revision 419
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -91,6 +91,7 @@ public function LoadFromDB($data, $owner_guid, $db) {
                 return false;
             }
             $this->m_values = explode(' ', $m_values);
+            $this->entry = $data['item_template'];
         }
         elseif($this->m_server == SERVER_TRINITY) {
             $this->tc_data = $this->db->selectRow("SELECT * FROM `item_instance` WHERE `guid` = %d AND `owner_guid` = %d", $this->m_guid, $this->m_owner);
@@ -103,6 +104,7 @@ public function LoadFromDB($data, $owner_guid, $db) {
                 $this->tc_ench = explode(' ', $this->tc_data['enchantments']);
             }
             $this->tc_data['maxdurability'] = $this->armory->wDB->selectCell("SELECT `MaxDurability` FROM `item_template` WHERE `entry`=%d", $data['item_template']);
+            $this->entry = $this->tc_data['itemEntry'];
         }
         else {
             $this->armory->Log()->writeError('%s : unknown server type (%d), unable to handle item!', __METHOD__, $this->m_server);

diff --git a/includes/revision_nr.php b/includes/revision_nr.php
@@ -1,5 +1,5 @@
 <?php
-define('ARMORY_REVISION', 417);
+define('ARMORY_REVISION', 419);
 define('DB_VERSION', 'armory_r416');
 define('CONFIG_VERSION', '0708201001');
 ?>