josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7182 from horn/4.3.4

Browse Source 
[4.3.4] Core/PacketIO: Fix and enable few speed changes related opcodes
This commit is contained in:
Kaelima
2012-07-25 06:53:26 -07:00
parent 443f1e71d8 2b8ea93877
commit 49d8836f9d
4 changed files with 114 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/Creature.cpp
+2 -2
View File
@@ -2509,9 +2509,9 @@ bool Creature::SetWalk(bool enable)
data.WriteBit(guid[5]);
data.WriteBit(guid[6]);
data.WriteBit(guid[3]);
data.WriteBit(guid[7]);
data.WriteBit(guid[2]);
data.WriteBit(guid[0]);
data.WriteBit(guid[7]);
data.WriteBit(guid[4]);
data.WriteBit(guid[1]);
data.FlushBits();
@@ -2631,10 +2631,10 @@ bool Creature::SetHover(bool enable)
WorldPacket data(SMSG_SPLINE_MOVE_UNSET_HOVER, 9);
data.WriteBit(guid[6]);
data.WriteBit(guid[7]);
data.WriteBit(guid[4]);
data.WriteBit(guid[0]);
data.WriteBit(guid[3]);
data.WriteBit(guid[1]);
data.WriteBit(guid[4]);
data.WriteBit(guid[5]);
data.WriteBit(guid[2]);
data.FlushBits();
src/server/game/Entities/Unit/Unit.cpp
+96 -99
View File
@@ -12751,174 +12751,171 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
break;
case MOVE_RUN:
data.Initialize(SMSG_SPLINE_MOVE_SET_RUN_SPEED, 1 + 8 + 4);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[0]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[5]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[2]);
data.FlushBits();
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[4]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[1]);
break;
case MOVE_RUN_BACK:
data.Initialize(SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED, 1 + 8 + 4);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[4]);
data.FlushBits();
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[6]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[2]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[7]);
break;
case MOVE_SWIM:
data.Initialize(SMSG_SPLINE_MOVE_SET_SWIM_SPEED, 1 + 8 + 4);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[6]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[7]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[1]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[1]);
data.FlushBits();
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[4]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[3]);
break;
case MOVE_SWIM_BACK:
data.Initialize(SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED, 1 + 8 + 4);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[2]);
data.FlushBits();
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[2]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[6]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[2]);
break;
case MOVE_TURN_RATE:
data.Initialize(SMSG_SPLINE_MOVE_SET_TURN_RATE, 1 + 8 + 4);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[2]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[0]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[0]);
data.FlushBits();
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[0]);
break;
case MOVE_FLIGHT:
data.Initialize(SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED, 1 + 8 + 4);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[1]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[1]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[2]);
data.FlushBits();
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[6]);
data << float(GetSpeed(mtype));
break;
case MOVE_FLIGHT_BACK:
data.Initialize(SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED, 1 + 8 + 4);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[1]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[7]);
data.FlushBits();
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[7]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[4]);
break;
case MOVE_PITCH_RATE:
data.Initialize(SMSG_SPLINE_MOVE_SET_PITCH_RATE, 1 + 8 + 4);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[2]);
data.WriteBit(bytes[3]);
data.WriteBit(bytes[5]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[6]);
data.WriteBit(bytes[1]);
data.WriteByteSeq(bytes[0]);
data.WriteBit(bytes[0]);
data.WriteBit(bytes[4]);
data.WriteBit(bytes[7]);
data.WriteBit(bytes[2]);
data.FlushBits();
data.WriteByteSeq(bytes[1]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[2]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[5]);
data.WriteByteSeq(bytes[4]);
data.WriteByteSeq(bytes[7]);
data.WriteByteSeq(bytes[0]);
data.WriteByteSeq(bytes[6]);
data.WriteByteSeq(bytes[3]);
data.WriteByteSeq(bytes[2]);
data << float(GetSpeed(mtype));
data.WriteByteSeq(bytes[4]);
break;
default:
sLog->outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.", mtype);
src/server/game/Server/Protocol/Opcodes.cpp
+8 -7
View File
@@ -1296,18 +1296,19 @@ void InitOpcodes()
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_NORMAL_FALL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_ROOT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_FEATHER_FALL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_FLYING, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_HOVER, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_LAND_WALK, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_NORMAL_FALL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_PITCH_RATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_PITCH_RATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_RUN_MODE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_SWIM_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_TURN_RATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_RUN_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_SWIM_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_TURN_RATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_WALK_MODE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_WALK_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
//DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_WATER_WALK, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
src/server/game/Server/Protocol/Opcodes.h
+8 -8
View File
@@ -1076,19 +1076,19 @@ enum Opcodes
SMSG_SPLINE_MOVE_GRAVITY_ENABLE = 0x3CA6,
SMSG_SPLINE_MOVE_ROOT = 0x51B4,
SMSG_SPLINE_MOVE_SET_FEATHER_FALL = 0x3DA5,
SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED = 0x0000,
SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED = 0x0000,
SMSG_SPLINE_MOVE_SET_FLIGHT_BACK_SPEED = 0x38B3,
SMSG_SPLINE_MOVE_SET_FLIGHT_SPEED = 0x39A0,
SMSG_SPLINE_MOVE_SET_FLYING = 0x31B5,
SMSG_SPLINE_MOVE_SET_HOVER = 0x14B6,
SMSG_SPLINE_MOVE_SET_LAND_WALK = 0x3DA7,
SMSG_SPLINE_MOVE_SET_NORMAL_FALL = 0x38B2,
SMSG_SPLINE_MOVE_SET_PITCH_RATE = 0x0000,
SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED = 0x0000,
SMSG_SPLINE_MOVE_SET_PITCH_RATE = 0x14B0,
SMSG_SPLINE_MOVE_SET_RUN_BACK_SPEED = 0x3DB3,
SMSG_SPLINE_MOVE_SET_RUN_MODE = 0x75A7,
SMSG_SPLINE_MOVE_SET_RUN_SPEED = 0x0000,
SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED = 0x0000,
SMSG_SPLINE_MOVE_SET_SWIM_SPEED = 0x51B7,
SMSG_SPLINE_MOVE_SET_TURN_RATE = 0x0000,
SMSG_SPLINE_MOVE_SET_RUN_SPEED = 0x51B7,
SMSG_SPLINE_MOVE_SET_SWIM_BACK_SPEED = 0x59A1,
SMSG_SPLINE_MOVE_SET_SWIM_SPEED = 0x39A4,
SMSG_SPLINE_MOVE_SET_TURN_RATE = 0x78B5,
SMSG_SPLINE_MOVE_SET_WALK_MODE = 0x54B6,
SMSG_SPLINE_MOVE_SET_WALK_SPEED = 0x0000,
SMSG_SPLINE_MOVE_SET_WATER_WALK = 0x0000,