jann/m2dev-client-src
1
0
Fork 0
forked from metin-server/m2dev-client-src
Code Pull Requests Activity

Merge pull request #13 from savisxss/main

Browse Source 
removed unused code
This commit is contained in:
d1str4ught
2025-09-02 12:07:34 +02:00
committed by GitHub
parent cfae08b973 252df67871
commit e1eb805f8a
7 changed files with 0 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/UserInterface/AccountConnector.cpp
View File

@@ -57,20 +57,6 @@ void CAccountConnector::Disconnect()
__OfflineState_Set(); __OfflineState_Set();
} }
bool CAccountConnector::SendNEWCIBNPasspodAnswerPacket(const char * answer)
{
TPacketCGNEWCIBNPasspodAnswer answerPacket;
answerPacket.bHeader = HEADER_CG_NEWCIBN_PASSPOD_ANSWER;
strncpy(answerPacket.szAnswer, answer, NEWCIBN_PASSPOD_ANSWER_MAX_LEN);
answerPacket.szAnswer[NEWCIBN_PASSPOD_ANSWER_MAX_LEN] = '\0';
if (!Send(sizeof(answerPacket), &answerPacket))
{
TraceError("SendNEWCIBNPasspodAnswerPacket");
return false;
}
return SendSequence();
}
bool CAccountConnector::SendRunupMatrixCardPacket(const char * c_szMatrixCardString) bool CAccountConnector::SendRunupMatrixCardPacket(const char * c_szMatrixCardString)
{ {
TPacketCGRunupMatrixAnswer answerPacket; TPacketCGRunupMatrixAnswer answerPacket;
@@ -182,9 +168,6 @@ bool CAccountConnector::__AuthState_Process()
if (!__AnalyzePacket(HEADER_GC_RUNUP_MATRIX_QUIZ, sizeof(TPacketGCRunupMatrixQuiz), &CAccountConnector::__AuthState_RecvRunupMatrixQuiz)) if (!__AnalyzePacket(HEADER_GC_RUNUP_MATRIX_QUIZ, sizeof(TPacketGCRunupMatrixQuiz), &CAccountConnector::__AuthState_RecvRunupMatrixQuiz))
return true; return true;
if (!__AnalyzePacket(HEADER_GC_NEWCIBN_PASSPOD_REQUEST, sizeof(TPacketGCNEWCIBNPasspodRequest), &CAccountConnector::__AuthState_RecvNEWCIBNPasspodRequest))
return true;
if (!__AnalyzePacket(HEADER_GC_HANDSHAKE, sizeof(TPacketGCHandshake), &CAccountConnector::__AuthState_RecvHandshake)) if (!__AnalyzePacket(HEADER_GC_HANDSHAKE, sizeof(TPacketGCHandshake), &CAccountConnector::__AuthState_RecvHandshake))
return false; return false;
@@ -417,16 +400,6 @@ bool CAccountConnector::__AuthState_RecvRunupMatrixQuiz()
return true; return true;
} }
bool CAccountConnector::__AuthState_RecvNEWCIBNPasspodRequest()
{
TPacketGCNEWCIBNPasspodRequest kRequestPacket;
if (!Recv(sizeof(kRequestPacket), &kRequestPacket))
return false;
PyCallClassMemberFunc(m_poHandler, "BINARY_OnNEWCIBNPasspodRequest", Py_BuildValue("()"));
return true;
}
#define ROW(rows, i) ((rows >> ((4 - i - 1) * 8)) & 0x000000FF) #define ROW(rows, i) ((rows >> ((4 - i - 1) * 8)) & 0x000000FF)
#define COL(cols, i) ((cols >> ((4 - i - 1) * 8)) & 0x000000FF) #define COL(cols, i) ((cols >> ((4 - i - 1) * 8)) & 0x000000FF)

2
src/UserInterface/AccountConnector.h
View File

