diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index b298ea23f..cc7b0623f 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -808,32 +808,6 @@ void WorldSession::HandleSetFactionAtWar( WorldPacket & recv_data ) GetPlayer()->GetReputationMgr().SetAtWar(repListID, flag); } -//I think this function is never used :/ I dunno, but i guess this opcode not exists -void WorldSession::HandleSetFactionCheat( WorldPacket & /*recv_data*/ ) -{ - sLog.outError("WORLD SESSION: HandleSetFactionCheat, not expected call, please report."); - /* - uint32 FactionID; - uint32 Standing; - - recv_data >> FactionID; - recv_data >> Standing; - - std::list::iterator itr; - - for(itr = GetPlayer()->factions.begin(); itr != GetPlayer()->factions.end(); ++itr) - { - if(itr->ReputationListID == FactionID) - { - itr->Standing += Standing; - itr->Flags = (itr->Flags | 1); - break; - } - } - */ - GetPlayer()->GetReputationMgr().SendStates(); -} - void WorldSession::HandleMeetingStoneInfo( WorldPacket & /*recv_data*/ ) { DEBUG_LOG( "WORLD: Received CMSG_MEETING_STONE_INFO" ); diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 6c26ded59..c64c23e58 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -320,7 +320,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x123*/ { "SMSG_SET_FACTION_VISIBLE", STATUS_NEVER, &WorldSession::Handle_ServerSide }, /*0x124*/ { "SMSG_SET_FACTION_STANDING", STATUS_NEVER, &WorldSession::Handle_ServerSide }, /*0x125*/ { "CMSG_SET_FACTION_ATWAR", STATUS_LOGGEDIN, &WorldSession::HandleSetFactionAtWar }, - /*0x126*/ { "CMSG_SET_FACTION_CHEAT", STATUS_LOGGEDIN, &WorldSession::HandleSetFactionCheat }, + /*0x126*/ { "CMSG_SET_FACTION_CHEAT", STATUS_NEVER, &WorldSession::Handle_Deprecated }, /*0x127*/ { "SMSG_SET_PROFICIENCY", STATUS_NEVER, &WorldSession::Handle_ServerSide }, /*0x128*/ { "CMSG_SET_ACTION_BUTTON", STATUS_LOGGEDIN, &WorldSession::HandleSetActionButtonOpcode }, /*0x129*/ { "SMSG_ACTION_BUTTONS", STATUS_NEVER, &WorldSession::Handle_ServerSide }, diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp index e38a653d2..136a95f91 100644 --- a/src/game/ReputationMgr.cpp +++ b/src/game/ReputationMgr.cpp @@ -194,12 +194,6 @@ void ReputationMgr::SendInitialReputations() m_player->SendDirectMessage(&data); } -void ReputationMgr::SendStates() const -{ - for(FactionStateList::const_iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr) - SendState(&(itr->second)); -} - void ReputationMgr::SendVisible(FactionState const* faction) const { if(m_player->GetSession()->PlayerLoading()) diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h index 37d43126f..1c2172790 100644 --- a/src/game/ReputationMgr.h +++ b/src/game/ReputationMgr.h @@ -121,7 +121,6 @@ class ReputationMgr void SendInitialReputations(); void SendForceReactions(); void SendState(FactionState const* faction) const; - void SendStates() const; private: // internal helper functions void Initialize(); diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 2b5fdc62c..d9b975907 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -402,7 +402,6 @@ class MANGOS_DLL_SPEC WorldSession void HandleAreaTriggerOpcode(WorldPacket& recvPacket); void HandleSetFactionAtWar( WorldPacket & recv_data ); - void HandleSetFactionCheat( WorldPacket & recv_data ); void HandleSetWatchedFactionOpcode(WorldPacket & recv_data); void HandleSetFactionInactiveOpcode(WorldPacket & recv_data); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2f1393a9b..8cb0aa910 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10296" + #define REVISION_NR "10297" #endif // __REVISION_NR_H__