aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/base/characters_database.sql128
-rw-r--r--sql/updates/2011_01_20_0_characters_game_event_save.sql3
-rw-r--r--sql/updates/2011_01_20_0_characters_gameobject_respawn.sql3
-rw-r--r--sql/updates/2011_01_20_0_characters_gm_subsurveys.sql6
-rw-r--r--sql/updates/2011_01_20_0_characters_gm_surveys.sql6
-rw-r--r--sql/updates/2011_01_20_0_characters_gm_tickets.sql13
-rw-r--r--sql/updates/2011_01_20_0_characters_group_instance.sql4
-rw-r--r--sql/updates/2011_01_20_0_characters_group_member.sql4
-rw-r--r--sql/updates/2011_01_20_0_characters_groups.sql17
-rw-r--r--sql/updates/2011_01_20_0_characters_guild.sql13
-rw-r--r--sql/updates/2011_01_20_0_characters_guild_bank_eventlog.sql8
-rwxr-xr-xsrc/server/game/Events/GameEventMgr.cpp2
-rwxr-xr-xsrc/server/game/Globals/ObjectMgr.cpp2
-rwxr-xr-xsrc/server/game/Guilds/Guild.cpp16
-rwxr-xr-xsrc/server/game/Server/Protocol/Handlers/TicketHandler.cpp6
-rwxr-xr-xsrc/server/game/Tickets/TicketMgr.cpp12
16 files changed, 160 insertions, 83 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f2658f8e805..9567d2b638f 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1283,9 +1283,9 @@ DROP TABLE IF EXISTS `game_event_save`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `game_event_save` (
- `event_id` mediumint(8) unsigned NOT NULL,
+ `event_id` smallint(5) unsigned NOT NULL,
`state` tinyint(3) unsigned NOT NULL DEFAULT '1',
- `next_start` bigint(11) unsigned NOT NULL DEFAULT '0',
+ `next_start` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`event_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1308,8 +1308,8 @@ DROP TABLE IF EXISTS `gameobject_respawn`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gameobject_respawn` (
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
- `respawntime` bigint(20) unsigned NOT NULL DEFAULT '0',
- `instance` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `respawntime` int(10) unsigned NOT NULL DEFAULT '0',
+ `instance` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guid`,`instance`),
KEY `instance` (`instance`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Grid Loading System';
@@ -1332,10 +1332,10 @@ DROP TABLE IF EXISTS `gm_subsurveys`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gm_subsurveys` (
- `surveyid` int(10) NOT NULL AUTO_INCREMENT,
- `subsurveyid` int(11) unsigned NOT NULL DEFAULT '0',
- `rank` int(11) unsigned NOT NULL DEFAULT '0',
- `comment` longtext NOT NULL,
+ `surveyid` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `subsurveyid` int(10) unsigned NOT NULL DEFAULT '0',
+ `rank` int(10) unsigned NOT NULL DEFAULT '0',
+ `comment` text NOT NULL,
PRIMARY KEY (`surveyid`,`subsurveyid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1357,11 +1357,11 @@ DROP TABLE IF EXISTS `gm_surveys`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gm_surveys` (
- `surveyid` int(10) NOT NULL AUTO_INCREMENT,
- `player` int(11) unsigned NOT NULL DEFAULT '0',
- `mainSurvey` int(11) unsigned NOT NULL DEFAULT '0',
+ `surveyid` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `player` int(10) unsigned NOT NULL DEFAULT '0',
+ `mainSurvey` int(10) unsigned NOT NULL DEFAULT '0',
`overall_comment` longtext NOT NULL,
- `timestamp` int(11) NOT NULL DEFAULT '0',
+ `timestamp` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`surveyid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1383,22 +1383,22 @@ DROP TABLE IF EXISTS `gm_tickets`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gm_tickets` (
- `guid` int(10) NOT NULL AUTO_INCREMENT,
- `playerGuid` int(11) unsigned NOT NULL DEFAULT '0',
- `name` varchar(15) NOT NULL,
+ `guid` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `playerGuid` int(10) unsigned NOT NULL DEFAULT '0',
+ `name` varchar(12) NOT NULL,
`message` text NOT NULL,
- `createtime` int(10) NOT NULL DEFAULT '0',
- `map` int(11) NOT NULL DEFAULT '0',
+ `createtime` int(10) unsigned NOT NULL DEFAULT '0',
+ `map` smallint(5) unsigned NOT NULL DEFAULT '0',
`posX` float NOT NULL DEFAULT '0',
`posY` float NOT NULL DEFAULT '0',
`posZ` float NOT NULL DEFAULT '0',
- `timestamp` int(10) NOT NULL DEFAULT '0',
- `closed` int(10) NOT NULL DEFAULT '0',
- `assignedto` int(10) NOT NULL DEFAULT '0',
+ `timestamp` int(10) unsigned NOT NULL DEFAULT '0',
+ `closed` int(11) NOT NULL DEFAULT '0',
+ `assignedto` int(10) unsigned NOT NULL DEFAULT '0',
`comment` text NOT NULL,
- `completed` int(11) NOT NULL DEFAULT '0',
- `escalated` int(11) NOT NULL DEFAULT '0',
- `viewed` int(11) NOT NULL DEFAULT '0',
+ `completed` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `escalated` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `viewed` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1420,9 +1420,9 @@ DROP TABLE IF EXISTS `group_instance`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `group_instance` (
- `guid` int(11) unsigned NOT NULL DEFAULT '0',
- `instance` int(11) unsigned NOT NULL DEFAULT '0',
- `permanent` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `guid` int(10) unsigned NOT NULL DEFAULT '0',
+ `instance` int(10) unsigned NOT NULL DEFAULT '0',
+ `permanent` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guid`,`instance`),
KEY `instance` (`instance`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -1445,13 +1445,13 @@ DROP TABLE IF EXISTS `group_member`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `group_member` (
- `guid` int(11) unsigned NOT NULL,
- `memberGuid` int(11) unsigned NOT NULL DEFAULT '0',
+ `guid` int(10) unsigned NOT NULL,
+ `memberGuid` int(10) unsigned NOT NULL,
`memberFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
`subgroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
`roles` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`memberGuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Groups';
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1471,25 +1471,25 @@ DROP TABLE IF EXISTS `groups`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `groups` (
- `guid` int(11) unsigned NOT NULL,
- `leaderGuid` int(11) unsigned NOT NULL,
- `lootMethod` tinyint(4) unsigned NOT NULL,
- `looterGuid` int(11) unsigned NOT NULL,
- `lootThreshold` tinyint(4) unsigned NOT NULL,
- `icon1` int(11) unsigned NOT NULL,
- `icon2` int(11) unsigned NOT NULL,
- `icon3` int(11) unsigned NOT NULL,
- `icon4` int(11) unsigned NOT NULL,
- `icon5` int(11) unsigned NOT NULL,
- `icon6` int(11) unsigned NOT NULL,
- `icon7` int(11) unsigned NOT NULL,
- `icon8` int(11) unsigned NOT NULL,
- `groupType` mediumint(8) unsigned NOT NULL,
+ `guid` int(10) unsigned NOT NULL,
+ `leaderGuid` int(10) unsigned NOT NULL,
+ `lootMethod` tinyint(3) unsigned NOT NULL,
+ `looterGuid` int(10) unsigned NOT NULL,
+ `lootThreshold` tinyint(3) unsigned NOT NULL,
+ `icon1` int(10) unsigned NOT NULL,
+ `icon2` int(10) unsigned NOT NULL,
+ `icon3` int(10) unsigned NOT NULL,
+ `icon4` int(10) unsigned NOT NULL,
+ `icon5` int(10) unsigned NOT NULL,
+ `icon6` int(10) unsigned NOT NULL,
+ `icon7` int(10) unsigned NOT NULL,
+ `icon8` int(10) unsigned NOT NULL,
+ `groupType` tinyint(3) unsigned NOT NULL,
`difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
- `raiddifficulty` int(11) unsigned NOT NULL DEFAULT '0',
+ `raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guid`),
KEY `leaderGuid` (`leaderGuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Groups';
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1509,18 +1509,18 @@ DROP TABLE IF EXISTS `guild`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild` (
- `guildid` int(6) unsigned NOT NULL DEFAULT '0',
- `name` varchar(255) NOT NULL DEFAULT '',
- `leaderguid` int(6) unsigned NOT NULL DEFAULT '0',
- `EmblemStyle` int(5) NOT NULL DEFAULT '0',
- `EmblemColor` int(5) NOT NULL DEFAULT '0',
- `BorderStyle` int(5) NOT NULL DEFAULT '0',
- `BorderColor` int(5) NOT NULL DEFAULT '0',
- `BackgroundColor` int(5) NOT NULL DEFAULT '0',
+ `guildid` int(10) unsigned NOT NULL DEFAULT '0',
+ `name` varchar(24) NOT NULL DEFAULT '',
+ `leaderguid` int(10) unsigned NOT NULL DEFAULT '0',
+ `EmblemStyle` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `EmblemColor` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `BorderStyle` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `BorderColor` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `BackgroundColor` tinyint(3) unsigned NOT NULL DEFAULT '0',
`info` text NOT NULL,
- `motd` varchar(255) NOT NULL DEFAULT '',
- `createdate` bigint(20) NOT NULL DEFAULT '0',
- `BankMoney` bigint(20) NOT NULL DEFAULT '0',
+ `motd` varchar(128) NOT NULL DEFAULT '',
+ `createdate` int(10) unsigned NOT NULL DEFAULT '0',
+ `BankMoney` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guildid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild System';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1542,15 +1542,15 @@ DROP TABLE IF EXISTS `guild_bank_eventlog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_bank_eventlog` (
- `guildid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
- `LogGuid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column',
+ `guildid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
+ `LogGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column',
`TabId` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild bank TabId',
`EventType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event type',
- `PlayerGuid` int(11) unsigned NOT NULL DEFAULT '0',
- `ItemOrMoney` int(11) unsigned NOT NULL DEFAULT '0',
- `ItemStackCount` smallint(4) unsigned NOT NULL DEFAULT '0',
- `DestTabId` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT 'Destination Tab Id',
- `TimeStamp` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time',
+ `PlayerGuid` int(10) unsigned NOT NULL DEFAULT '0',
+ `ItemOrMoney` int(10) unsigned NOT NULL DEFAULT '0',
+ `ItemStackCount` smallint(5) unsigned NOT NULL DEFAULT '0',
+ `DestTabId` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Destination Tab Id',
+ `TimeStamp` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time',
PRIMARY KEY (`guildid`,`LogGuid`,`TabId`),
KEY `guildid_key` (`guildid`),
KEY `Idx_PlayerGuid` (`PlayerGuid`),
@@ -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-19 22:45:57
+-- Dump completed on 2011-01-20 0:05:54
diff --git a/sql/updates/2011_01_20_0_characters_game_event_save.sql b/sql/updates/2011_01_20_0_characters_game_event_save.sql
new file mode 100644
index 00000000000..06cc0976974
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_game_event_save.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `game_event_save`
+CHANGE `event_id` `event_id` SMALLINT(5) UNSIGNED NOT NULL,
+CHANGE `next_start` `next_start` INT(10) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_gameobject_respawn.sql b/sql/updates/2011_01_20_0_characters_gameobject_respawn.sql
new file mode 100644
index 00000000000..bf83a59a67e
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_gameobject_respawn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `gameobject_respawn`
+CHANGE `respawntime` `respawntime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_gm_subsurveys.sql b/sql/updates/2011_01_20_0_characters_gm_subsurveys.sql
new file mode 100644
index 00000000000..51af89da7f0
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_gm_subsurveys.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `gm_subsurveys`
+ROW_FORMAT=DEFAULT,
+CHANGE `surveyid` `surveyid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `subsurveyid` `subsurveyid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `rank` `rank` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `comment` `comment` TEXT NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_gm_surveys.sql b/sql/updates/2011_01_20_0_characters_gm_surveys.sql
new file mode 100644
index 00000000000..93c37b7b45e
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_gm_surveys.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `gm_surveys`
+ROW_FORMAT=DEFAULT,
+CHANGE `surveyid` `surveyid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `player` `player` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `mainSurvey` `mainSurvey` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `timestamp` `timestamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_gm_tickets.sql b/sql/updates/2011_01_20_0_characters_gm_tickets.sql
new file mode 100644
index 00000000000..44e88f44390
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_gm_tickets.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `gm_tickets`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+CHANGE `playerGuid` `playerGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `name` `name` VARCHAR(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+CHANGE `createtime` `createtime` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `map` `map` SMALLINT(5) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `timestamp` `timestamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `closed` `closed` INT(11) DEFAULT '0' NOT NULL,
+CHANGE `assignedto` `assignedto` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `completed` `completed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `escalated` `escalated` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `viewed` `viewed` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_group_instance.sql b/sql/updates/2011_01_20_0_characters_group_instance.sql
new file mode 100644
index 00000000000..ae7f6fccf2d
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_group_instance.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `group_instance`
+CHANGE `guid` `guid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `instance` `instance` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `permanent` `permanent` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_group_member.sql b/sql/updates/2011_01_20_0_characters_group_member.sql
new file mode 100644
index 00000000000..03bcbe66b3d
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_group_member.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `group_member`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `memberGuid` `memberGuid` INT(10) UNSIGNED NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_groups.sql b/sql/updates/2011_01_20_0_characters_groups.sql
new file mode 100644
index 00000000000..b986d402c8f
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_groups.sql
@@ -0,0 +1,17 @@
+ALTER TABLE `groups`
+ROW_FORMAT=DEFAULT,
+CHANGE `guid` `guid` INT(10) UNSIGNED NOT NULL,
+CHANGE `leaderGuid` `leaderGuid` INT(10) UNSIGNED NOT NULL,
+CHANGE `lootMethod` `lootMethod` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `looterGuid` `looterGuid` INT(10) UNSIGNED NOT NULL,
+CHANGE `lootThreshold` `lootThreshold` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `icon1` `icon1` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon2` `icon2` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon3` `icon3` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon4` `icon4` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon5` `icon5` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon6` `icon6` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon7` `icon7` INT(10) UNSIGNED NOT NULL,
+CHANGE `icon8` `icon8` INT(10) UNSIGNED NOT NULL,
+CHANGE `groupType` `groupType` TINYINT(3) UNSIGNED NOT NULL,
+CHANGE `raiddifficulty` `raiddifficulty` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_guild.sql b/sql/updates/2011_01_20_0_characters_guild.sql
new file mode 100644
index 00000000000..f384947a338
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_guild.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `guild`
+ROW_FORMAT=DEFAULT,
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `name` `name` VARCHAR(24) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' NOT NULL,
+CHANGE `leaderguid` `leaderguid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `EmblemStyle` `EmblemStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `EmblemColor` `EmblemColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BorderStyle` `BorderStyle` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BorderColor` `BorderColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BackgroundColor` `BackgroundColor` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `motd` `motd` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' NOT NULL,
+CHANGE `createdate` `createdate` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `BankMoney` `BankMoney` BIGINT(20) UNSIGNED DEFAULT '0' NOT NULL; \ No newline at end of file
diff --git a/sql/updates/2011_01_20_0_characters_guild_bank_eventlog.sql b/sql/updates/2011_01_20_0_characters_guild_bank_eventlog.sql
new file mode 100644
index 00000000000..627020be62f
--- /dev/null
+++ b/sql/updates/2011_01_20_0_characters_guild_bank_eventlog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `guild_bank_eventlog`
+CHANGE `guildid` `guildid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Guild Identificator',
+CHANGE `LogGuid` `LogGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Log record identificator - auxiliary column',
+CHANGE `PlayerGuid` `PlayerGuid` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `ItemOrMoney` `ItemOrMoney` INT(10) UNSIGNED DEFAULT '0' NOT NULL,
+CHANGE `ItemStackCount` `ItemStackCount` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+CHANGE `DestTabId` `DestTabId` TINYINT(3) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Destination Tab Id',
+CHANGE `TimeStamp` `TimeStamp` INT(10) UNSIGNED DEFAULT '0' NOT NULL COMMENT 'Event UNIX time'; \ No newline at end of file
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 4f0ce9b86f3..d424853894a 100755
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -298,7 +298,7 @@ void GameEventMgr::LoadFromDB()
if (mGameEvent[event_id].state != GAMEEVENT_NORMAL && mGameEvent[event_id].state != GAMEEVENT_INTERNAL)
{
mGameEvent[event_id].state = (GameEventState)(fields[1].GetUInt8());
- mGameEvent[event_id].nextstart = time_t(fields[2].GetUInt64());
+ mGameEvent[event_id].nextstart = time_t(fields[2].GetUInt32());
}
else
{
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8899be3c144..9a2e65c3fd7 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2002,7 +2002,7 @@ void ObjectMgr::LoadGameobjectRespawnTimes()
Field *fields = result->Fetch();
uint32 loguid = fields[0].GetUInt32();
- uint64 respawn_time = fields[1].GetUInt64();
+ uint32 respawn_time = fields[1].GetUInt32();
uint32 instance = fields[2].GetUInt32();
mGORespawnTimes[MAKE_PAIR64(loguid,instance)] = time_t(respawn_time);
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index ac27ac289b9..e9fc6c4ec47 100755
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -718,11 +718,11 @@ inline void Guild::Member::ResetMoneyTime()
// EmblemInfo
void EmblemInfo::LoadFromDB(Field* fields)
{
- m_style = fields[3].GetUInt32();
- m_color = fields[4].GetUInt32();
- m_borderStyle = fields[5].GetUInt32();
- m_borderColor = fields[6].GetUInt32();
- m_backgroundColor = fields[7].GetUInt32();
+ m_style = fields[3].GetUInt8();
+ m_color = fields[4].GetUInt8();
+ m_borderStyle = fields[5].GetUInt8();
+ m_borderColor = fields[6].GetUInt8();
+ m_backgroundColor = fields[7].GetUInt8();
}
void EmblemInfo::WritePacket(WorldPacket& data) const
@@ -1126,7 +1126,7 @@ bool Guild::Create(Player* pLeader, const std::string& name)
stmt->setUInt32(++index, GUID_LOPART(m_leaderGuid));
stmt->setString(++index, m_info);
stmt->setString(++index, m_motd);
- stmt->setUInt64(++index, uint64(m_createdDate));
+ stmt->setUInt64(++index, uint32(m_createdDate));
stmt->setUInt32(++index, m_emblemInfo.GetStyle());
stmt->setUInt32(++index, m_emblemInfo.GetColor());
stmt->setUInt32(++index, m_emblemInfo.GetBorderStyle());
@@ -1840,7 +1840,7 @@ bool Guild::LoadFromDB(Field* fields)
m_emblemInfo.LoadFromDB(fields);
m_info = fields[8].GetString();
m_motd = fields[9].GetString();
- m_createdDate = fields[10].GetUInt64();
+ m_createdDate = time_t(fields[10].GetUInt32());
m_bankMoney = fields[11].GetUInt64();
uint8 purchasedTabs = uint8(fields[12].GetUInt32());
@@ -1932,7 +1932,7 @@ bool Guild::LoadBankEventLogFromDB(Field* fields)
pLog->LoadEvent(new BankEventLogEntry(
m_id, // guild id
guid, // guid
- fields[8].GetUInt64(), // timestamp
+ time_t(fields[8].GetUInt32()), // timestamp
dbTabId, // tab id
eventType, // event type
fields[4].GetUInt32(), // player guid
diff --git a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
index 5d859cdae46..e96cfa2dbbd 100755
--- a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
@@ -233,7 +233,7 @@ void WorldSession::HandleGMSurveySubmit(WorldPacket& recv_data)
ss << "INSERT INTO gm_surveys (player, surveyid, mainSurvey, overall_comment, timestamp) VALUES (";
ss << GetPlayer()->GetGUID() << ", ";
- ss << nextSurveyID << ", ";
+ ss << uint32(nextSurveyID) << ", ";
ss << mainSurvey << ", ";
// sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10,
@@ -252,9 +252,9 @@ void WorldSession::HandleGMSurveySubmit(WorldPacket& recv_data)
recv_data >> rank;
recv_data >> comment;
- os << nextSurveyID << " ";
+ os << uint32(nextSurveyID) << " ";
os << subSurveyId << ", ";
- os << rank << ", '";
+ os << uint16(rank) << ", '";
CharacterDatabase.escape_string(comment);
os << comment << "');";
CharacterDatabase.PExecute(os.str().c_str());
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index 0c28addb87d..622bb9953d4 100755
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -66,17 +66,17 @@ void TicketMgr::LoadGMTickets()
{
Field *fields = result->Fetch();
GM_Ticket *ticket = new GM_Ticket;
- ticket->guid = fields[0].GetUInt64();
- ticket->playerGuid = fields[1].GetUInt64();
+ ticket->guid = fields[0].GetUInt32();
+ ticket->playerGuid = fields[1].GetUInt32();
ticket->name = fields[2].GetString();
ticket->message = fields[3].GetString();
- ticket->createtime = fields[4].GetUInt64();
+ ticket->createtime = fields[4].GetUInt32();
ticket->map = fields[5].GetUInt32();
ticket->pos_x = fields[6].GetFloat();
ticket->pos_y = fields[7].GetFloat();
ticket->pos_z = fields[8].GetFloat();
- ticket->timestamp = fields[9].GetUInt64();
- ticket->closed = fields[10].GetUInt64();
+ ticket->timestamp = fields[9].GetUInt32();
+ ticket->closed = fields[10].GetInt32();
if (ticket->closed == 0)
m_openTickets++;
@@ -111,7 +111,7 @@ void TicketMgr::LoadGMSurveys()
if (result)
{
Field *fields = result->Fetch();
- m_GMSurveyID = fields[0].GetUInt64();
+ m_GMSurveyID = fields[0].GetUInt32();
}
else
m_GMSurveyID = 0;