@@ -23,7 +23,6 @@ class CAccountConnector : public CNetworkStream, public CSingleton<CAccountConne
bool SendChinaMatrixCardPacket(const char * c_szMatrixCardString); bool SendChinaMatrixCardPacket(const char * c_szMatrixCardString);
bool SendRunupMatrixCardPacket(const char * c_szMatrixCardString); bool SendRunupMatrixCardPacket(const char * c_szMatrixCardString);
bool SendNEWCIBNPasspodAnswerPacket(const char * answer);
bool Connect(const char * c_szAddr, int iPort, const char * c_szAccountAddr, int iAccountPort); bool Connect(const char * c_szAddr, int iPort, const char * c_szAccountAddr, int iAccountPort);
void Disconnect(); void Disconnect();
@@ -55,7 +54,6 @@ class CAccountConnector : public CNetworkStream, public CSingleton<CAccountConne
bool __AuthState_RecvAuthFailure(); bool __AuthState_RecvAuthFailure();
bool __AuthState_RecvChinaMatrixCard(); bool __AuthState_RecvChinaMatrixCard();
bool __AuthState_RecvRunupMatrixQuiz(); bool __AuthState_RecvRunupMatrixQuiz();
bool __AuthState_RecvNEWCIBNPasspodRequest();
bool __AuthState_RecvPanamaPack(); bool __AuthState_RecvPanamaPack();
#ifdef _IMPROVED_PACKET_ENCRYPTION_ #ifdef _IMPROVED_PACKET_ENCRYPTION_
bool __AuthState_RecvKeyAgreement(); bool __AuthState_RecvKeyAgreement();

22
src/UserInterface/Packet.h
View File

@@ -127,7 +127,6 @@ enum
HEADER_CG_LOGIN4 = 115, HEADER_CG_LOGIN4 = 115,
HEADER_CG_RUNUP_MATRIX_ANSWER = 201, HEADER_CG_RUNUP_MATRIX_ANSWER = 201,
HEADER_CG_NEWCIBN_PASSPOD_ANSWER = 202,
HEADER_CG_DRAGON_SOUL_REFINE = 205, HEADER_CG_DRAGON_SOUL_REFINE = 205,
HEADER_CG_STATE_CHECKER = 206, HEADER_CG_STATE_CHECKER = 206,
@@ -297,8 +296,6 @@ enum
//HYBRID CRYPT //HYBRID CRYPT
HEADER_GC_RUNUP_MATRIX_QUIZ = 201, HEADER_GC_RUNUP_MATRIX_QUIZ = 201,
HEADER_GC_NEWCIBN_PASSPOD_REQUEST = 202,
HEADER_GC_NEWCIBN_PASSPOD_FAILURE = 203,
HEADER_GC_SPECIFIC_EFFECT = 208, HEADER_GC_SPECIFIC_EFFECT = 208,
HEADER_GC_DRAGON_SOUL_REFINE = 209, HEADER_GC_DRAGON_SOUL_REFINE = 209,
@@ -366,8 +363,6 @@ enum
RUNUP_MATRIX_QUIZ_MAX_LEN = 8, RUNUP_MATRIX_QUIZ_MAX_LEN = 8,
RUNUP_MATRIX_ANSWER_MAX_LEN = 4, RUNUP_MATRIX_ANSWER_MAX_LEN = 4,
NEWCIBN_PASSPOD_ANSWER_MAX_LEN = 8,
NEWCIBN_PASSPOD_FAILURE_MAX_LEN = 128,
WEAR_MAX_NUM = 11, WEAR_MAX_NUM = 11,
@@ -1015,12 +1010,6 @@ typedef struct command_runup_matrix_answer
char szAnswer[RUNUP_MATRIX_ANSWER_MAX_LEN + 1]; char szAnswer[RUNUP_MATRIX_ANSWER_MAX_LEN + 1];
} TPacketCGRunupMatrixAnswer; } TPacketCGRunupMatrixAnswer;
typedef struct command_newcibn_passpod_answer
{
uint8_t bHeader;
char szAnswer[NEWCIBN_PASSPOD_ANSWER_MAX_LEN + 1];
} TPacketCGNEWCIBNPasspodAnswer;
enum EPartyExpDistributionType enum EPartyExpDistributionType
{ {
PARTY_EXP_DISTRIBUTION_NON_PARITY, PARTY_EXP_DISTRIBUTION_NON_PARITY,
@@ -2339,17 +2328,6 @@ typedef struct packet_runup_matrixd_quiz
char szQuiz[RUNUP_MATRIX_QUIZ_MAX_LEN + 1]; char szQuiz[RUNUP_MATRIX_QUIZ_MAX_LEN + 1];
} TPacketGCRunupMatrixQuiz; } TPacketGCRunupMatrixQuiz;
typedef struct packet_newcibn_passpod_request
{
uint8_t bHeader;
} TPacketGCNEWCIBNPasspodRequest;
typedef struct packet_newcibn_passpod_failure
{
uint8_t bHeader;
char szMessage[NEWCIBN_PASSPOD_FAILURE_MAX_LEN + 1];
} TPacketGCNEWCIBNPasspodFailure;
typedef struct packet_login_key typedef struct packet_login_key
{ {
uint8_t bHeader; uint8_t bHeader;

2
src/UserInterface/PythonNetworkStream.cpp
View File

@@ -149,8 +149,6 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap
Set(HEADER_GC_CHINA_MATRIX_CARD, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCChinaMatrixCard), STATIC_SIZE_PACKET)); Set(HEADER_GC_CHINA_MATRIX_CARD, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCChinaMatrixCard), STATIC_SIZE_PACKET));
Set(HEADER_GC_RUNUP_MATRIX_QUIZ, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCRunupMatrixQuiz), STATIC_SIZE_PACKET)); Set(HEADER_GC_RUNUP_MATRIX_QUIZ, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCRunupMatrixQuiz), STATIC_SIZE_PACKET));
Set(HEADER_GC_NEWCIBN_PASSPOD_REQUEST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCNEWCIBNPasspodRequest), STATIC_SIZE_PACKET));
Set(HEADER_GC_NEWCIBN_PASSPOD_FAILURE, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCNEWCIBNPasspodFailure), STATIC_SIZE_PACKET));
Set(HEADER_GC_LOGIN_KEY, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCLoginKey), STATIC_SIZE_PACKET)); Set(HEADER_GC_LOGIN_KEY, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCLoginKey), STATIC_SIZE_PACKET));
Set(HEADER_GC_AUTH_SUCCESS, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCAuthSuccess), STATIC_SIZE_PACKET)); Set(HEADER_GC_AUTH_SUCCESS, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCAuthSuccess), STATIC_SIZE_PACKET));

