diff options
author | Nay <dnpd.dd@gmail.com> | 2012-08-10 16:58:39 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-08-10 16:58:39 +0100 |
commit | 274a54c1529e9cf22778866cf5ddb0e9b919fdb3 (patch) | |
tree | 9cde374ffa1a472d831f65d4f13a146833086f72 /src/server | |
parent | cf2d235c72f7459acccb344eacbbbc87da9af11b (diff) |
Core: Cleanup whitespace, fix build and enable 1 opcode
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 46 | ||||
-rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 8 | ||||
-rwxr-xr-x | src/server/game/Handlers/ChannelHandler.cpp | 32 | ||||
-rw-r--r-- | src/server/game/Handlers/GroupHandler.cpp | 10 | ||||
-rw-r--r-- | src/server/game/Handlers/MailHandler.cpp | 26 | ||||
-rwxr-xr-x | src/server/game/Handlers/TaxiHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Handlers/VehicleHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Movement/MovementStructures.h | 8 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineInit.cpp | 6 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineInit.h | 6 | ||||
-rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_disable.cpp | 14 | ||||
-rw-r--r-- | src/server/shared/Logging/AppenderDB.cpp | 2 | ||||
-rw-r--r-- | src/server/shared/Logging/Log.cpp | 4 |
14 files changed, 84 insertions, 84 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f1c3299a92f..5178d62bfdf 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25415,16 +25415,16 @@ void Player::SendItemRefundResult(Item* item, ItemExtendedCostEntry const* iece, data << uint32(iece->RequiredCurrencyCount[i]); data << uint32(iece->RequiredCurrency[i]); } - + data << uint32(item->GetPaidMoney()); // money cost - + for (uint8 i = 0; i < MAX_ITEM_EXT_COST_ITEMS; ++i) // item cost data { data << uint32(iece->RequiredItemCount[i]); data << uint32(iece->RequiredItem[i]); } } - + data.WriteByteSeq(guid[0]); data.WriteByteSeq(guid[3]); data.WriteByteSeq(guid[1]); @@ -25433,7 +25433,7 @@ void Player::SendItemRefundResult(Item* item, ItemExtendedCostEntry const* iece, data.WriteByteSeq(guid[2]); data.WriteByteSeq(guid[7]); data.WriteByteSeq(guid[5]); - + data << uint8(error); // error code GetSession()->SendPacket(&data); } @@ -25735,12 +25735,12 @@ void Player::SendMovementSetCanFly(bool apply) data.WriteBit(guid[4]); data.WriteBit(guid[2]); data.WriteBit(guid[3]); - + data.WriteByteSeq(guid[6]); data.WriteByteSeq(guid[3]); - + data << uint32(0); //! movement counter - + data.WriteByteSeq(guid[2]); data.WriteByteSeq(guid[1]); data.WriteByteSeq(guid[4]); @@ -25759,12 +25759,12 @@ void Player::SendMovementSetCanFly(bool apply) data.WriteBit(guid[3]); data.WriteBit(guid[6]); data.WriteBit(guid[7]); - + data.WriteByteSeq(guid[4]); data.WriteByteSeq(guid[6]); - + data << uint32(0); //! movement counter - + data.WriteByteSeq(guid[1]); data.WriteByteSeq(guid[0]); data.WriteByteSeq(guid[2]); @@ -25808,13 +25808,13 @@ void Player::SendMovementSetWaterWalking(bool apply) data.WriteBit(guid[3]); data.WriteBit(guid[5]); data.WriteBit(guid[2]); - + data.WriteByteSeq(guid[0]); data.WriteByteSeq(guid[5]); data.WriteByteSeq(guid[2]); - + data << uint32(0); //! movement counter - + data.WriteByteSeq(guid[7]); data.WriteByteSeq(guid[3]); data.WriteByteSeq(guid[4]); @@ -25832,7 +25832,7 @@ void Player::SendMovementSetWaterWalking(bool apply) data.WriteBit(guid[4]); data.WriteBit(guid[0]); data.WriteBit(guid[7]); - + data.WriteByteSeq(guid[6]); data.WriteByteSeq(guid[1]); data.WriteByteSeq(guid[7]); @@ -25841,7 +25841,7 @@ void Player::SendMovementSetWaterWalking(bool apply) data.WriteByteSeq(guid[0]); data.WriteByteSeq(guid[3]); data.WriteByteSeq(guid[2]); - + data << uint32(0); //! movement counter } SendDirectMessage(&data); @@ -25851,7 +25851,7 @@ void Player::SendMovementSetFeatherFall(bool apply) { ObjectGuid guid = GetGUID(); WorldPacket data; - + if (apply) { data.Initialize(SMSG_MOVE_FEATHER_FALL, 1 + 4 + 8); @@ -25863,13 +25863,13 @@ void Player::SendMovementSetFeatherFall(bool apply) data.WriteBit(guid[2]); data.WriteBit(guid[5]); data.WriteBit(guid[6]); - + data.WriteByteSeq(guid[5]); data.WriteByteSeq(guid[7]); data.WriteByteSeq(guid[2]); - + data << uint32(0); //! movement counter - + data.WriteByteSeq(guid[0]); data.WriteByteSeq(guid[3]); data.WriteByteSeq(guid[4]); @@ -25879,9 +25879,9 @@ void Player::SendMovementSetFeatherFall(bool apply) else { data.Initialize(SMSG_MOVE_NORMAL_FALL, 1 + 4 + 8); - + data << uint32(0); //! movement counter - + data.WriteBit(guid[3]); data.WriteBit(guid[0]); data.WriteBit(guid[1]); @@ -25890,7 +25890,7 @@ void Player::SendMovementSetFeatherFall(bool apply) data.WriteBit(guid[4]); data.WriteBit(guid[6]); data.WriteBit(guid[2]); - + data.WriteByteSeq(guid[2]); data.WriteByteSeq(guid[7]); data.WriteByteSeq(guid[1]); @@ -25900,7 +25900,7 @@ void Player::SendMovementSetFeatherFall(bool apply) data.WriteByteSeq(guid[3]); data.WriteByteSeq(guid[6]); } - + SendDirectMessage(&data); } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 71a277c9f99..984c1899564 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -17147,22 +17147,22 @@ void Unit::SendMoveKnockBack(Player* player, float speedXY, float speedZ, float data.WriteBit(guid[4]); data.WriteByteSeq(guid[1]); - + data << float(vsin); data << uint32(0); - + data.WriteByteSeq(guid[6]); data.WriteByteSeq(guid[7]); data << float(speedXY); - + data.WriteByteSeq(guid[4]); data.WriteByteSeq(guid[5]); data.WriteByteSeq(guid[3]); data << float(speedZ); data << float(vcos); - + data.WriteByteSeq(guid[2]); data.WriteByteSeq(guid[0]); diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp index f940d658530..21f455c4fc8 100755 --- a/src/server/game/Handlers/ChannelHandler.cpp +++ b/src/server/game/Handlers/ChannelHandler.cpp @@ -84,7 +84,7 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket) void WorldSession::HandleChannelList(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - + uint32 length = recvPacket.ReadBits(8); std::string channelname = recvPacket.ReadString(length); @@ -110,13 +110,13 @@ void WorldSession::HandleChannelPassword(WorldPacket& recvPacket) void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - + uint32 channelLength = recvPacket.ReadBits(8); uint32 nameLength = recvPacket.ReadBits(7); std::string newp = recvPacket.ReadString(nameLength); std::string channelname = recvPacket.ReadString(channelLength); - + if (!normalizePlayerName(newp)) return; @@ -139,13 +139,13 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket) void WorldSession::HandleChannelModerator(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - + uint32 channelLength = recvPacket.ReadBits(8); uint32 nameLength = recvPacket.ReadBits(7); - + std::string otp = recvPacket.ReadString(nameLength); std::string channelname = recvPacket.ReadString(channelLength); - + if (!normalizePlayerName(otp)) return; @@ -157,10 +157,10 @@ void WorldSession::HandleChannelModerator(WorldPacket& recvPacket) void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - + uint32 nameLength = recvPacket.ReadBits(7); uint32 channelLength = recvPacket.ReadBits(8); - + std::string channelname = recvPacket.ReadString(channelLength); std::string otp = recvPacket.ReadString(nameLength); @@ -177,7 +177,7 @@ void WorldSession::HandleChannelMute(WorldPacket& recvPacket) sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); uint32 channelLength = recvPacket.ReadBits(8); uint32 nameLength = recvPacket.ReadBits(7); - + std::string channelname = recvPacket.ReadString(channelLength); std::string otp = recvPacket.ReadString(nameLength); @@ -198,7 +198,7 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket) std::string otp = recvPacket.ReadString(nameLength); std::string channelname = recvPacket.ReadString(channelLength); - + if (!normalizePlayerName(otp)) return; @@ -229,7 +229,7 @@ void WorldSession::HandleChannelKick(WorldPacket& recvPacket) sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); uint32 channelLength = recvPacket.ReadBits(8); uint32 nameLength = recvPacket.ReadBits(7); - + std::string channelname = recvPacket.ReadString(channelLength); std::string otp = recvPacket.ReadString(nameLength); @@ -246,7 +246,7 @@ void WorldSession::HandleChannelBan(WorldPacket& recvPacket) sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); uint32 channelLength, nameLength; std::string channelname, otp; - + channelLength = recvPacket.ReadBits(8); nameLength = recvPacket.ReadBits(7); @@ -267,10 +267,10 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket) uint32 channelLength = recvPacket.ReadBits(7); uint32 nameLength = recvPacket.ReadBits(8); - + std::string otp = recvPacket.ReadString(nameLength); std::string channelname = recvPacket.ReadString(channelLength); - + if (!normalizePlayerName(otp)) return; @@ -282,10 +282,10 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket) void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - + uint32 length = recvPacket.ReadBits(8); std::string channelname = recvPacket.ReadString(length); - + if (ChannelMgr* cMgr = channelMgr(_player->GetTeam())) if (Channel* chn = cMgr->GetChannel(channelname, _player)) chn->Announce(_player->GetGUID()); diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 3953550e972..ae549d76b33 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -96,7 +96,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData) recvData.ReadByteSeq(crossRealmGuid[5]); recvData.ReadByteSeq(crossRealmGuid[3]); recvData.ReadByteSeq(crossRealmGuid[2]); - + // attempt add selected player // cheating @@ -190,10 +190,10 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData) data.WriteBit(invitedGuid[7]); data.FlushBits(); - + data.WriteByteSeq(invitedGuid[1]); data.WriteByteSeq(invitedGuid[4]); - + data << int32(getMSTime()); data << int32(0); data << int32(0); @@ -212,7 +212,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData) data.WriteByteSeq(invitedGuid[7]); data.WriteString(player->GetName()); // invited name - + data << int32(0); player->GetSession()->SendPacket(&data); @@ -720,7 +720,7 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData) Player* movedPlayer = sObjectAccessor->FindPlayerByName(name.c_str()); uint64 guid; - + if (movedPlayer) guid = movedPlayer->GetGUID(); else diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 8762613fc3b..9ee962f4a3d 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -36,23 +36,23 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) std::string receiver, subject, body; uint32 bodyLength, subjectLength, receiverLength; uint32 unk1, unk2; - + recvData >> unk1; recvData >> unk2; // Stationery? - + recvData >> money >> COD; // money and cod bodyLength = recvData.ReadBits(12); subjectLength = recvData.ReadBits(9); uint8 items_count = recvData.ReadBits(5); // attached items count - + if (items_count > MAX_MAIL_ITEMS) // client limit { GetPlayer()->SendMailResult(0, MAIL_SEND, MAIL_ERR_TOO_MANY_ATTACHMENTS); recvData.rfinish(); // set to end to avoid warnings spam return; } - + mailbox[0] = recvData.ReadBit(); ObjectGuid itemGUIDs[MAX_MAIL_ITEMS]; @@ -68,7 +68,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) itemGUIDs[i][4] = recvData.ReadBit(); itemGUIDs[i][5] = recvData.ReadBit(); } - + mailbox[3] = recvData.ReadBit(); mailbox[4] = recvData.ReadBit(); receiverLength = recvData.ReadBits(7); @@ -77,9 +77,9 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) mailbox[1] = recvData.ReadBit(); mailbox[7] = recvData.ReadBit(); mailbox[5] = recvData.ReadBit(); - + recvData.ReadByteSeq(mailbox[4]); - + for (uint8 i = 0; i < items_count; ++i) { recvData.ReadByteSeq(itemGUIDs[i][6]); @@ -92,22 +92,22 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) recvData.ReadByteSeq(itemGUIDs[i][4]); recvData.ReadByteSeq(itemGUIDs[i][5]); } - + recvData.ReadByteSeq(mailbox[7]); recvData.ReadByteSeq(mailbox[3]); recvData.ReadByteSeq(mailbox[6]); recvData.ReadByteSeq(mailbox[5]); - + subject = recvData.ReadString(subjectLength); receiver = recvData.ReadString(receiverLength); - + recvData.ReadByteSeq(mailbox[2]); recvData.ReadByteSeq(mailbox[0]); - + body = recvData.ReadString(bodyLength); - + recvData.ReadByteSeq(mailbox[1]); - + // packet read complete, now do check if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX)) diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp index 175ea28a424..2a16efaf88b 100755 --- a/src/server/game/Handlers/TaxiHandler.cpp +++ b/src/server/game/Handlers/TaxiHandler.cpp @@ -200,7 +200,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_MOVE_SPLINE_DONE"); recvData.read_skip<uint32>(); // unk - + MovementInfo movementInfo; // used only for proper packet read ReadMovementInfo(recvData, &movementInfo); diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp index 464af1d03d7..b9603cc7822 100644 --- a/src/server/game/Handlers/VehicleHandler.cpp +++ b/src/server/game/Handlers/VehicleHandler.cpp @@ -67,7 +67,7 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket& recvData) recvData.GetOpcode(), GetPlayer()->GetGUIDLow(), seat->m_flags); return; } - + switch (recvData.GetOpcode()) { case CMSG_REQUEST_VEHICLE_PREV_SEAT: diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h index c75229c75be..8f609e8d076 100644 --- a/src/server/game/Movement/MovementStructures.h +++ b/src/server/game/Movement/MovementStructures.h @@ -1855,7 +1855,7 @@ MovementStatusElements MoveChngTransport[]= }; // 4.3.4 -MovementStatusElements MoveSplineDone[] = +MovementStatusElements MoveSplineDone[] = { MSEPositionY, MSEPositionX, @@ -1889,11 +1889,11 @@ MovementStatusElements MoveSplineDone[] = MSEHasTransportGuidByte2, MSEHasTransportTime3, MSEHasTransportGuidByte0, - + MSEHasFallDirection, MSEMovementFlags2, MSEMovementFlags, - + MSEGuidByte7, MSEGuidByte4, MSEGuidByte5, @@ -1908,7 +1908,7 @@ MovementStatusElements MoveSplineDone[] = MSEFallCosAngle, MSEFallHorizontalSpeed, MSEFallTime, - + MSEPitch, MSEOrientation, diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index 5b87d9c01b9..96b925928a4 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -155,6 +155,12 @@ namespace Movement args.path[1] = transform(dest); } + void MoveSplineInit::SetFall() + { + args.flags.EnableFalling(); + args.flags.fallingSlow = unit.HasUnitMovementFlag(MOVEMENTFLAG_FALLING_SLOW); + } + Vector3 TransportPathTransform::operator()(Vector3 input) { if (_transformForTransport) diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h index 38da7cbbc48..053be4e334a 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.h +++ b/src/server/game/Movement/Spline/MoveSplineInit.h @@ -154,12 +154,6 @@ namespace Movement inline void MoveSplineInit::SetTransportExit() { args.flags.EnableTransportExit(); } inline void MoveSplineInit::SetOrientationFixed(bool enable) { args.flags.orientationFixed = enable; } - inline void MoveSplineInit::SetFall() - { - args.flags.EnableFalling(); - args.flags.fallingSlow = unit.HasUnitMovementFlag(MOVEMENTFLAG_FALLING_SLOW); - } - inline void MoveSplineInit::MovebyPath(const PointsArray& controls, int32 path_offset) { args.path_Idx_offset = path_offset; diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 8c34db04978..d26389249c6 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -74,7 +74,7 @@ void InitOpcodes() //DEFINE_OPCODE_HANDLER(CMSG_AUCTION_REMOVE_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionRemoveItem ); //DEFINE_OPCODE_HANDLER(CMSG_AUCTION_SELL_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionSellItem ); DEFINE_OPCODE_HANDLER(CMSG_AUTH_SESSION, STATUS_NEVER, PROCESS_THREADUNSAFE, &WorldSession::Handle_EarlyProccess ); - //DEFINE_OPCODE_HANDLER(CMSG_AUTOBANK_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoBankItemOpcode ); + DEFINE_OPCODE_HANDLER(CMSG_AUTOBANK_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoBankItemOpcode ); DEFINE_OPCODE_HANDLER(CMSG_AUTOEQUIP_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoEquipItemOpcode ); DEFINE_OPCODE_HANDLER(CMSG_AUTOEQUIP_ITEM_SLOT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoEquipItemSlotOpcode ); DEFINE_OPCODE_HANDLER(CMSG_AUTOSTORE_BAG_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoStoreBagItemOpcode ); diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index a2a80edd43b..0bb376b08dd 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -62,7 +62,7 @@ public: { "add", SEC_ADMINISTRATOR, true, NULL, "", addDisableCommandTable }, { "remove", SEC_ADMINISTRATOR, true, NULL, "", removeDisableCommandTable }, { NULL, 0, false, NULL, "", NULL } - }; + }; static ChatCommand commandTable[] = { { "disable", SEC_ADMINISTRATOR, false, NULL, "", disableCommandTable }, @@ -88,7 +88,7 @@ public: uint32 entry = uint32(atoi(entryStr)); std::string disableTypeStr = ""; - + switch (disableType) { case DISABLE_TYPE_SPELL: @@ -171,12 +171,12 @@ public: default: break; } - + PreparedStatement* stmt = NULL; stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES); stmt->setUInt32(0, entry); - stmt->setUInt8(1, disableType); - PreparedQueryResult result = WorldDatabase.Query(stmt); + stmt->setUInt8(1, disableType); + PreparedQueryResult result = WorldDatabase.Query(stmt); if (result) { handler->PSendSysMessage("This %s (Id: %u) is already disabled.", disableTypeStr.c_str(), entry); @@ -290,8 +290,8 @@ public: PreparedStatement* stmt = NULL; stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES); stmt->setUInt32(0, entry); - stmt->setUInt8(1, disableType); - PreparedQueryResult result = WorldDatabase.Query(stmt); + stmt->setUInt8(1, disableType); + PreparedQueryResult result = WorldDatabase.Query(stmt); if (!result) { handler->PSendSysMessage("This %s (Id: %u) is not disabled.", disableTypeStr.c_str(), entry); diff --git a/src/server/shared/Logging/AppenderDB.cpp b/src/server/shared/Logging/AppenderDB.cpp index 76abfca2d85..d85a4db9f7a 100644 --- a/src/server/shared/Logging/AppenderDB.cpp +++ b/src/server/shared/Logging/AppenderDB.cpp @@ -37,7 +37,7 @@ void AppenderDB::_write(LogMessage& message) case LOG_FILTER_SQL_DRIVER: case LOG_FILTER_SQL_DEV: break; // Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type - default: + default: PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG); stmt->setUInt64(0, message.mtime); stmt->setUInt32(1, realm); diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 14234dfb155..d68c1c6170c 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -109,7 +109,7 @@ void Log::CreateAppenderFromConfig(const char* name) if (++iter != tokens.end()) flags = AppenderFlags(atoi(*iter)); - + switch (type) { case APPENDER_CONSOLE: @@ -464,7 +464,7 @@ void Log::outOpCode(uint32 op, const char* name, bool smsg) { if (!ShouldLog(LOG_FILTER_OPCODES, LOG_LEVEL_DEBUG)) return; - + outInfo(LOG_FILTER_OPCODES, "%s: %s 0x%.4X (%u)", smsg ? "S->C" : "C->S", name, op, op); } |