diff options
14 files changed, 40 insertions, 38 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index e7e68407156..addebff5aa5 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1120,6 +1120,36 @@ LOCK TABLES `character_talent` WRITE; UNLOCK TABLES; -- +-- Table structure for table `character_void_storage` +-- + +DROP TABLE IF EXISTS `character_void_storage`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `character_void_storage` ( + `itemId` bigint(20) unsigned NOT NULL, + `playerGuid` int(10) unsigned NOT NULL, + `itemEntry` mediumint(8) unsigned NOT NULL, + `slot` tinyint(3) unsigned NOT NULL, + `creatorGuid` int(10) unsigned NOT NULL DEFAULT '0', + `randomProperty` int(10) unsigned NOT NULL DEFAULT '0', + `suffixFactor` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`itemId`), + UNIQUE KEY `idx_player_slot` (`playerGuid`,`slot`), + KEY `idx_player` (`playerGuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `character_void_storage` +-- + +LOCK TABLES `void_storage` WRITE; +/*!40000 ALTER TABLE `character_void_storage` DISABLE KEYS */; +/*!40000 ALTER TABLE `character_void_storage` ENABLE KEYS */; +UNLOCK TABLES; + +-- -- Table structure for table `characters` -- @@ -2266,36 +2296,6 @@ LOCK TABLES `reserved_name` WRITE; UNLOCK TABLES; -- --- Table structure for table `void_storage` --- - -DROP TABLE IF EXISTS `void_storage`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `void_storage` ( - `itemId` bigint(20) unsigned NOT NULL, - `playerGuid` int(10) unsigned NOT NULL, - `itemEntry` mediumint(8) unsigned NOT NULL, - `slot` tinyint(3) unsigned NOT NULL, - `creatorGuid` int(10) unsigned NOT NULL DEFAULT '0', - `randomProperty` int(10) unsigned NOT NULL DEFAULT '0', - `suffixFactor` int(10) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`itemId`), - UNIQUE KEY `idx_player_slot` (`playerGuid`,`slot`), - KEY `idx_player` (`playerGuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `void_storage` --- - -LOCK TABLES `void_storage` WRITE; -/*!40000 ALTER TABLE `void_storage` DISABLE KEYS */; -/*!40000 ALTER TABLE `void_storage` ENABLE KEYS */; -UNLOCK TABLES; - --- -- Table structure for table `warden_action` -- diff --git a/sql/updates/characters/2012_07_10_00_characters_character_glyphs.sql b/sql/updates/characters/2012_07_10_00_characters_character_glyphs_434.sql index b8aba4d7798..b8aba4d7798 100644 --- a/sql/updates/characters/2012_07_10_00_characters_character_glyphs.sql +++ b/sql/updates/characters/2012_07_10_00_characters_character_glyphs_434.sql diff --git a/sql/updates/characters/2012_08_07_00_characters_characters.sql b/sql/updates/characters/2012_08_07_00_characters_characters_434.sql index e9bea82ad4b..e9bea82ad4b 100644 --- a/sql/updates/characters/2012_08_07_00_characters_characters.sql +++ b/sql/updates/characters/2012_08_07_00_characters_characters_434.sql diff --git a/sql/updates/characters/2012_08_07_01_characters_void_storage_434.sql b/sql/updates/characters/2012_08_07_01_characters_void_storage_434.sql new file mode 100644 index 00000000000..8a68ba3740d --- /dev/null +++ b/sql/updates/characters/2012_08_07_01_characters_void_storage_434.sql @@ -0,0 +1 @@ +RENAME TABLE `void_storage` TO `character_void_storage`; diff --git a/sql/updates/world/2012_08_05_02_world_command.sql b/sql/updates/world/2012_08_05_02_world_command_434.sql index 69fd621c457..69fd621c457 100644 --- a/sql/updates/world/2012_08_05_02_world_command.sql +++ b/sql/updates/world/2012_08_05_02_world_command_434.sql diff --git a/sql/updates/world/2012_08_06_00_world_classlevelstats.sql b/sql/updates/world/2012_08_06_00_world_classlevelstats_434.sql index e6038374508..e6038374508 100644 --- a/sql/updates/world/2012_08_06_00_world_classlevelstats.sql +++ b/sql/updates/world/2012_08_06_00_world_classlevelstats_434.sql diff --git a/sql/updates/world/2012_08_06_00_world_command.sql b/sql/updates/world/2012_08_06_00_world_command_434.sql index 50628aaa589..50628aaa589 100644 --- a/sql/updates/world/2012_08_06_00_world_command.sql +++ b/sql/updates/world/2012_08_06_00_world_command_434.sql diff --git a/sql/updates/world/2012_08_06_01_world_classlevelstats.sql b/sql/updates/world/2012_08_06_01_world_classlevelstats_434.sql index 6fe7ad67994..6fe7ad67994 100644 --- a/sql/updates/world/2012_08_06_01_world_classlevelstats.sql +++ b/sql/updates/world/2012_08_06_01_world_classlevelstats_434.sql diff --git a/sql/updates/world/2012_08_08_00_world_creature_template.sql b/sql/updates/world/2012_08_08_00_world_creature_template_434.sql index 1e934b9f612..1e934b9f612 100644 --- a/sql/updates/world/2012_08_08_00_world_creature_template.sql +++ b/sql/updates/world/2012_08_08_00_world_creature_template_434.sql diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a337caadd73..bdfb997a1af 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -13136,7 +13136,7 @@ void Player::SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 void Player::SendSellError(SellResult msg, Creature* creature, uint64 guid) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_SELL_ITEM"); - WorldPacket data(SMSG_SELL_ITEM, (8+8+(param?4:0)+1)); // last check 4.3.4 + WorldPacket data(SMSG_SELL_ITEM, (8+8+1)); // last check 4.3.4 data << uint64(creature ? creature->GetGUID() : 0); data << uint64(guid); data << uint8(msg); @@ -17010,7 +17010,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) // set value, including drunk invisibility detection // calculate sobering. after 15 minutes logged out, the player will be sober again uint8 newDrunkValue = 0; - if (time_diff < GetDrunkValue() * 9) + if (time_diff < uint32(GetDrunkValue()) * 9) newDrunkValue = GetDrunkValue() - time_diff / 9; SetDrunkValue(newDrunkValue); @@ -17606,7 +17606,7 @@ void Player::_LoadVoidStorage(PreparedQueryResult result) do { - // SELECT itemid, itemEntry, slot, creatorGuid FROM void_storage WHERE playerGuid = ? + // SELECT itemid, itemEntry, slot, creatorGuid FROM character_void_storage WHERE playerGuid = ? Field* fields = result->Fetch(); uint64 itemId = fields[0].GetUInt64(); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 7a5418e8645..50a2de70d33 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -44,6 +44,7 @@ #include<vector> struct Mail; +struct ItemExtendedCostEntry; class Channel; class Creature; class DynamicObject; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c1fe89fa86b..1843a68f095 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6126,7 +6126,7 @@ void ObjectMgr::SetHighestGuids() if (result) sGroupMgr->SetGroupDbStoreSize((*result)[0].GetUInt32()+1); - result = CharacterDatabase.Query("SELECT MAX(itemId) from void_storage"); + result = CharacterDatabase.Query("SELECT MAX(itemId) from character_void_storage"); if (result) _voidItemId = (*result)[0].GetUInt64()+1; } diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index c7b766cacd0..67b4d780942 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -236,7 +236,7 @@ public: return false; SellResult msg = SellResult(atoi(args)); - handler->GetSession()->GetPlayer()->SendSellError(msg, 0, 0, 0); + handler->GetSession()->GetPlayer()->SendSellError(msg, 0, 0); return true; } diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 222e212a08f..6c58ee28838 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -556,7 +556,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_DEL_CHAR_ACTION_EXCEPT_SPEC, "DELETE FROM character_action WHERE spec<>? AND guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_SEL_CHAR_PET_BY_ENTRY_AND_SLOT, "SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, abdata, savetime, CreatedBySpell, PetType FROM character_pet WHERE owner = ? AND slot = ?", CONNECTION_SYNCH); - PREPARE_STATEMENT(CHAR_SEL_VOID_STORAGE, "SELECT itemId, itemEntry, slot, creatorGuid, randomProperty, suffixFactor FROM void_storage WHERE playerGuid = ?", CONNECTION_ASYNC); - PREPARE_STATEMENT(CHAR_REP_VOID_STORAGE_ITEM, "REPLACE INTO void_storage (itemId, playerGuid, itemEntry, slot, creatorGuid, randomProperty, suffixFactor) VALUES (?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_DEL_VOID_STORAGE_ITEM_BY_SLOT, "DELETE FROM void_storage WHERE slot = ? AND playerGuid = ?", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_SEL_VOID_STORAGE, "SELECT itemId, itemEntry, slot, creatorGuid, randomProperty, suffixFactor FROM character_void_storage WHERE playerGuid = ?", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_REP_VOID_STORAGE_ITEM, "REPLACE INTO character_void_storage (itemId, playerGuid, itemEntry, slot, creatorGuid, randomProperty, suffixFactor) VALUES (?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_DEL_VOID_STORAGE_ITEM_BY_SLOT, "DELETE FROM character_void_storage WHERE slot = ? AND playerGuid = ?", CONNECTION_ASYNC); } |