3
src/UserInterface/PythonNetworkStream.h
View File

@@ -302,7 +302,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton<CPythonNet
bool SendLoginPacketNew(const char * c_szName, const char * c_szPassword); bool SendLoginPacketNew(const char * c_szName, const char * c_szPassword);
bool SendChinaMatrixCardPacket(const char * c_szMatrixCardString); bool SendChinaMatrixCardPacket(const char * c_szMatrixCardString);
bool SendRunupMatrixAnswerPacket(const char * c_szMatrixCardString); bool SendRunupMatrixAnswerPacket(const char * c_szMatrixCardString);
bool SendNEWCIBNPasspodAnswerPacket(const char * answer);
bool SendDirectEnterPacket(const char * c_szName, const char * c_szPassword, UINT uChrSlot); bool SendDirectEnterPacket(const char * c_szName, const char * c_szPassword, UINT uChrSlot);
bool SendEnterGame(); bool SendEnterGame();
@@ -406,8 +405,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton<CPythonNet
bool __RecvEmpirePacket(); bool __RecvEmpirePacket();
bool __RecvChinaMatrixCardPacket(); bool __RecvChinaMatrixCardPacket();
bool __RecvRunupMatrixQuizPacket(); bool __RecvRunupMatrixQuizPacket();
bool __RecvNEWCIBNPasspodRequestPacket();
bool __RecvNEWCIBNPasspodFailurePacket();
bool __RecvLoginKeyPacket(); bool __RecvLoginKeyPacket();
// Select Phase // Select Phase

12
src/UserInterface/PythonNetworkStreamModule.cpp
View File

