Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4761 from Gyx/4.x

Browse Source 
Gyx 4.x update
This commit is contained in:
Rat
2012-01-10 08:12:08 -08:00
parent de6a45b207 26a1806b7d
commit 2cc092b9e3
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/base/auth_database.sql
View File

@@ -60,7 +60,7 @@ CREATE TABLE `account` (
`locked` tinyint(3) unsigned NOT NULL default '0',
`last_login` timestamp NOT NULL default '0000-00-00 00:00:00',
`online` tinyint(4) NOT NULL default '0',
`expansion` tinyint(3) unsigned NOT NULL default '2',
`expansion` tinyint(3) unsigned NOT NULL default '3',
`mutetime` bigint(40) NOT NULL default '0',
`locale` tinyint(3) unsigned NOT NULL default '0',
`recruiter` int(11) NOT NULL default '0',

1
sql/updates/auth/2012_01_10_00_auth_account_4x.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE `account` CHANGE COLUMN `expansion` `expansion` tinyint(3) unsigned NOT NULL DEFAULT '3';

12
src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
View File

@@ -88,12 +88,12 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
//case CMSG_MESSAGECHAT_OFFICER:
// type = CHAT_MSG_OFFICER;
// break;
//case CMSG_MESSAGECHAT_AFK:
// type = CHAT_MSG_AFK;
// break;
//case CMSG_MESSAGECHAT_DND:
// type = CHAT_MSG_DND;
// break;
case CMSG_MESSAGECHAT_AFK:
type = CHAT_MSG_AFK;
break;
case CMSG_MESSAGECHAT_DND:
type = CHAT_MSG_DND;
break;
case CMSG_MESSAGECHAT_EMOTE:
type = CHAT_MSG_EMOTE;
break;

6
src/server/game/Server/Protocol/Opcodes.cpp
View File

@@ -197,11 +197,11 @@ void InitOpcodes()
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_ADDON_PARTY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_ADDON_RAID, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_ADDON_WHISPER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddonMessagechatOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_AFK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_AFK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_BATTLEGROUND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_BATTLEGROUND_LEADER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_DND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_DND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_GUILD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_OFFICER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
@@ -413,7 +413,7 @@ void InitOpcodes()
//DEFINE_OPCODE_HANDLER(SMSG_RESURRECT_REQUEST, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(CMSG_RESURRECT_RESPONSE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleResurrectResponseOpcode );
DEFINE_OPCODE_HANDLER(CMSG_LOOT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_LOOT_MONEY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootMoneyOpcode );
DEFINE_OPCODE_HANDLER(CMSG_LOOT_MONEY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootMoneyOpcode );
DEFINE_OPCODE_HANDLER(CMSG_LOOT_RELEASE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootReleaseOpcode );
DEFINE_OPCODE_HANDLER(SMSG_LOOT_RESPONSE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_LOOT_RELEASE_RESPONSE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );

8
src/server/game/Server/Protocol/Opcodes.h
View File

@@ -72,7 +72,7 @@ enum Opcodes
CMSG_AUTOSTORE_GROUND_ITEM = 0x00,
CMSG_AUTOSTORE_LOOT_ITEM = 0xD876,
CMSG_BANKER_ACTIVATE = 0x00,
CMSG_BATTLEFIELD_JOIN = 0x00,
CMSG_BATTLEFIELD_JOIN = 0x225,
CMSG_BATTLEFIELD_REQUEST_SCORE_DATA = 0x00,
CMSG_BATTLEFIELD_STATUS = 0x00,
MSG_BATTLEGROUND_PLAYER_POSITIONS = 0x00,
@@ -264,7 +264,7 @@ enum Opcodes
CMSG_LOGOUT_REQUEST = 0x4C7A,
CMSG_LOOT = 0x1E62,
CMSG_LOOT_METHOD = 0x00,
CMSG_LOOT_MONEY = 0x00,
CMSG_LOOT_MONEY = 0x4A42,
CMSG_LOOT_RELEASE = 0x4A6A,
CMSG_LOOT_ROLL = 0x00,
CMSG_MAIL_CREATE_TEXT_ITEM = 0x886E,
@@ -274,7 +274,7 @@ enum Opcodes
CMSG_MAIL_TAKE_ITEM = 0xCC2,
CMSG_MAIL_TAKE_MONEY = 0x4CD6,
CMSG_MEETINGSTONE_INFO = 0xCA5B,
CMSG_MESSAGECHAT_AFK = 0x00,
CMSG_MESSAGECHAT_AFK = 0x30C1,
CMSG_MESSAGECHAT_BATTLEGROUND = 0x00,
CMSG_MESSAGECHAT_BATTLEGROUND_LEADER = 0x00,
CMSG_MESSAGECHAT_ADDON_BATTLEGROUND = 0x6059, // New on 4.x
@@ -283,7 +283,7 @@ enum Opcodes
CMSG_MESSAGECHAT_ADDON_RAID = 0x3041, // New on 4.x
CMSG_MESSAGECHAT_ADDON_WHISPER = 0x20C1, // New on 4.x
CMSG_MESSAGECHAT_CHANNEL = 0x7459,
CMSG_MESSAGECHAT_DND = 0x00,
CMSG_MESSAGECHAT_DND = 0x30C9,
CMSG_MESSAGECHAT_EMOTE = 0x6449,
CMSG_MESSAGECHAT_GUILD = 0x60C1,
CMSG_MESSAGECHAT_OFFICER = 0x00,