Tr0n/client
1
0
Fork 0
forked from metin2/client
Code Pull Requests Activity

Removed mobile/SMS from messenger

Browse Source
This commit is contained in:
Exynox
2024-03-31 10:35:00 +00:00
parent e3a957cf4b
commit f46e28d3f2
19 changed files with 11 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/UserInterface/AbstractPlayer.h
View File

@ -54,7 +54,6 @@ class IAbstractPlayer : public TAbstractSingleton<IAbstractPlayer>
virtual void NotifyChangePKMode() = 0;
virtual void SetObserverMode(bool isEnable) = 0;
virtual void SetMobileFlag(BOOL bFlag) = 0;
virtual void SetComboSkillFlag(BOOL bFlag) = 0;
virtual void StartEmotionProcess() = 0;

2
src/UserInterface/Packet.h
View File

@ -807,7 +807,6 @@ enum
MESSENGER_SUBHEADER_GC_LOGIN,
MESSENGER_SUBHEADER_GC_LOGOUT,
MESSENGER_SUBHEADER_GC_INVITE,
MESSENGER_SUBHEADER_GC_MOBILE,
};
typedef struct packet_messenger
@ -827,7 +826,6 @@ enum
{
MESSENGER_CONNECTED_STATE_OFFLINE,
MESSENGER_CONNECTED_STATE_ONLINE,
MESSENGER_CONNECTED_STATE_MOBILE,
};
typedef struct packet_messenger_list_online

8
src/UserInterface/PythonMessenger.cpp
View File

@ -22,14 +22,6 @@ void CPythonMessenger::OnFriendLogout(const char * c_szKey)
PyCallClassMemberFunc(m_poMessengerHandler, "OnLogout", Py_BuildValue("(is)", MESSENGER_GRUOP_INDEX_FRIEND, c_szKey));
}
void CPythonMessenger::SetMobile(const char * c_szKey, BYTE byState)
{
m_FriendNameMap.insert(c_szKey);
if (m_poMessengerHandler)
PyCallClassMemberFunc(m_poMessengerHandler, "OnMobile", Py_BuildValue("(isi)", MESSENGER_GRUOP_INDEX_FRIEND, c_szKey, byState));
}
BOOL CPythonMessenger::IsFriendByKey(const char * c_szKey)
{
return m_FriendNameMap.end() != m_FriendNameMap.find(c_szKey);

1
src/UserInterface/PythonMessenger.h
View File

@ -22,7 +22,6 @@ class CPythonMessenger : public CSingleton<CPythonMessenger>
void RemoveFriend(const char * c_szKey);
void OnFriendLogin(const char * c_szKey);
void OnFriendLogout(const char * c_szKey);
void SetMobile(const char * c_szKey, BYTE byState);
BOOL IsFriendByKey(const char * c_szKey);
BOOL IsFriendByName(const char * c_szName);

1
src/UserInterface/PythonNetworkStream.h
View File

@ -309,7 +309,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton<CPythonNet
bool SendC2CPacket(DWORD dwSize, void * pData);
bool SendChatPacket(const char * c_szChat, BYTE byType = CHAT_TYPE_TALKING);
bool SendWhisperPacket(const char * name, const char * c_szChat);
bool SendMobileMessagePacket(const char * name, const char * c_szChat);
bool SendMessengerAddByVIDPacket(DWORD vid);
bool SendMessengerAddByNamePacket(const char * c_szName);
bool SendMessengerRemovePacket(const char * c_szKey, const char * c_szName);

14
src/UserInterface/PythonNetworkStreamCommand.cpp
View File

@ -399,20 +399,6 @@ void CPythonNetworkStream::ServerCommand(char * c_szCommand)
IAbstractPlayer& rPlayer=IAbstractPlayer::GetSingleton();
rPlayer.StopStaminaConsume(dwCurrentStamina);
}
else if (!strcmpi(szCmd, "sms"))
{
IAbstractPlayer& rPlayer=IAbstractPlayer::GetSingleton();
rPlayer.SetMobileFlag(TRUE);
}
else if (!strcmpi(szCmd, "nosms"))
{
IAbstractPlayer& rPlayer=IAbstractPlayer::GetSingleton();
rPlayer.SetMobileFlag(FALSE);
}
else if (!strcmpi(szCmd, "mobile_auth"))
{
PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_GAME], "OnMobileAuthority", Py_BuildValue("()"));
}
else if (!strcmpi(szCmd, "messenger_auth"))
{
const std::string & c_rstrName = TokenVector[1].c_str();

16
src/UserInterface/PythonNetworkStreamModule.cpp
View File

@ -536,21 +536,6 @@ PyObject* netSendWhisperPacket(PyObject* poSelf, PyObject* poArgs)
return Py_BuildNone();
}
PyObject* netSendMobileMessagePacket(PyObject* poSelf, PyObject* poArgs)
{
char* szName;
char* szLine;
if (!PyTuple_GetString(poArgs, 0, &szName))
return Py_BuildException();
if (!PyTuple_GetString(poArgs, 1, &szLine))
return Py_BuildException();
CPythonNetworkStream& rkNetStream=CPythonNetworkStream::Instance();
rkNetStream.SendMobileMessagePacket(szName, szLine);
return Py_BuildNone();
}
PyObject* netSendCharacterPositionPacket(PyObject* poSelf, PyObject* poArgs)
{
int iPosition;
@ -1789,7 +1774,6 @@ void initnet()
{ "SendChatPacket", netSendChatPacket, METH_VARARGS },
{ "SendEmoticon", netSendEmoticon, METH_VARARGS },
{ "SendWhisperPacket", netSendWhisperPacket, METH_VARARGS },
{ "SendMobileMessagePacket", netSendMobileMessagePacket, METH_VARARGS },
{ "SendCharacterPositionPacket", netSendCharacterPositionPacket, METH_VARARGS },

36
src/UserInterface/PythonNetworkStreamPhaseGame.cpp
View File

@ -1446,24 +1446,6 @@ bool CPythonNetworkStream::SendWhisperPacket(const char * name, const char * c_s
return SendSequence();
}
bool CPythonNetworkStream::SendMobileMessagePacket(const char * name, const char * c_szChat)
{
int iTextLen = strlen(c_szChat) + 1;
TPacketCGSMS SMSPacket;
SMSPacket.bHeader = HEADER_CG_SMS;
SMSPacket.wSize = sizeof(SMSPacket) + iTextLen;
strncpy(SMSPacket.szNameTo, name, sizeof(SMSPacket.szNameTo) - 1);
if (!Send(sizeof(SMSPacket), &SMSPacket))
return false;
if (!Send(iTextLen, c_szChat))
return false;
return SendSequence();
}
bool CPythonNetworkStream::RecvPointChange()
{
TPacketGCPointChange PointChange;
@ -2756,9 +2738,6 @@ bool CPythonNetworkStream::RecvMessenger()
else
CPythonMessenger::Instance().OnFriendLogout(char_name);
if (on.connected & MESSENGER_CONNECTED_STATE_MOBILE)
CPythonMessenger::Instance().SetMobile(char_name, TRUE);
iSize -= sizeof(TPacketGCMessengerListOffline);
iSize -= on.length;
}
@ -2789,21 +2768,6 @@ bool CPythonNetworkStream::RecvMessenger()
CPythonMessenger::Instance().OnFriendLogout(char_name);
break;
}
case MESSENGER_SUBHEADER_GC_MOBILE:
{
BYTE byState; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ȣ<EFBFBD><C8A3> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>÷<EFBFBD><C3B7><EFBFBD>
BYTE byLength;
if (!Recv(sizeof(byState), &byState))
return false;
if (!Recv(sizeof(byLength), &byLength))
return false;
if (!Recv(byLength, char_name))
return false;
char_name[byLength] = 0;
CPythonMessenger::Instance().SetMobile(char_name, byState);
break;
}
}
return true;
}

