diff options
| -rw-r--r-- | sql/base/characters_database.sql | 128 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_guild_bank_item.sql | 4 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_guild_bank_right.sql | 5 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_guild_bank_tab.sql | 5 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_guild_eventlog.sql | 8 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_guild_member.sql | 21 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_guild_rank.sql | 7 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_instance.sql | 6 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_instance_reset.sql | 4 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_item_instance.sql | 10 | ||||
| -rw-r--r-- | sql/updates/2011_01_20_0_characters_item_refund_instance.sql | 6 | ||||
| -rwxr-xr-x | src/server/game/Entities/Item/Item.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Guilds/Guild.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Instances/InstanceSaveMgr.cpp | 18 |
15 files changed, 153 insertions, 77 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 9567d2b638f..547e3a054c2 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1575,10 +1575,10 @@ DROP TABLE IF EXISTS `guild_bank_item`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `guild_bank_item` ( - `guildid` int(11) unsigned NOT NULL DEFAULT '0', - `TabId` tinyint(1) unsigned NOT NULL DEFAULT '0', + `guildid` int(10) unsigned NOT NULL DEFAULT '0', + `TabId` tinyint(3) unsigned NOT NULL DEFAULT '0', `SlotId` tinyint(3) unsigned NOT NULL DEFAULT '0', - `item_guid` int(11) unsigned NOT NULL DEFAULT '0', + `item_guid` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`guildid`,`TabId`,`SlotId`), KEY `guildid_key` (`guildid`), KEY `Idx_item_guid` (`item_guid`) @@ -1602,11 +1602,11 @@ DROP TABLE IF EXISTS `guild_bank_right`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `guild_bank_right` ( - `guildid` int(11) unsigned NOT NULL DEFAULT '0', - `TabId` tinyint(1) unsigned NOT NULL DEFAULT '0', - `rid` tinyint(1) unsigned NOT NULL DEFAULT '0', + `guildid` int(10) unsigned NOT NULL DEFAULT '0', + `TabId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `rid` tinyint(3) unsigned NOT NULL DEFAULT '0', `gbright` tinyint(3) unsigned NOT NULL DEFAULT '0', - `SlotPerDay` int(11) unsigned NOT NULL DEFAULT '0', + `SlotPerDay` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`guildid`,`TabId`,`rid`), KEY `guildid_key` (`guildid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -1629,11 +1629,11 @@ DROP TABLE IF EXISTS `guild_bank_tab`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `guild_bank_tab` ( - `guildid` int(11) unsigned NOT NULL DEFAULT '0', - `TabId` tinyint(1) unsigned NOT NULL DEFAULT '0', - `TabName` varchar(100) NOT NULL DEFAULT '', + `guildid` int(10) unsigned NOT NULL DEFAULT '0', + `TabId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `TabName` varchar(16) NOT NULL DEFAULT '', `TabIcon` varchar(100) NOT NULL DEFAULT '', - `TabText` text, + `TabText` varchar(500) DEFAULT NULL, PRIMARY KEY (`guildid`,`TabId`), KEY `guildid_key` (`guildid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -1656,13 +1656,13 @@ DROP TABLE IF EXISTS `guild_eventlog`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `guild_eventlog` ( - `guildid` int(11) NOT NULL COMMENT 'Guild Identificator', - `LogGuid` int(11) NOT NULL COMMENT 'Log record identificator - auxiliary column', - `EventType` tinyint(1) NOT NULL COMMENT 'Event type', - `PlayerGuid1` int(11) NOT NULL COMMENT 'Player 1', - `PlayerGuid2` int(11) NOT NULL COMMENT 'Player 2', - `NewRank` tinyint(2) NOT NULL COMMENT 'New rank(in case promotion/demotion)', - `TimeStamp` bigint(20) NOT NULL COMMENT 'Event UNIX time', + `guildid` int(10) unsigned NOT NULL COMMENT 'Guild Identificator', + `LogGuid` int(10) unsigned NOT NULL COMMENT 'Log record identificator - auxiliary column', + `EventType` tinyint(3) unsigned NOT NULL COMMENT 'Event type', + `PlayerGuid1` int(10) unsigned NOT NULL COMMENT 'Player 1', + `PlayerGuid2` int(10) unsigned NOT NULL COMMENT 'Player 2', + `NewRank` tinyint(3) unsigned NOT NULL COMMENT 'New rank(in case promotion/demotion)', + `TimeStamp` int(10) unsigned NOT NULL COMMENT 'Event UNIX time', PRIMARY KEY (`guildid`,`LogGuid`), KEY `Idx_PlayerGuid1` (`PlayerGuid1`), KEY `Idx_PlayerGuid2` (`PlayerGuid2`), @@ -1687,29 +1687,29 @@ DROP TABLE IF EXISTS `guild_member`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `guild_member` ( - `guildid` int(6) unsigned NOT NULL DEFAULT '0', - `guid` int(11) unsigned NOT NULL DEFAULT '0', - `rank` tinyint(2) unsigned NOT NULL DEFAULT '0', - `pnote` varchar(255) NOT NULL DEFAULT '', - `offnote` varchar(255) NOT NULL DEFAULT '', - `BankResetTimeMoney` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemMoney` int(11) unsigned NOT NULL DEFAULT '0', - `BankResetTimeTab0` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemSlotsTab0` int(11) unsigned NOT NULL DEFAULT '0', - `BankResetTimeTab1` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemSlotsTab1` int(11) unsigned NOT NULL DEFAULT '0', - `BankResetTimeTab2` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemSlotsTab2` int(11) unsigned NOT NULL DEFAULT '0', - `BankResetTimeTab3` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemSlotsTab3` int(11) unsigned NOT NULL DEFAULT '0', - `BankResetTimeTab4` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemSlotsTab4` int(11) unsigned NOT NULL DEFAULT '0', - `BankResetTimeTab5` int(11) unsigned NOT NULL DEFAULT '0', - `BankRemSlotsTab5` int(11) unsigned NOT NULL DEFAULT '0', + `guildid` int(10) unsigned NOT NULL COMMENT 'Guild Identificator', + `guid` int(10) unsigned NOT NULL, + `rank` tinyint(3) unsigned NOT NULL, + `pnote` varchar(31) NOT NULL DEFAULT '', + `offnote` varchar(31) NOT NULL DEFAULT '', + `BankResetTimeMoney` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemMoney` int(10) unsigned NOT NULL DEFAULT '0', + `BankResetTimeTab0` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemSlotsTab0` int(10) unsigned NOT NULL DEFAULT '0', + `BankResetTimeTab1` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemSlotsTab1` int(10) unsigned NOT NULL DEFAULT '0', + `BankResetTimeTab2` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemSlotsTab2` int(10) unsigned NOT NULL DEFAULT '0', + `BankResetTimeTab3` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemSlotsTab3` int(10) unsigned NOT NULL DEFAULT '0', + `BankResetTimeTab4` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemSlotsTab4` int(10) unsigned NOT NULL DEFAULT '0', + `BankResetTimeTab5` int(10) unsigned NOT NULL DEFAULT '0', + `BankRemSlotsTab5` int(10) unsigned NOT NULL DEFAULT '0', UNIQUE KEY `guid_key` (`guid`), KEY `guildid_key` (`guildid`), KEY `guildid_rank_key` (`guildid`,`rank`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Guild System'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild System'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1729,11 +1729,11 @@ DROP TABLE IF EXISTS `guild_rank`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `guild_rank` ( - `guildid` int(6) unsigned NOT NULL DEFAULT '0', - `rid` tinyint(1) unsigned NOT NULL, - `rname` varchar(255) NOT NULL DEFAULT '', - `rights` int(3) unsigned NOT NULL DEFAULT '0', - `BankMoneyPerDay` int(11) unsigned NOT NULL DEFAULT '0', + `guildid` int(10) unsigned NOT NULL DEFAULT '0', + `rid` tinyint(3) unsigned NOT NULL, + `rname` varchar(15) NOT NULL DEFAULT '', + `rights` mediumint(8) unsigned NOT NULL DEFAULT '0', + `BankMoneyPerDay` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`guildid`,`rid`), KEY `Idx_rid` (`rid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild System'; @@ -1756,11 +1756,11 @@ DROP TABLE IF EXISTS `instance`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `instance` ( - `id` int(11) unsigned NOT NULL DEFAULT '0', - `map` int(11) unsigned NOT NULL DEFAULT '0', - `resettime` bigint(40) NOT NULL DEFAULT '0', - `difficulty` tinyint(1) unsigned NOT NULL DEFAULT '0', - `data` longtext, + `id` int(10) unsigned NOT NULL DEFAULT '0', + `map` smallint(5) unsigned NOT NULL DEFAULT '0', + `resettime` int(10) unsigned NOT NULL DEFAULT '0', + `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0', + `data` tinytext NOT NULL, PRIMARY KEY (`id`), KEY `map` (`map`), KEY `resettime` (`resettime`), @@ -1785,9 +1785,9 @@ DROP TABLE IF EXISTS `instance_reset`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `instance_reset` ( - `mapid` int(11) unsigned NOT NULL DEFAULT '0', - `difficulty` tinyint(1) unsigned NOT NULL DEFAULT '0', - `resettime` bigint(40) NOT NULL DEFAULT '0', + `mapid` smallint(5) unsigned NOT NULL DEFAULT '0', + `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0', + `resettime` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`mapid`,`difficulty`), KEY `difficulty` (`difficulty`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -1810,20 +1810,20 @@ DROP TABLE IF EXISTS `item_instance`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `item_instance` ( - `guid` int(11) unsigned NOT NULL DEFAULT '0', + `guid` int(10) unsigned NOT NULL DEFAULT '0', `itemEntry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `owner_guid` int(11) unsigned NOT NULL DEFAULT '0', + `owner_guid` int(10) unsigned NOT NULL DEFAULT '0', `creatorGuid` int(10) unsigned NOT NULL DEFAULT '0', `giftCreatorGuid` int(10) unsigned NOT NULL DEFAULT '0', `count` int(10) unsigned NOT NULL DEFAULT '1', - `duration` int(10) unsigned NOT NULL DEFAULT '0', - `charges` text NOT NULL, - `flags` int(10) unsigned NOT NULL DEFAULT '0', + `duration` int(10) NOT NULL DEFAULT '0', + `charges` tinytext, + `flags` mediumint(8) unsigned NOT NULL DEFAULT '0', `enchantments` text NOT NULL, - `randomPropertyId` int(11) NOT NULL DEFAULT '0', - `durability` int(10) unsigned NOT NULL DEFAULT '0', + `randomPropertyId` smallint(5) NOT NULL DEFAULT '0', + `durability` smallint(5) unsigned NOT NULL DEFAULT '0', `playedTime` int(10) unsigned NOT NULL DEFAULT '0', - `text` longtext, + `text` text, PRIMARY KEY (`guid`), KEY `idx_owner_guid` (`owner_guid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Item System'; @@ -1846,10 +1846,10 @@ DROP TABLE IF EXISTS `item_refund_instance`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `item_refund_instance` ( - `item_guid` int(11) unsigned NOT NULL COMMENT 'Item GUID', - `player_guid` int(11) unsigned NOT NULL COMMENT 'Player GUID', - `paidMoney` int(11) unsigned NOT NULL DEFAULT '0', - `paidExtendedCost` int(11) unsigned NOT NULL DEFAULT '0', + `item_guid` int(10) unsigned NOT NULL COMMENT 'Item GUID', + `player_guid` int(10) unsigned NOT NULL COMMENT 'Player GUID', + `paidMoney` int(10) unsigned NOT NULL DEFAULT '0', + `paidExtendedCost` smallint(5) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`item_guid`,`player_guid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Item Refund System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2192,4 +2192,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2011-01-20 0:05:54 +-- Dump completed on 2011-01-20 0:59:06 diff --git a/sql/updates/2011_01_20_0_characters_guild_bank_item.sql b/sql/updates/2011_01_20_0_characters_guild_bank_item.sql new file mode 100644 index 00000000000..d3c0157ff51 --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_guild_bank_item.sql @@ -0,0 +1,4 @@ +ALTER TABLE `guild_bank_item` +CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `item_guid` `item_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_guild_bank_right.sql b/sql/updates/2011_01_20_0_characters_guild_bank_right.sql new file mode 100644 index 00000000000..9c72527ca5d --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_guild_bank_right.sql @@ -0,0 +1,5 @@ +ALTER TABLE `guild_bank_right` +CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `rid` `rid` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `SlotPerDay` `SlotPerDay` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_guild_bank_tab.sql b/sql/updates/2011_01_20_0_characters_guild_bank_tab.sql new file mode 100644 index 00000000000..a096a0836cc --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_guild_bank_tab.sql @@ -0,0 +1,5 @@ +ALTER TABLE `guild_bank_tab` +CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `TabId` `TabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `TabName` `TabName` VARCHAR(16) DEFAULT '' NOT NULL, +CHANGE `TabText` `TabText` VARCHAR(500) NULL;
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_guild_eventlog.sql b/sql/updates/2011_01_20_0_characters_guild_eventlog.sql new file mode 100644 index 00000000000..cf5f71a347c --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_guild_eventlog.sql @@ -0,0 +1,8 @@ +ALTER TABLE `guild_eventlog` +CHANGE `guildid` `guildid` INT(10) UNSIGNED NOT NULL COMMENT 'Guild Identificator', +CHANGE `LogGuid` `LogGuid` INT(10) UNSIGNED NOT NULL COMMENT 'Log record identificator - auxiliary column', +CHANGE `EventType` `EventType` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Event type', +CHANGE `PlayerGuid1` `PlayerGuid1` INT(10) UNSIGNED NOT NULL COMMENT 'Player 1', +CHANGE `PlayerGuid2` `PlayerGuid2` INT(10) UNSIGNED NOT NULL COMMENT 'Player 2', +CHANGE `NewRank` `NewRank` TINYINT(3) UNSIGNED NOT NULL COMMENT 'New rank(in case promotion/demotion)', +CHANGE `TimeStamp` `TimeStamp` INT(10) UNSIGNED NOT NULL COMMENT 'Event UNIX time';
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_guild_member.sql b/sql/updates/2011_01_20_0_characters_guild_member.sql new file mode 100644 index 00000000000..f1d2f78727e --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_guild_member.sql @@ -0,0 +1,21 @@ +ALTER TABLE `guild_member` +ROW_FORMAT=DEFAULT, +CHANGE `guildid` `guildid` INT(10) UNSIGNED NOT NULL COMMENT 'Guild Identificator', +CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL, +CHANGE `rank` `rank` TINYINT(3) UNSIGNED NOT NULL, +CHANGE `pnote` `pnote` varchar(31) NOT NULL DEFAULT '', +CHANGE `offnote` `offnote` varchar(31) NOT NULL DEFAULT '', +CHANGE `BankResetTimeMoney` `BankResetTimeMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemMoney` `BankRemMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankResetTimeTab0` `BankResetTimeTab0` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemSlotsTab0` `BankRemSlotsTab0` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankResetTimeTab1` `BankResetTimeTab1` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemSlotsTab1` `BankRemSlotsTab1` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankResetTimeTab2` `BankResetTimeTab2` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemSlotsTab2` `BankRemSlotsTab2` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankResetTimeTab3` `BankResetTimeTab3` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemSlotsTab3` `BankRemSlotsTab3` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankResetTimeTab4` `BankResetTimeTab4` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemSlotsTab4` `BankRemSlotsTab4` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankResetTimeTab5` `BankResetTimeTab5` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `BankRemSlotsTab5` `BankRemSlotsTab5` INT(10) UNSIGNED NOT NULL DEFAULT '0';
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_guild_rank.sql b/sql/updates/2011_01_20_0_characters_guild_rank.sql new file mode 100644 index 00000000000..f66102bd112 --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_guild_rank.sql @@ -0,0 +1,7 @@ +ALTER TABLE `guild_rank` +ROW_FORMAT=DEFAULT, +CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `rid` `rid` TINYINT(3) UNSIGNED NOT NULL, +CHANGE `rname` `rname` VARCHAR(15) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' NOT NULL, +CHANGE `rights` `rights` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `BankMoneyPerDay` `BankMoneyPerDay` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_instance.sql b/sql/updates/2011_01_20_0_characters_instance.sql new file mode 100644 index 00000000000..2b1be5718b5 --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_instance.sql @@ -0,0 +1,6 @@ +ALTER TABLE `instance` +CHANGE `id` `id` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `resettime` `resettime` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `difficulty` `difficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `data` `data` TINYTEXT NOT NULL;
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_instance_reset.sql b/sql/updates/2011_01_20_0_characters_instance_reset.sql new file mode 100644 index 00000000000..6c72951339d --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_instance_reset.sql @@ -0,0 +1,4 @@ +ALTER TABLE `instance_reset` +CHANGE `mapid` `mapid` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `difficulty` `difficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `resettime` `resettime` INT(10) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file diff --git a/sql/updates/2011_01_20_0_characters_item_instance.sql b/sql/updates/2011_01_20_0_characters_item_instance.sql new file mode 100644 index 00000000000..649f87c4616 --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_item_instance.sql @@ -0,0 +1,10 @@ +ALTER TABLE `item_instance` +ROW_FORMAT=DEFAULT, +CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `owner_guid` `owner_guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `charges` `charges` TINYTEXT, +CHANGE `duration` `duration` INT(10) DEFAULT '0' NOT NULL, +CHANGE `flags` `flags` MEDIUMINT(8) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `randomPropertyId` `randomPropertyId` SMALLINT(5) DEFAULT '0' NOT NULL, +CHANGE `durability` `durability` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `text` `text` TEXT NULL; diff --git a/sql/updates/2011_01_20_0_characters_item_refund_instance.sql b/sql/updates/2011_01_20_0_characters_item_refund_instance.sql new file mode 100644 index 00000000000..0bd992e4bc3 --- /dev/null +++ b/sql/updates/2011_01_20_0_characters_item_refund_instance.sql @@ -0,0 +1,6 @@ +ALTER TABLE `item_refund_instance` +ROW_FORMAT=DEFAULT, +CHANGE `item_guid` `item_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Item GUID', +CHANGE `player_guid` `player_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Player GUID', +CHANGE `paidMoney` `paidMoney` INT(10) UNSIGNED DEFAULT '0' NOT NULL, +CHANGE `paidExtendedCost` `paidExtendedCost` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL;
\ No newline at end of file diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 969461d0bc3..f1366a43b86 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -420,12 +420,12 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, Field* fields, uint32 entr std::string enchants = fields[6].GetString(); _LoadIntoDataField(enchants.c_str(), ITEM_FIELD_ENCHANTMENT_1_1, MAX_ENCHANTMENT_SLOT * MAX_ENCHANTMENT_OFFSET); - SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID, fields[7].GetInt32()); + SetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID, fields[7].GetInt16()); // recalculate suffix factor if (GetItemRandomPropertyId() < 0) UpdateItemSuffixFactor(); - uint32 durability = fields[8].GetUInt32(); + uint32 durability = fields[8].GetUInt16(); SetUInt32Value(ITEM_FIELD_DURABILITY, durability); // update max durability (and durability) if need SetUInt32Value(ITEM_FIELD_MAXDURABILITY, proto->MaxDurability); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2f1ea4321b8..d945539cc36 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17063,7 +17063,7 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timediff) Field* fields2 = result2->Fetch(); item->SetRefundRecipient(fields2[0].GetUInt32()); item->SetPaidMoney(fields2[1].GetUInt32()); - item->SetPaidExtendedCost(fields2[2].GetUInt32()); + item->SetPaidExtendedCost(fields2[2].GetUInt16()); AddRefundReference(item->GetGUIDLow()); } } diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index e9fc6c4ec47..c80f6c28bf0 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1894,7 +1894,7 @@ bool Guild::LoadEventLogFromDB(Field* fields) m_eventLog->LoadEvent(new EventLogEntry( m_id, // guild id fields[1].GetUInt32(), // guid - fields[6].GetUInt64(), // timestamp + time_t(fields[6].GetUInt32()), // timestamp GuildEventLogTypes(fields[2].GetUInt8()), // event type fields[3].GetUInt32(), // player guid 1 fields[4].GetUInt32(), // player guid 2 diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 5ad50e05084..b6f9981d0df 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -178,7 +178,7 @@ void InstanceSave::SaveToDB() } } - CharacterDatabase.PExecute("INSERT INTO instance VALUES ('%u', '%u', '"UI64FMTD"', '%u', '%s')", m_instanceid, GetMapId(), (uint64)GetResetTimeForDB(), GetDifficulty(), data.c_str()); + CharacterDatabase.PExecute("INSERT INTO instance VALUES ('%u', '%u', '%u', '%u', '%s')", m_instanceid, GetMapId(), (uint32)GetResetTimeForDB(), GetDifficulty(), data.c_str()); } time_t InstanceSave::GetResetTimeForDB() @@ -321,11 +321,11 @@ void InstanceSaveManager::LoadResetTimes() { Field* fields = result->Fetch(); - if (time_t resettime = time_t(fields[3].GetUInt64())) + if (time_t resettime = time_t(fields[3].GetUInt32())) { uint32 id = fields[0].GetUInt32(); - uint32 mapid = fields[1].GetUInt32(); - uint32 difficulty = fields[2].GetUInt32(); + uint32 mapid = fields[1].GetUInt16(); + uint32 difficulty = fields[2].GetUInt8(); instResetTime[id] = ResetTimeMapDiffType(MAKE_PAIR32(mapid, difficulty), resettime); mapDiffResetInstances.insert(ResetTimeMapDiffInstances::value_type(MAKE_PAIR32(mapid, difficulty), id)); } @@ -365,9 +365,9 @@ void InstanceSaveManager::LoadResetTimes() do { Field *fields = result->Fetch(); - uint32 mapid = fields[0].GetUInt32(); + uint32 mapid = fields[0].GetUInt16(); Difficulty difficulty = Difficulty(fields[1].GetUInt32()); - uint64 oldresettime = fields[2].GetUInt64(); + uint64 oldresettime = fields[2].GetUInt32(); MapDifficulty const* mapDiff = GetMapDifficultyData(mapid, difficulty); if (!mapDiff) @@ -380,7 +380,7 @@ void InstanceSaveManager::LoadResetTimes() // update the reset time if the hour in the configs changes uint64 newresettime = (oldresettime / DAY) * DAY + diff; if (oldresettime != newresettime) - CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty = '%u'", newresettime, mapid, difficulty); + CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '%u' WHERE mapid = '%u' AND difficulty = '%u'", uint32(newresettime), mapid, difficulty); SetResetTimeFor(mapid, difficulty, newresettime); } while (result->NextRow()); @@ -413,7 +413,7 @@ void InstanceSaveManager::LoadResetTimes() { // initialize the reset time t = today + period + diff; - CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','%u','"UI64FMTD"')", mapid, difficulty, (uint64)t); + CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','%u','%u')", mapid, difficulty, (uint32)t); } if (t < now) @@ -605,7 +605,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b ScheduleReset(true, time_t(next_reset-3600), InstResetEvent(1, mapid, difficulty, 0)); // update it in the DB - CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%d' AND difficulty = '%d'", next_reset, mapid, difficulty); + CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '%u' WHERE mapid = '%d' AND difficulty = '%d'", uint32(next_reset), mapid, difficulty); } // note: this isn't fast but it's meant to be executed very rarely |