aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server/Packets
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2015-03-14 14:33:30 +0100
committerVincent-Michael <Vincent_Michael@gmx.de>2015-03-14 14:33:30 +0100
commit291d23e5f51b42479f0aacfb8149bc47db8cabf4 (patch)
tree4e4e43fb44fe2c5cae563d35675b8bb3730bf47c /src/server/game/Server/Packets
parentd9e4942a756619d3c13310d349ea518edb146cae (diff)
Core/PacketIO: Enable some opcodes
Diffstat (limited to 'src/server/game/Server/Packets')
-rw-r--r--src/server/game/Server/Packets/ChannelPackets.cpp24
-rw-r--r--src/server/game/Server/Packets/ChannelPackets.h24
-rw-r--r--src/server/game/Server/Packets/SpellPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/SpellPackets.h6
4 files changed, 28 insertions, 28 deletions
diff --git a/src/server/game/Server/Packets/ChannelPackets.cpp b/src/server/game/Server/Packets/ChannelPackets.cpp
index 52b83b13a54..9ee652fac06 100644
--- a/src/server/game/Server/Packets/ChannelPackets.cpp
+++ b/src/server/game/Server/Packets/ChannelPackets.cpp
@@ -86,7 +86,7 @@ WorldPacket const* WorldPackets::Channel::ChannelNotifyLeft::Write()
void WorldPackets::Channel::ChannelPlayerCommand::Read()
{
switch (GetOpcode())
- {/*
+ {
case CMSG_CHANNEL_BAN:
case CMSG_CHANNEL_INVITE:
case CMSG_CHANNEL_KICK:
@@ -94,12 +94,12 @@ void WorldPackets::Channel::ChannelPlayerCommand::Read()
case CMSG_CHANNEL_MUTE:
case CMSG_CHANNEL_SET_OWNER:
case CMSG_CHANNEL_SILENCE_ALL:
- case CMSG_CHANNEL_SILENCE_VOICE:
+ //case CMSG_CHANNEL_SILENCE_VOICE:
case CMSG_CHANNEL_UNBAN:
case CMSG_CHANNEL_UNMODERATOR:
case CMSG_CHANNEL_UNMUTE:
- case CMSG_CHANNEL_UNSILENCE_ALL:
- case CMSG_CHANNEL_UNSILENCE_VOICE:
+ //case CMSG_CHANNEL_UNSILENCE_ALL:
+ //case CMSG_CHANNEL_UNSILENCE_VOICE:
{
uint32 channelNameLength = _worldPacket.ReadBits(7);
uint32 nameLength = _worldPacket.ReadBits(9);
@@ -107,14 +107,14 @@ void WorldPackets::Channel::ChannelPlayerCommand::Read()
Name = _worldPacket.ReadString(nameLength);
break;
}
- case CMSG_CHANNEL_ANNOUNCEMENTS:
- case CMSG_CHANNEL_DECLINE_INVITE:
- case CMSG_CHANNEL_DISPLAY_LIST:
- case CMSG_CHANNEL_LIST:
+ //case CMSG_CHANNEL_ANNOUNCEMENTS:
+ //case CMSG_CHANNEL_DECLINE_INVITE:
+ //case CMSG_CHANNEL_DISPLAY_LIST:
+ //case CMSG_CHANNEL_LIST:
//case CMSG_CHANNEL_MODERATE:
- case CMSG_CHANNEL_OWNER:
- case CMSG_CHANNEL_VOICE_OFF:
- case CMSG_CHANNEL_VOICE_ON:
+ //case CMSG_CHANNEL_OWNER:
+ //case CMSG_CHANNEL_VOICE_OFF:
+ //case CMSG_CHANNEL_VOICE_ON:
{
ChannelName = _worldPacket.ReadString(_worldPacket.ReadBits(7));
break;
@@ -126,7 +126,7 @@ void WorldPackets::Channel::ChannelPlayerCommand::Read()
ChannelName = _worldPacket.ReadString(channelNameLength);
Name = _worldPacket.ReadString(nameLength);
break;
- }*/
+ }
default:
break;
}
diff --git a/src/server/game/Server/Packets/ChannelPackets.h b/src/server/game/Server/Packets/ChannelPackets.h
index 594b79bf504..6948628c6c0 100644
--- a/src/server/game/Server/Packets/ChannelPackets.h
+++ b/src/server/game/Server/Packets/ChannelPackets.h
@@ -103,29 +103,29 @@ namespace WorldPackets
switch (GetOpcode())
{
default:
- ASSERT(false);/*
- case CMSG_CHANNEL_ANNOUNCEMENTS:
+ ASSERT(false);
+ //case CMSG_CHANNEL_ANNOUNCEMENTS:
case CMSG_CHANNEL_BAN:
- case CMSG_CHANNEL_DECLINE_INVITE:
- case CMSG_CHANNEL_DISPLAY_LIST:
+ //case CMSG_CHANNEL_DECLINE_INVITE:
+ //case CMSG_CHANNEL_DISPLAY_LIST:
case CMSG_CHANNEL_INVITE:
case CMSG_CHANNEL_KICK:
- case CMSG_CHANNEL_LIST:
+ //case CMSG_CHANNEL_LIST:
//case CMSG_CHANNEL_MODERATE:
case CMSG_CHANNEL_MODERATOR:
case CMSG_CHANNEL_MUTE:
- case CMSG_CHANNEL_OWNER:
+ //case CMSG_CHANNEL_OWNER:
case CMSG_CHANNEL_PASSWORD:
case CMSG_CHANNEL_SET_OWNER:
- case CMSG_CHANNEL_SILENCE_ALL:
- case CMSG_CHANNEL_SILENCE_VOICE:
+ //case CMSG_CHANNEL_SILENCE_ALL:
+ //case CMSG_CHANNEL_SILENCE_VOICE:
case CMSG_CHANNEL_UNBAN:
case CMSG_CHANNEL_UNMODERATOR:
case CMSG_CHANNEL_UNMUTE:
- case CMSG_CHANNEL_UNSILENCE_ALL:
- case CMSG_CHANNEL_UNSILENCE_VOICE:
- case CMSG_CHANNEL_VOICE_OFF:
- case CMSG_CHANNEL_VOICE_ON:*/
+ //case CMSG_CHANNEL_UNSILENCE_ALL:
+ //case CMSG_CHANNEL_UNSILENCE_VOICE:
+ //case CMSG_CHANNEL_VOICE_OFF:
+ //case CMSG_CHANNEL_VOICE_ON:
break;
}
}
diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index d91397bb3c5..fabecce0d34 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -418,7 +418,7 @@ WorldPacket const* WorldPackets::Spells::SpellFailure::Write()
_worldPacket << CasterUnit;
_worldPacket << uint8(CastID);
_worldPacket << int32(SpellID);
- _worldPacket << uint8(Reason);
+ _worldPacket << uint16(Reason);
return &_worldPacket;
}
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index 9408f7c3c2d..634f4b40e7f 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -340,13 +340,13 @@ namespace WorldPackets
class SpellFailure final : public ServerPacket
{
public:
- SpellFailure() : ServerPacket(SMSG_SPELL_FAILURE, 16+4+1+1) { }
+ SpellFailure() : ServerPacket(SMSG_SPELL_FAILURE, 16+4+2+1) { }
WorldPacket const* Write() override;
ObjectGuid CasterUnit;
uint32 SpellID = 0;
- uint8 Reason = 0;
+ uint16 Reason = 0;
uint8 CastID = 0;
};
@@ -359,7 +359,7 @@ namespace WorldPackets
ObjectGuid CasterUnit;
uint32 SpellID = 0;
- uint16 Reason = 0;
+ uint8 Reason = 0;
uint8 CastID = 0;
};