15
src/UserInterface/PythonPlayer.cpp
View File

@ -1542,17 +1542,6 @@ DWORD CPythonPlayer::GetPKMode()
return pInstance->GetPKMode();
}
void CPythonPlayer::SetMobileFlag(BOOL bFlag)
{
m_bMobileFlag = bFlag;
PyCallClassMemberFunc(m_ppyGameWindow, "RefreshMobile", Py_BuildValue("()"));
}
BOOL CPythonPlayer::HasMobilePhoneNumber()
{
return m_bMobileFlag;
}
void CPythonPlayer::SetGameWindow(PyObject * ppyObject)
{
m_ppyGameWindow = ppyObject;
@ -1600,8 +1589,6 @@ void CPythonPlayer::ClearSkillDict()
m_fConsumeStaminaPerSec = 0.0f;
m_fCurrentStamina = 0.0f;
m_bMobileFlag = FALSE;
__ClearAutoAttackTargetActorID();
}
@ -1673,8 +1660,6 @@ void CPythonPlayer::Clear()
m_inGuildAreaID = 0xffffffff;
m_bMobileFlag = FALSE;
__ClearAutoAttackTargetActorID();
}

8
src/UserInterface/PythonPlayer.h
View File

@ -400,11 +400,6 @@ class CPythonPlayer : public CSingleton<CPythonPlayer>, public IAbstractPlayer
DWORD GetPKMode();
// Mobile
void SetMobileFlag(BOOL bFlag);
BOOL HasMobilePhoneNumber();
// Combo
void SetComboSkillFlag(BOOL bFlag);
@ -648,9 +643,6 @@ class CPythonPlayer : public CSingleton<CPythonPlayer>, public IAbstractPlayer
// Guild
DWORD m_inGuildAreaID;
// Mobile
BOOL m_bMobileFlag;
// System
BOOL m_sysIsCoolTime;
BOOL m_sysIsLevelLimit;

8
src/UserInterface/PythonPlayerModule.cpp
View File

@ -1875,11 +1875,6 @@ PyObject * playerGetPKMode(PyObject* poSelf, PyObject* poArgs)
return Py_BuildValue("i", CPythonPlayer::Instance().GetPKMode());
}
PyObject * playerHasMobilePhoneNumber(PyObject* poSelf, PyObject* poArgs)
{
return Py_BuildValue("i", CPythonPlayer::Instance().HasMobilePhoneNumber());
}
PyObject * playerSetWeaponAttackBonusFlag(PyObject* poSelf, PyObject* poArgs)
{
int iFlag;
@ -2313,9 +2308,6 @@ void initPlayer()
// PK Mode
{ "GetPKMode", playerGetPKMode, METH_VARARGS },
// Mobile
{ "HasMobilePhoneNumber", playerHasMobilePhoneNumber, METH_VARARGS },
// Emotion
{ "RegisterEmotionIcon", playerRegisterEmotionIcon, METH_VARARGS },
{ "GetEmotionIconImage", playerGetEmotionIconImage, METH_VARARGS },