@@ -440,17 +440,6 @@ PyObject* netSendRunupMatrixCardPacket(PyObject* poSelf, PyObject* poArgs)
return Py_BuildNone(); return Py_BuildNone();
} }
PyObject* netSendNEWCIBNPasspodAnswerPacket(PyObject* poSelf, PyObject* poArgs)
{
char* szMatrixCardString;
if (!PyTuple_GetString(poArgs, 0, &szMatrixCardString))
return Py_BuildException();
CAccountConnector & rkAccountConnector = CAccountConnector::Instance();
rkAccountConnector.SendNEWCIBNPasspodAnswerPacket(szMatrixCardString);
return Py_BuildNone();
}
PyObject* netDirectEnter(PyObject* poSelf, PyObject* poArgs) PyObject* netDirectEnter(PyObject* poSelf, PyObject* poArgs)
{ {
@@ -1764,7 +1753,6 @@ void initnet()
{ "SendLoginPacket", netSendLoginPacket, METH_VARARGS }, { "SendLoginPacket", netSendLoginPacket, METH_VARARGS },
{ "SendChinaMatrixCardPacket", netSendChinaMatrixCardPacket, METH_VARARGS }, { "SendChinaMatrixCardPacket", netSendChinaMatrixCardPacket, METH_VARARGS },
{ "SendRunupMatrixCardPacket", netSendRunupMatrixCardPacket, METH_VARARGS }, { "SendRunupMatrixCardPacket", netSendRunupMatrixCardPacket, METH_VARARGS },
{ "SendNEWCIBNPasspodAnswerPacket", netSendNEWCIBNPasspodAnswerPacket, METH_VARARGS },
{ "SendSelectEmpirePacket", netSendSelectEmpirePacket, METH_VARARGS }, { "SendSelectEmpirePacket", netSendSelectEmpirePacket, METH_VARARGS },
{ "SendSelectCharacterPacket", netSendSelectCharacterPacket, METH_VARARGS }, { "SendSelectCharacterPacket", netSendSelectCharacterPacket, METH_VARARGS },
{ "SendChangeNamePacket", netSendChangeNamePacket, METH_VARARGS }, { "SendChangeNamePacket", netSendChangeNamePacket, METH_VARARGS },

44
src/UserInterface/PythonNetworkStreamPhaseLogin.cpp
View File

@@ -48,15 +48,6 @@ void CPythonNetworkStream::LoginPhase()
return; return;
break; break;
case HEADER_GC_NEWCIBN_PASSPOD_REQUEST:
if (__RecvNEWCIBNPasspodRequestPacket())
return;
break;
case HEADER_GC_NEWCIBN_PASSPOD_FAILURE:
if (__RecvNEWCIBNPasspodFailurePacket())
return;
break;
case HEADER_GC_LOGIN_KEY: case HEADER_GC_LOGIN_KEY:
if (__RecvLoginKeyPacket()) if (__RecvLoginKeyPacket())
@@ -326,41 +317,6 @@ bool CPythonNetworkStream::SendRunupMatrixAnswerPacket(const char * c_szMatrixCa
return SendSequence(); return SendSequence();
} }
bool CPythonNetworkStream::__RecvNEWCIBNPasspodRequestPacket()
{
TPacketGCNEWCIBNPasspodRequest kRequestPacket;
if (!Recv(sizeof(kRequestPacket), &kRequestPacket))
return false;
PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_LOGIN], "BINARY_OnNEWCIBNPasspodRequest", Py_BuildValue("()"));
return true;
}
bool CPythonNetworkStream::__RecvNEWCIBNPasspodFailurePacket()
{
TPacketGCNEWCIBNPasspodFailure kFailurePacket;
if (!Recv(sizeof(kFailurePacket), &kFailurePacket))
return false;
PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_LOGIN], "BINARY_OnNEWCIBNPasspodFailure", Py_BuildValue("()"));
return true;
}
bool CPythonNetworkStream::SendNEWCIBNPasspodAnswerPacket(const char * answer)
{
TPacketCGNEWCIBNPasspodAnswer answerPacket;
answerPacket.bHeader = HEADER_CG_NEWCIBN_PASSPOD_ANSWER;
strncpy(answerPacket.szAnswer, answer, NEWCIBN_PASSPOD_ANSWER_MAX_LEN);
answerPacket.szAnswer[NEWCIBN_PASSPOD_ANSWER_MAX_LEN] = '\0';
if (!Send(sizeof(answerPacket), &answerPacket))
{
TraceError("SendNEWCIBNPasspodAnswerPacket");
return false;
}
return SendSequence();
}
bool CPythonNetworkStream::SendChinaMatrixCardPacket(const char * c_szMatrixCardString) bool CPythonNetworkStream::SendChinaMatrixCardPacket(const char * c_szMatrixCardString)
{ {
TPacketCGChinaMatrixCard MatrixCardPacket; TPacketCGChinaMatrixCard MatrixCardPacket;