diff --git a/src/UserInterface/AccountConnector.cpp b/src/UserInterface/AccountConnector.cpp index cd99474..5d4a0b7 100644 --- a/src/UserInterface/AccountConnector.cpp +++ b/src/UserInterface/AccountConnector.cpp @@ -57,39 +57,6 @@ void CAccountConnector::Disconnect() __OfflineState_Set(); } -bool CAccountConnector::SendRunupMatrixCardPacket(const char * c_szMatrixCardString) -{ - TPacketCGRunupMatrixAnswer answerPacket; - answerPacket.bHeader = HEADER_CG_RUNUP_MATRIX_ANSWER; - strncpy(answerPacket.szAnswer, c_szMatrixCardString, RUNUP_MATRIX_ANSWER_MAX_LEN); - answerPacket.szAnswer[RUNUP_MATRIX_ANSWER_MAX_LEN] = '\0'; - if (!Send(sizeof(answerPacket), &answerPacket)) - { - TraceError("SendRunupMatrixCardPacketError"); - return false; - } - return SendSequence(); -} - -bool CAccountConnector::SendChinaMatrixCardPacket(const char * c_szMatrixCardString) -{ - TPacketCGChinaMatrixCard MatrixCardPacket; - MatrixCardPacket.bHeader = HEADER_CG_CHINA_MATRIX_CARD; - strncpy(MatrixCardPacket.szAnswer, c_szMatrixCardString, CHINA_MATRIX_ANSWER_MAX_LEN); - MatrixCardPacket.szAnswer[CHINA_MATRIX_ANSWER_MAX_LEN] = '\0'; - - if (!Send(sizeof(MatrixCardPacket), &MatrixCardPacket)) - { - Tracen("SendLogin Error"); - return false; - } - - CPythonNetworkStream::Instance().SetWaitFlag(); - m_isWaitKey = TRUE; - - return SendSequence(); -} - void CAccountConnector::Process() { CNetworkStream::Process(); @@ -162,12 +129,6 @@ bool CAccountConnector::__AuthState_Process() if (!__AnalyzePacket(HEADER_GC_LOGIN_FAILURE, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthFailure)) return true; - if (!__AnalyzePacket(HEADER_GC_CHINA_MATRIX_CARD, sizeof(TPacketGCChinaMatrixCard), &CAccountConnector::__AuthState_RecvChinaMatrixCard)) - return true; - - if (!__AnalyzePacket(HEADER_GC_RUNUP_MATRIX_QUIZ, sizeof(TPacketGCRunupMatrixQuiz), &CAccountConnector::__AuthState_RecvRunupMatrixQuiz)) - return true; - if (!__AnalyzePacket(HEADER_GC_HANDSHAKE, sizeof(TPacketGCHandshake), &CAccountConnector::__AuthState_RecvHandshake)) return false; @@ -386,41 +347,6 @@ bool CAccountConnector::__AuthState_RecvAuthFailure() return true; } -bool CAccountConnector::__AuthState_RecvRunupMatrixQuiz() -{ - TPacketGCRunupMatrixQuiz kMatrixQuizPacket; - if (!Recv(sizeof(TPacketGCRunupMatrixQuiz), &kMatrixQuizPacket)) - return false; - - PyCallClassMemberFunc(m_poHandler, "BINARY_OnRunupMatrixQuiz", Py_BuildValue("(s)", kMatrixQuizPacket.szQuiz)); - return true; -} - -#define ROW(rows, i) ((rows >> ((4 - i - 1) * 8)) & 0x000000FF) -#define COL(cols, i) ((cols >> ((4 - i - 1) * 8)) & 0x000000FF) - -bool CAccountConnector::__AuthState_RecvChinaMatrixCard() -{ - TPacketGCChinaMatrixCard kMatrixCardPacket; - if (!Recv(sizeof(TPacketGCChinaMatrixCard), &kMatrixCardPacket)) - return false; - - if (m_poHandler) - { - PyObject * pyValue = Py_BuildValue("(iiiiiiii)", ROW(kMatrixCardPacket.dwRows, 0), - ROW(kMatrixCardPacket.dwRows, 1), - ROW(kMatrixCardPacket.dwRows, 2), - ROW(kMatrixCardPacket.dwRows, 3), - COL(kMatrixCardPacket.dwCols, 0), - COL(kMatrixCardPacket.dwCols, 1), - COL(kMatrixCardPacket.dwCols, 2), - COL(kMatrixCardPacket.dwCols, 3)); - PyCallClassMemberFunc(m_poHandler, "OnMatrixCard", pyValue); - } - - return true; -} - #ifdef _IMPROVED_PACKET_ENCRYPTION_ bool CAccountConnector::__AuthState_RecvKeyAgreement() { diff --git a/src/UserInterface/AccountConnector.h b/src/UserInterface/AccountConnector.h index f9a03fb..b403a17 100644 --- a/src/UserInterface/AccountConnector.h +++ b/src/UserInterface/AccountConnector.h @@ -21,9 +21,6 @@ class CAccountConnector : public CNetworkStream, public CSingleton> ((4 - i - 1) * 8)) & 0x000000FF) -#define COL(cols, i) ((cols >> ((4 - i - 1) * 8)) & 0x000000FF) - -bool CPythonNetworkStream::__RecvChinaMatrixCardPacket() -{ - TPacketGCChinaMatrixCard kMatrixCardPacket; - if (!Recv(sizeof(TPacketGCChinaMatrixCard), &kMatrixCardPacket)) - return false; - - PyObject * pyValue = Py_BuildValue("(iiiiiiii)", ROW(kMatrixCardPacket.dwRows, 0), - ROW(kMatrixCardPacket.dwRows, 1), - ROW(kMatrixCardPacket.dwRows, 2), - ROW(kMatrixCardPacket.dwRows, 3), - COL(kMatrixCardPacket.dwCols, 0), - COL(kMatrixCardPacket.dwCols, 1), - COL(kMatrixCardPacket.dwCols, 2), - COL(kMatrixCardPacket.dwCols, 3)); - PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_LOGIN], "OnMatrixCard", pyValue); - return true; -} - bool CPythonNetworkStream::__RecvLoginKeyPacket() { TPacketGCLoginKey kLoginKeyPacket;