From a2bac7a5f3fc639dd9eab53ae5a2a29a3040c013 Mon Sep 17 00:00:00 2001 From: WildEgo Date: Sat, 1 Jun 2024 16:54:08 +0100 Subject: [PATCH] remove: OpenID --- bin/pack/root/intrologin.py | 83 ++--- src/EterLib/NetStream.cpp | 1 - src/UserInterface/AccountConnector.cpp | 111 +----- src/UserInterface/AccountConnector.h | 7 +- src/UserInterface/Locale.cpp | 20 - src/UserInterface/Locale.h | 5 - src/UserInterface/Packet.h | 344 +++++++++--------- src/UserInterface/PythonApplicationModule.cpp | 17 +- src/UserInterface/PythonNetworkStream.cpp | 25 +- src/UserInterface/UserInterface.cpp | 81 +---- 10 files changed, 229 insertions(+), 465 deletions(-) diff --git a/bin/pack/root/intrologin.py b/bin/pack/root/intrologin.py index 52188207..2997e983 100644 --- a/bin/pack/root/intrologin.py +++ b/bin/pack/root/intrologin.py @@ -262,14 +262,10 @@ class LoginWindow(ui.ScriptWindow): else: connectingIP = self.stream.GetConnectAddr() if connectingIP: - if app.USE_OPENID and not app.OPENID_TEST : - self.__RefreshServerList() - self.__OpenServerBoard() - else: - self.__OpenLoginBoard() - if IsFullBackImage(): - self.GetChild("bg1").Hide() - self.GetChild("bg2").Show() + self.__OpenLoginBoard() + if IsFullBackImage(): + self.GetChild("bg1").Hide() + self.GetChild("bg2").Show() else: self.__RefreshServerList() @@ -287,13 +283,13 @@ class LoginWindow(ui.ScriptWindow): print "---------------------------------------------------------------------------- CLOSE LOGIN WINDOW " # - # selectMusicÀÌ ¾øÀ¸¸é BGMÀÌ ²÷±â¹Ç·Î µÎ°³ ´Ù üũÇÑ´Ù. + # selectMusic�� ������ BGM�� ����Ƿ� �ΰ� �� üũ�Ѵ�. # if musicInfo.loginMusic != "" and musicInfo.selectMusic != "": snd.FadeOutMusic("BGM/"+musicInfo.loginMusic) - ## NOTE : idEditLine¿Í pwdEditLineÀº À̺¥Æ®°¡ ¼­·Î ¿¬°á µÇ¾îÀ־ - ## Event¸¦ °­Á¦·Î ÃʱâÈ­ ÇØÁÖ¾î¾ß¸¸ ÇÕ´Ï´Ù - [levites] + ## NOTE : idEditLine�� pwdEditLine�� �̺�Ʈ�� ���� ���� �Ǿ��־ + ## Event�� ������ �ʱ�ȭ ���־�߸� �մϴ� - [levites] self.idEditLine.SetTabEvent(0) self.idEditLine.SetReturnEvent(0) self.pwdEditLine.SetReturnEvent(0) @@ -393,11 +389,11 @@ class LoginWindow(ui.ScriptWindow): def SetPasswordEditLineFocus(self): if localeInfo.IsEUROPE(): - if self.idEditLine != None: #0000862: [M2EU] ·Î±×ÀÎâ Æ˾÷ ¿¡·¯: Á¾·á½Ã ¸ÕÀú None ¼³Á¤µÊ + if self.idEditLine != None: #0000862: [M2EU] �α���â �˾� ����: ����� ���� None ������ self.idEditLine.SetText("") - self.idEditLine.SetFocus() #0000685: [M2EU] ¾ÆÀ̵ð/ºñ¹Ð¹øÈ£ À¯Ãß °¡´É ¹ö±× ¼öÁ¤: ¹«Á¶°Ç ¾ÆÀ̵ð·Î Æ÷Ä¿½º°¡ °¡°Ô ¸¸µç´Ù + self.idEditLine.SetFocus() #0000685: [M2EU] ���̵�/��й�ȣ ���� ���� ���� ����: ������ ���̵�� ��Ŀ���� ���� ����� - if self.pwdEditLine != None: #0000862: [M2EU] ·Î±×ÀÎâ Æ˾÷ ¿¡·¯: Á¾·á½Ã ¸ÕÀú None ¼³Á¤µÊ + if self.pwdEditLine != None: #0000862: [M2EU] �α���â �˾� ����: ����� ���� None ������ self.pwdEditLine.SetText("") else: if self.pwdEditLine != None: @@ -455,7 +451,7 @@ class LoginWindow(ui.ScriptWindow): loginFailureMsg = localeInfo.LOGIN_FAILURE_UNKNOWN + error - #0000685: [M2EU] ¾ÆÀ̵ð/ºñ¹Ð¹øÈ£ À¯Ãß °¡´É ¹ö±× ¼öÁ¤: ¹«Á¶°Ç Æнº¿öµå·Î Æ÷Ä¿½º°¡ °¡°Ô ¸¸µç´Ù + #0000685: [M2EU] ���̵�/��й�ȣ ���� ���� ���� ����: ������ ������ ��Ŀ���� ���� ����� loginFailureFunc=self.loginFailureFuncDict.get(error, self.SetPasswordEditLineFocus) if app.loggined: @@ -703,18 +699,18 @@ class LoginWindow(ui.ScriptWindow): execfile(loginInfoFileName, loginInfo) except IOError: print(\ - "ÀÚµ¿ ·Î±×ÀÎÀ» ÇϽ÷Á¸é" + loginInfoFileName + "ÆÄÀÏÀ» ÀÛ¼ºÇØÁÖ¼¼¿ä\n"\ + "�ڵ� ����� �Ͻ÷���" + loginInfoFileName + "������ �ۼ����ּ���\n"\ "\n"\ - "³»¿ë:\n"\ + "����:\n"\ "================================================================\n"\ - "addr=ÁÖ¼Ò\n"\ - "port=Æ÷Æ®\n"\ - "id=¾ÆÀ̵ð\n"\ - "pwd=ºñ¹Ð¹øÈ£\n"\ - "slot=ij¸¯ÅÍ ¼±Åà À妽º (¾ø°Å³ª -1À̸é ÀÚµ¿ ¼±Åà ¾ÈÇÔ)\n"\ - "autoLogin=ÀÚµ¿ Á¢¼Ó ¿©ºÎ\n" - "autoSelect=ÀÚµ¿ Á¢¼Ó ¿©ºÎ\n" - "locale=(ymir) LC_Ymir ÀÏ°æ¿ì ymir·Î ÀÛµ¿. ÁöÁ¤ÇÏÁö ¾ÊÀ¸¸é korea·Î ÀÛµ¿\n" + "addr=�ּ�\n"\ + "port=��Ʈ\n"\ + "id=���̵�\n"\ + "pwd=��й�ȣ\n"\ + "slot=ij���� ���� ��� (���ų� -1�̸� �ڵ� ���� ����)\n"\ + "autoLogin=�ڵ� ���� ����\n" + "autoSelect=�ڵ� ���� ����\n" + "locale=(ymir) LC_Ymir �ϰ�� ymir�� �۵�. �������� ������ korea�� �۵�\n" ); id=loginInfo.get("id", "") @@ -738,7 +734,7 @@ class LoginWindow(ui.ScriptWindow): self.__SetServerInfo(locale.CHANNEL_TEST_SERVER) except: import exception - exception.Abort("LoginWindow.__LoadLoginInfo - Å×½ºÆ®¼­¹ö ÁÖ¼Ò°¡ ¾ø½À´Ï´Ù") + exception.Abort("LoginWindow.__LoadLoginInfo - �׽�Ʈ���� �ּҰ� �����ϴ�") else: addr=loginInfo.get("addr", "") @@ -752,7 +748,7 @@ class LoginWindow(ui.ScriptWindow): net.SetMarkServer(addr, port) if locale == "ymir" : - net.SetServerInfo("õ¸¶ ¼­¹ö") + net.SetServerInfo("õ�� ����") self.serverInfo.SetText("Y:"+addr+":"+str(port)) else: net.SetServerInfo(addr+":"+str(port)) @@ -783,7 +779,7 @@ class LoginWindow(ui.ScriptWindow): self.Connect(id, pwd) print "==================================================================================" - print "ÀÚµ¿ ·Î±×ÀÎ: %s - %s:%d %s" % (loginInfoFileName, addr, port, id) + print "�ڵ� ���: %s - %s:%d %s" % (loginInfoFileName, addr, port, id) print "==================================================================================" @@ -902,9 +898,9 @@ class LoginWindow(ui.ScriptWindow): self.stream.popupWindow.Close() # CHINA_MATRIX_CARD_BUG_FIX - ## A~Z ±îÁö 26 À̳»ÀÇ °ªÀÌ µé¾îÀÖ¾î¾ß¸¸ ÇÑ´Ù. - ## Python Exception Log ¿¡¼­ ±× ÀÌ»óÀÇ °ªÀÌ µé¾îÀ־ ¿¡·¯ ¹æÁö - ## Çåµ¥ ¿Ö Çѱ¹ÂÊ ·Î±×¿¡¼­ ÀÌ°Ô È°¿ëµÇ´ÂÁö´Â ¸ð¸£°ÚÀ½ + ## A~Z ���� 26 �̳��� ���� ����־�߸� �Ѵ�. + ## Python Exception Log ���� �� �̻��� ���� ����־ ���� ���� + ## �嵥 �� �ѱ��� �α׿��� �̰� Ȱ��Ǵ����� �𸣰��� row1 = min(30, row1) row2 = min(30, row2) row3 = min(30, row3) @@ -1031,7 +1027,7 @@ class LoginWindow(ui.ScriptWindow): if channelIndex >= 0: self.channelList.SelectItem(channelIndex) - ## Show/Hide Äڵ忡 ¹®Á¦°¡ À־ Àӽà - [levites] + ## Show/Hide �ڵ忡 ������ �־ �ӽ� - [levites] self.serverBoard.SetPosition(self.xServerBoard, self.yServerBoard) self.serverBoard.Show() self.connectBoard.Hide() @@ -1265,7 +1261,7 @@ class LoginWindow(ui.ScriptWindow): self.PopupNotifyMessage(localeInfo.CHANNEL_SELECT_CHANNEL) return - # »óÅ°¡ FULL °ú °°À¸¸é ÁøÀÔ ±ÝÁö + # ���°� FULL �� ������ ���� ���� if state == serverInfo.STATE_DICT[3]: self.PopupNotifyMessage(localeInfo.CHANNEL_NOTIFY_FULL) return @@ -1277,9 +1273,9 @@ class LoginWindow(ui.ScriptWindow): channelName = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["name"] addrKey = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["key"] - if "õ¸¶ ¼­¹ö" == serverName: + if "õ�� ����" == serverName: app.ForceSetLocale("ymir", "locale/ymir") - elif "Äèµµ ¼­¹ö" == serverName: + elif "�赵 ����" == serverName: app.ForceSetLocale("we_korea", "locale/we_korea") except: @@ -1294,7 +1290,7 @@ class LoginWindow(ui.ScriptWindow): tcp_port = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["tcp_port"] except: import exception - exception.Abort("LoginWindow.__OnClickSelectServerButton - ¼­¹ö ¼±Åà ½ÇÆÐ") + exception.Abort("LoginWindow.__OnClickSelectServerButton - ���� ���� ����") try: account_ip = serverInfo.REGION_AUTH_SERVER_DICT[regionID][serverID]["ip"] @@ -1314,19 +1310,10 @@ class LoginWindow(ui.ScriptWindow): except: import exception - exception.Abort("LoginWindow.__OnClickSelectServerButton - ¸¶Å© Á¤º¸ ¾øÀ½") + exception.Abort("LoginWindow.__OnClickSelectServerButton - ��ũ ���� ����") - - if app.USE_OPENID and not app.OPENID_TEST : - ## 2012.07.19 OpenID : ±è¿ë¿í - # ä³Î ¼±Åà ȭ¸é¿¡¼­ "È®ÀÎ"(SelectServerButton) À» ´­·¶À»¶§, - # ·Î±×ÀÎ È­¸éÀ¸·Î ³Ñ¾î°¡Áö ¾Ê°í ¹Ù·Î ¼­¹ö¿¡ OpenID ÀÎÁõÅ°¸¦ º¸³»µµ·Ï ¼öÁ¤ - self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port) - self.Connect(0, 0) - else : - self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port) - self.__OpenLoginBoard() - + self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port) + self.__OpenLoginBoard() def __OnClickSelectConnectButton(self): if IsFullBackImage(): diff --git a/src/EterLib/NetStream.cpp b/src/EterLib/NetStream.cpp index 2969e39f..8bb658ae 100644 --- a/src/EterLib/NetStream.cpp +++ b/src/EterLib/NetStream.cpp @@ -521,7 +521,6 @@ const char * GetRecvHeaderName(BYTE header) stringList[135] = "HEADER_GC_DAMAGE_INFO"; stringList[136] = "HEADER_GC_CHAR_ADDITIONAL_INFO"; stringList[150] = "HEADER_GC_AUTH_SUCCESS"; - stringList[154] = "HEADER_GC_AUTH_SUCCESS_OPENID"; stringList[0xfc] = "HEADER_GC_HANDSHAKE_OK"; stringList[0xfd] = "HEADER_GC_PHASE"; stringList[0xfe] = "HEADER_GC_BINDUDP"; diff --git a/src/UserInterface/AccountConnector.cpp b/src/UserInterface/AccountConnector.cpp index 6badd1c3..4c2dd8d1 100644 --- a/src/UserInterface/AccountConnector.cpp +++ b/src/UserInterface/AccountConnector.cpp @@ -10,10 +10,6 @@ extern DWORD g_adwEncryptKey[4]; extern DWORD g_adwDecryptKey[4]; // END_OF_CHINA_CRYPT_KEY -#ifdef USE_OPENID -extern int openid_test; -#endif - void CAccountConnector::SetHandler(PyObject* poHandler) { m_poHandler = poHandler; @@ -141,7 +137,7 @@ bool CAccountConnector::__HandshakeState_Process() if (!__AnalyzePacket(HEADER_GC_PING, sizeof(TPacketGCPing), &CAccountConnector::__AuthState_RecvPing)) return false; - // TODO : Â÷ÈÄ ¼­¹ö¿Í µ¿ÀÏÇÏ°Ô °¡º¯±æÀÌ data serialize & deserialize ÀÛ¾÷ÇØ¾ß ÇÑ´Ù. + // TODO : ���� ������ �����ϰ� �������� data serialize & deserialize �۾��ؾ� �Ѵ�. if (!__AnalyzeVarSizePacket(HEADER_GC_HYBRIDCRYPT_KEYS, &CAccountConnector::__AuthState_RecvHybridCryptKeys)) return false; @@ -165,11 +161,6 @@ bool CAccountConnector::__AuthState_Process() if (!__AnalyzePacket(HEADER_GC_AUTH_SUCCESS, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthSuccess)) return true; -#ifdef USE_OPENID - if (!__AnalyzePacket(HEADER_GC_AUTH_SUCCESS_OPENID, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthSuccess_OpenID)) - return true; -#endif /* USE_OPENID */ - if (!__AnalyzePacket(HEADER_GC_LOGIN_FAILURE, sizeof(TPacketGCAuthSuccess), &CAccountConnector::__AuthState_RecvAuthFailure)) return true; @@ -188,7 +179,7 @@ bool CAccountConnector::__AuthState_Process() if (!__AnalyzePacket(HEADER_GC_PANAMA_PACK, sizeof(TPacketGCPanamaPack), &CAccountConnector::__AuthState_RecvPanamaPack)) return false; - // TODO : Â÷ÈÄ ¼­¹ö¿Í µ¿ÀÏÇÏ°Ô °¡º¯±æÀÌ data serialize & deserialize ÀÛ¾÷ÇØ¾ß ÇÑ´Ù. + // TODO : ���� ������ �����ϰ� �������� data serialize & deserialize �۾��ؾ� �Ѵ�. if (!__AnalyzeVarSizePacket(HEADER_GC_HYBRIDCRYPT_KEYS, &CAccountConnector::__AuthState_RecvHybridCryptKeys)) return false; @@ -217,68 +208,6 @@ bool CAccountConnector::__AuthState_RecvPhase() } else if (kPacketPhase.phase == PHASE_AUTH) { - -#ifdef USE_OPENID - if (!openid_test) - { - //2012.07.19 OpenID : ±è¿ë¿í - //Ongoing : ¿ÀÇ ¾ÆÀ̵ð °æ¿ì-> TPacketCGLogin5 - //Ŭ¶ó°¡ °¡Áö°í ÀÖ´Â ÀÎÁõÅ°¸¸À» ¼­¹ö¿¡ º¸³»µµ·Ï. - - //const char* tempAuthKey = "d4025bc1f752b64fe5d51ae575ec4730"; //ÇϵåÄÚµù ±æÀÌ 32 - TPacketCGLogin5 LoginPacket; - LoginPacket.header = HEADER_CG_LOGIN5_OPENID; - - strncpy(LoginPacket.authKey, LocaleService_GetOpenIDAuthKey(), OPENID_AUTHKEY_LEN); - LoginPacket.authKey[OPENID_AUTHKEY_LEN] = '\0'; - - for (DWORD i = 0; i < 4; ++i) - LoginPacket.adwClientKey[i] = g_adwEncryptKey[i]; - - if (!Send(sizeof(LoginPacket), &LoginPacket)) - { - Tracen(" CAccountConnector::__AuthState_RecvPhase - SendLogin5 Error"); - return false; - } - - if (!SendSequence()) - { - return false; - } - } - else - { - TPacketCGLogin3 LoginPacket; - LoginPacket.header = HEADER_CG_LOGIN3; - - strncpy(LoginPacket.name, m_strID.c_str(), ID_MAX_NUM); - strncpy(LoginPacket.pwd, m_strPassword.c_str(), PASS_MAX_NUM); - LoginPacket.name[ID_MAX_NUM] = '\0'; - LoginPacket.pwd[PASS_MAX_NUM] = '\0'; - - // ºñ¹Ð¹øÈ£¸¦ ¸Þ¸ð¸®¿¡ °è¼Ó °®°í ÀÖ´Â ¹®Á¦°¡ À־, »ç¿ë Áï½Ã ³¯¸®´Â °ÍÀ¸·Î º¯°æ - ClearLoginInfo(); - CPythonNetworkStream& rkNetStream=CPythonNetworkStream::Instance(); - rkNetStream.ClearLoginInfo(); - - m_strPassword = ""; - - for (DWORD i = 0; i < 4; ++i) - LoginPacket.adwClientKey[i] = g_adwEncryptKey[i]; - - if (!Send(sizeof(LoginPacket), &LoginPacket)) - { - Tracen(" CAccountConnector::__AuthState_RecvPhase - SendLogin3 Error"); - return false; - } - - if (!SendSequence()) - { - return false; - } - } -#else /* USE_OPENID */ - TPacketCGLogin3 LoginPacket; LoginPacket.header = HEADER_CG_LOGIN3; @@ -287,7 +216,7 @@ bool CAccountConnector::__AuthState_RecvPhase() LoginPacket.name[ID_MAX_NUM] = '\0'; LoginPacket.pwd[PASS_MAX_NUM] = '\0'; - // ºñ¹Ð¹øÈ£¸¦ ¸Þ¸ð¸®¿¡ °è¼Ó °®°í ÀÖ´Â ¹®Á¦°¡ À־, »ç¿ë Áï½Ã ³¯¸®´Â °ÍÀ¸·Î º¯°æ + // ��й�ȣ�� �޸𸮿� ��� ���� �ִ� ������ �־, ��� ��� ������ ������ ���� ClearLoginInfo(); CPythonNetworkStream& rkNetStream=CPythonNetworkStream::Instance(); rkNetStream.ClearLoginInfo(); @@ -307,7 +236,6 @@ bool CAccountConnector::__AuthState_RecvPhase() { return false; } -#endif /* USE_OPENID */ __AuthState_Set(); } @@ -437,37 +365,6 @@ bool CAccountConnector::__AuthState_RecvAuthSuccess() return true; } -#ifdef USE_OPENID -bool CAccountConnector::__AuthState_RecvAuthSuccess_OpenID() -{ - TPacketGCAuthSuccessOpenID kAuthSuccessOpenIDPacket; - if (!Recv(sizeof(kAuthSuccessOpenIDPacket), &kAuthSuccessOpenIDPacket)) - return false; - - if (!kAuthSuccessOpenIDPacket.bResult) - { - if (m_poHandler) - PyCallClassMemberFunc(m_poHandler, "OnLoginFailure", Py_BuildValue("(s)", "BESAMEKEY")); - } - else - { - DWORD dwPanamaKey = kAuthSuccessOpenIDPacket.dwLoginKey ^ g_adwEncryptKey[0] ^ g_adwEncryptKey[1] ^ g_adwEncryptKey[2] ^ g_adwEncryptKey[3]; - CEterPackManager::instance().DecryptPackIV(dwPanamaKey); - - CPythonNetworkStream & rkNet = CPythonNetworkStream::Instance(); - rkNet.SetLoginInfo(kAuthSuccessOpenIDPacket.login, "0000"); //OpenID ÀÎÁõ °úÁ¤¿¡¼­ ºñ¹Ð¹øÈ£´Â »ç¿ëµÇÁö ¾Ê´Â´Ù. - rkNet.SetLoginKey(kAuthSuccessOpenIDPacket.dwLoginKey); - rkNet.Connect(m_strAddr.c_str(), m_iPort); - } - - Disconnect(); - __OfflineState_Set(); - - return true; -} -#endif /* USE_OPENID */ - - bool CAccountConnector::__AuthState_RecvAuthFailure() { TPacketGCLoginFailure packet_failure; @@ -593,7 +490,7 @@ void CAccountConnector::OnConnectSuccess() void CAccountConnector::OnRemoteDisconnect() { - // Matrix Card Number ¸¦ º¸³» ³õ¾Ò´Âµ¥ close µÇ¸é ÇÁ·Î±×·¥À» Á¾·á ÇÑ´Ù. + // Matrix Card Number �� ���� ���Ҵµ� close �Ǹ� ���α׷��� ���� �Ѵ�. if (m_isWaitKey) { if (m_poHandler) diff --git a/src/UserInterface/AccountConnector.h b/src/UserInterface/AccountConnector.h index 89337226..19f303fd 100644 --- a/src/UserInterface/AccountConnector.h +++ b/src/UserInterface/AccountConnector.h @@ -52,9 +52,6 @@ class CAccountConnector : public CNetworkStream, public CSingletonstdafx.h ·Î/ + //POINT_MAX_NUM = 255,=>stdafx.h ��/ }; typedef struct packet_points @@ -1684,8 +1672,8 @@ typedef struct packet_point_change DWORD dwVID; BYTE Type; - long amount; // ¹Ù²ï °ª - long value; // ÇöÀç °ª + long amount; // �ٲ� �� + long value; // ���� �� } TPacketGCPointChange; typedef struct packet_motion @@ -1723,7 +1711,7 @@ typedef struct packet_set_item BYTE pos; DWORD vnum; BYTE count; - DWORD flags; // Ç÷¡±× Ãß°¡ + DWORD flags; // �÷��� �߰� long alSockets[ITEM_SOCKET_SLOT_MAX_NUM]; TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_SLOT_MAX_NUM]; } TPacketGCItemSet; @@ -1750,8 +1738,8 @@ typedef struct packet_set_item2 TItemPos Cell; DWORD vnum; BYTE count; - DWORD flags; // Ç÷¡±× Ãß°¡ - DWORD anti_flags; // Ç÷¡±× Ãß°¡ + DWORD flags; // �÷��� �߰� + DWORD anti_flags; // �÷��� �߰� bool highlight; long alSockets[ITEM_SOCKET_SLOT_MAX_NUM]; TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_SLOT_MAX_NUM]; @@ -1832,7 +1820,7 @@ typedef struct packet_shop_start struct packet_shop_item items[SHOP_HOST_ITEM_MAX_NUM]; } TPacketGCShopStart; -typedef struct packet_shop_start_ex // ´ÙÀ½¿¡ TSubPacketShopTab* shop_tabs ÀÌ µû¶ó¿È. +typedef struct packet_shop_start_ex // ������ TSubPacketShopTab* shop_tabs �� �����. { typedef struct sub_packet_shop_tab { @@ -1975,12 +1963,12 @@ typedef struct packet_move enum { QUEST_SEND_IS_BEGIN = 1 << 0, - QUEST_SEND_TITLE = 1 << 1, // 28ÀÚ ±îÁö - QUEST_SEND_CLOCK_NAME = 1 << 2, // 16ÀÚ ±îÁö + QUEST_SEND_TITLE = 1 << 1, // 28�� ���� + QUEST_SEND_CLOCK_NAME = 1 << 2, // 16�� ���� QUEST_SEND_CLOCK_VALUE = 1 << 3, - QUEST_SEND_COUNTER_NAME = 1 << 4, // 16ÀÚ ±îÁö + QUEST_SEND_COUNTER_NAME = 1 << 4, // 16�� ���� QUEST_SEND_COUNTER_VALUE = 1 << 5, - QUEST_SEND_ICON_FILE = 1 << 6, // 24ÀÚ ±îÁö + QUEST_SEND_ICON_FILE = 1 << 6, // 24�� ���� }; typedef struct packet_quest_info @@ -2003,8 +1991,8 @@ typedef struct packet_attack { BYTE header; DWORD dwVID; - DWORD dwVictimVID; // Àû VID - BYTE bType; // °ø°Ý À¯Çü + DWORD dwVictimVID; // �� VID + BYTE bType; // ���� ���� } TPacketGCAttack; typedef struct packet_c2c @@ -2074,7 +2062,7 @@ enum EPVPModes typedef struct packet_duel_start { BYTE header ; - WORD wSize ; // DWORD°¡ ¸î°³? °³¼ö = (wSize - sizeof(TPacketGCPVPList)) / 4 + WORD wSize ; // DWORD�� �? ���� = (wSize - sizeof(TPacketGCPVPList)) / 4 } TPacketGCDuelStart ; typedef struct packet_pvp @@ -2230,7 +2218,7 @@ enum typedef struct packet_guild_sub_grade { - char grade_name[GUILD_GRADE_NAME_MAX_LEN+1]; // 8+1 ±æµåÀå, ±æµå¿ø µîÀÇ À̸§ + char grade_name[GUILD_GRADE_NAME_MAX_LEN+1]; // 8+1 �����, ���� ���� �̸� BYTE auth_flag; } TPacketGCGuildSubGrade; @@ -2271,7 +2259,7 @@ enum EGuildWarState GUILD_WAR_ON_WAR, GUILD_WAR_END, - GUILD_WAR_DURATION = 2*60*60, // 2½Ã°£ + GUILD_WAR_DURATION = 2*60*60, // 2�ð� }; typedef struct packet_guild_war @@ -2347,8 +2335,8 @@ typedef struct SRefineTable DWORD src_vnum; DWORD result_vnum; BYTE material_count; - int cost; // ¼Ò¿ä ºñ¿ë - int prob; // È®·ü + int cost; // �ҿ� ��� + int prob; // Ȯ�� TMaterial materials[REFINE_MATERIAL_MAX_NUM]; } TRefineTable; @@ -2383,17 +2371,17 @@ enum SPECIAL_EFFECT SE_SUCCESS, SE_FAIL, SE_FR_SUCCESS, - SE_LEVELUP_ON_14_FOR_GERMANY, //·¹º§¾÷ 14À϶§ ( µ¶ÀÏÀü¿ë ) - SE_LEVELUP_UNDER_15_FOR_GERMANY,//·¹º§¾÷ 15À϶§ ( µ¶ÀÏÀü¿ë ) + SE_LEVELUP_ON_14_FOR_GERMANY, //������ 14�϶� ( �������� ) + SE_LEVELUP_UNDER_15_FOR_GERMANY,//������ 15�϶� ( �������� ) SE_PERCENT_DAMAGE1, SE_PERCENT_DAMAGE2, SE_PERCENT_DAMAGE3, SE_AUTO_HPUP, SE_AUTO_SPUP, - SE_EQUIP_RAMADAN_RING, // Ãʽ´ÞÀÇ ¹ÝÁö¸¦ Âø¿ëÇÏ´Â ¼ø°£¿¡ ¹ßµ¿ÇÏ´Â ÀÌÆåÆ® - SE_EQUIP_HALLOWEEN_CANDY, // ÇÒ·ÎÀ© »çÅÁÀ» Âø¿ë(-_-;)ÇÑ ¼ø°£¿¡ ¹ßµ¿ÇÏ´Â ÀÌÆåÆ® - SE_EQUIP_HAPPINESS_RING, // Å©¸®½º¸¶½º ÇູÀÇ ¹ÝÁö¸¦ Âø¿ëÇÏ´Â ¼ø°£¿¡ ¹ßµ¿ÇÏ´Â ÀÌÆåÆ® - SE_EQUIP_LOVE_PENDANT, // ¹ß·»Å¸ÀÎ »ç¶ûÀÇ ÆÒ´øÆ®(71145) Âø¿ëÇÒ ¶§ ÀÌÆåÆ® (¹ßµ¿ÀÌÆåÆ®ÀÓ, Áö¼ÓÀÌÆåÆ® ¾Æ´Ô) + SE_EQUIP_RAMADAN_RING, // �ʽ´��� ������ �����ϴ� ������ �ߵ��ϴ� ����Ʈ + SE_EQUIP_HALLOWEEN_CANDY, // �ҷ��� ������ ����(-_-;)�� ������ �ߵ��ϴ� ����Ʈ + SE_EQUIP_HAPPINESS_RING, // ũ�������� �ູ�� ������ �����ϴ� ������ �ߵ��ϴ� ����Ʈ + SE_EQUIP_LOVE_PENDANT, // �߷�Ÿ�� ����� �Ҵ�Ʈ(71145) ������ �� ����Ʈ (�ߵ�����Ʈ��, ��������Ʈ �ƴ�) }; typedef struct SPacketGCSpecialEffect @@ -2472,14 +2460,6 @@ typedef struct packet_auth_success BYTE bResult; } TPacketGCAuthSuccess; -typedef struct packet_auth_success_openid -{ - BYTE bHeader; - DWORD dwLoginKey; - BYTE bResult; - char login[ID_MAX_NUM + 1]; -} TPacketGCAuthSuccessOpenID; - typedef struct packet_channel { BYTE header; @@ -2696,7 +2676,7 @@ typedef struct packet_hs_check_req AHNHS_TRANS_BUFFER Req; } TPacketHSCheck; -//NOTE : recv/send¿¡ °øÅëÀ¸·Î »ý±è, bPacketDataÀÇ ³»¿ë¸¸ ¹Ù²ï´Ù. +//NOTE : recv/send�� �������� ����, bPacketData�� ���븸 �ٲ��. typedef struct packet_xtrap_verify { BYTE bHeader; @@ -2714,7 +2694,7 @@ typedef struct packet_autoban_quiz // END_OF_AUTOBAN #ifdef __AUCTION__ -// ArgumentÀÇ ¿ëµµ´Â cmd¿¡ µû¶ó ´Ù¸£´Ù. +// Argument�� �뵵�� cmd�� ���� �ٸ���. typedef struct SPacketCGAuctionCmd { BYTE bHeader; @@ -2740,7 +2720,7 @@ typedef struct SPacketGCSpecificEffect char effect_file[128]; } TPacketGCSpecificEffect; -// ¿ëÈ¥¼® +// ��ȥ�� enum EDragonSoulRefineWindowRefineType { DragonSoulRefineWindow_UPGRADE, diff --git a/src/UserInterface/PythonApplicationModule.cpp b/src/UserInterface/PythonApplicationModule.cpp index a5e0645c..17d47dd9 100644 --- a/src/UserInterface/PythonApplicationModule.cpp +++ b/src/UserInterface/PythonApplicationModule.cpp @@ -9,10 +9,6 @@ extern BOOL bVisibleNotice = true; extern BOOL bTestServerFlag = FALSE; extern int TWOHANDED_WEWAPON_ATT_SPEED_DECREASE_VALUE = 0; -#ifdef USE_OPENID -extern int openid_test; -#endif - PyObject* appShowWebPage(PyObject* poSelf, PyObject* poArgs) { char* szWebPage; @@ -1356,7 +1352,7 @@ void initapp() PyModule_AddIntConstant(poModule, "VK_DELETE", VK_DELETE); PyModule_AddIntConstant(poModule, "DIK_ESCAPE", DIK_ESCAPE); - PyModule_AddIntConstant(poModule, "DIK_ESC", DIK_ESCAPE); // ÆíÀǸ¦ À§ÇØ + PyModule_AddIntConstant(poModule, "DIK_ESC", DIK_ESCAPE); // ���Ǹ� ���� PyModule_AddIntConstant(poModule, "DIK_1", DIK_1); PyModule_AddIntConstant(poModule, "DIK_2", DIK_2); PyModule_AddIntConstant(poModule, "DIK_3", DIK_3); @@ -1516,15 +1512,4 @@ void initapp() #else PyModule_AddIntConstant(poModule, "ENABLE_NEW_EQUIPMENT_SYSTEM", 0); #endif - -#ifdef USE_OPENID - PyModule_AddIntConstant(poModule, "USE_OPENID", 1); - if (openid_test) - PyModule_AddIntConstant(poModule, "OPENID_TEST", 1); - else - PyModule_AddIntConstant(poModule, "OPENID_TEST", 0); -#else - PyModule_AddIntConstant(poModule, "USE_OPENID", 0); - PyModule_AddIntConstant(poModule, "OPENID_TEST", 0); -#endif /* USE_OPENID */ } diff --git a/src/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp index ebaececa..8938dff3 100644 --- a/src/UserInterface/PythonNetworkStream.cpp +++ b/src/UserInterface/PythonNetworkStream.cpp @@ -150,7 +150,6 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap 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_OPENID, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCAuthSuccessOpenID), STATIC_SIZE_PACKET)); Set(HEADER_GC_CHANNEL, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCChannel), STATIC_SIZE_PACKET)); Set(HEADER_GC_VIEW_EQUIP, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCViewEquip), STATIC_SIZE_PACKET)); Set(HEADER_GC_LAND_LIST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCLandList), DYNAMIC_SIZE_PACKET)); @@ -239,7 +238,7 @@ void CPythonNetworkStream::AbsoluteExitApplication() bool CPythonNetworkStream::__IsNotPing() { - // ¿ø·¡´Â ÇÎÀÌ ¾È¿Ã¶§ üũÀ̳ª ¼­¹ö¶û Á¤È®È÷ ¸ÂÃß¾î¾ß ÇÑ´Ù. + // ������ ���� �ȿö� üũ�̳� ������ ��Ȯ�� ���߾�� �Ѵ�. return false; } @@ -251,7 +250,7 @@ DWORD CPythonNetworkStream::GetGuildID() UINT CPythonNetworkStream::UploadMark(const char * c_szImageFileName) { // MARK_BUG_FIX - // ±æµå¸¦ ¸¸µç Á÷ÈÄ´Â ±æµå ¾ÆÀ̵𰡠0ÀÌ´Ù. + // ��带 ���� ���Ĵ� ��� ���̵� 0�̴�. if (0 == m_dwGuildID) return ERROR_MARK_UPLOAD_NEED_RECONNECT; @@ -321,13 +320,13 @@ UINT CPythonNetworkStream::UploadSymbol(const char* c_szImageFileName) void CPythonNetworkStream::__DownloadMark() { - // 3ºÐ ¾È¿¡´Â ´Ù½Ã Á¢¼ÓÇÏÁö ¾Ê´Â´Ù. + // 3�� �ȿ��� �ٽ� �������� �ʴ´�. DWORD curTime = ELTimer_GetMSec(); if (curTime < gs_nextDownloadMarkTime) return; - gs_nextDownloadMarkTime = curTime + 60000 * 3; // 3ºÐ + gs_nextDownloadMarkTime = curTime + 60000 * 3; // 3�� CGuildMarkDownloader& rkGuildMarkDownloader = CGuildMarkDownloader::Instance(); rkGuildMarkDownloader.Connect(m_kMarkAuth.m_kNetAddr, m_kMarkAuth.m_dwHandle, m_kMarkAuth.m_dwRandomKey); @@ -593,19 +592,19 @@ bool CPythonNetworkStream::RecvPhasePacket() switch (packet_phase.phase) { - case PHASE_CLOSE: // ²÷±â´Â »óÅ (¶Ç´Â ²÷±â Àü »óÅÂ) + case PHASE_CLOSE: // ����� ���� (�Ǵ� ���� �� ����) ClosePhase(); break; - case PHASE_HANDSHAKE: // ¾Ç¼ö..;; + case PHASE_HANDSHAKE: // �Ǽ�..;; SetHandShakePhase(); break; - case PHASE_LOGIN: // ·Î±×ÀÎ Áß + case PHASE_LOGIN: // ��� �� SetLoginPhase(); break; - case PHASE_SELECT: // ij¸¯ÅÍ ¼±Åà ȭ¸é + case PHASE_SELECT: // ij���� ���� ȭ�� SetSelectPhase(); BuildProcessCRC(); @@ -615,15 +614,15 @@ bool CPythonNetworkStream::RecvPhasePacket() // END_OF_MARK_BUG_FIX break; - case PHASE_LOADING: // ¼±Åà ÈÄ ·Îµù È­¸é + case PHASE_LOADING: // ���� �� �ε� ȭ�� SetLoadingPhase(); break; - case PHASE_GAME: // °ÔÀÓ È­¸é + case PHASE_GAME: // ���� ȭ�� SetGamePhase(); break; - case PHASE_DEAD: // Á×¾úÀ» ¶§.. (°ÔÀÓ ¾È¿¡ ÀÖ´Â °ÍÀÏ ¼öµµ..) + case PHASE_DEAD: // �׾��� ��.. (���� �ȿ� �ִ� ���� ����..) break; } @@ -655,7 +654,7 @@ bool CPythonNetworkStream::RecvDefaultPacket(int header) if (!header) return true; - TraceError("󸮵ÇÁö ¾ÊÀº ÆÐŶ Çì´õ %d, state %s\n", header, m_strPhase.c_str()); + TraceError("���� ���� ��Ŷ ��� %d, state %s\n", header, m_strPhase.c_str()); ClearRecvBuffer(); return true; } diff --git a/src/UserInterface/UserInterface.cpp b/src/UserInterface/UserInterface.cpp index 122f191c..63363ba8 100644 --- a/src/UserInterface/UserInterface.cpp +++ b/src/UserInterface/UserInterface.cpp @@ -42,10 +42,6 @@ bool __IS_TEST_SERVER_MODE__=false; extern bool SetDefaultCodePage(DWORD codePage); -#ifdef USE_OPENID -extern int openid_test; -#endif - static const char* sc_apszPythonLibraryFilenames[] = { @@ -239,20 +235,20 @@ bool PackInitialize(const char * c_pszFolder) } #ifdef _DISTRIBUTE - Tracef("¾Ë¸²: ÆÑ ¸ðµåÀÔ´Ï´Ù.\n"); + Tracef("�˸�: �� ����Դϴ�.\n"); //if (0 == strPackType.compare("FILE")) //{ // bPackFirst = FALSE; - // Tracef("¾Ë¸²: ÆÄÀÏ ¸ðµåÀÔ´Ï´Ù.\n"); + // Tracef("�˸�: ���� ����Դϴ�.\n"); //} //else //{ - // Tracef("¾Ë¸²: ÆÑ ¸ðµåÀÔ´Ï´Ù.\n"); + // Tracef("�˸�: �� ����Դϴ�.\n"); //} #else bPackFirst = FALSE; - Tracef("¾Ë¸²: ÆÄÀÏ ¸ðµåÀÔ´Ï´Ù.\n"); + Tracef("�˸�: ���� ����Դϴ�.\n"); #endif CTextFileLoader::SetCacheMode(); @@ -262,7 +258,7 @@ bool PackInitialize(const char * c_pszFolder) CEterPackManager::Instance().SetCacheMode(); CEterPackManager::Instance().SetSearchMode(bPackFirst); - CSoundData::SetPackMode(); // Miles ÆÄÀÏ ÄݹéÀ» ¼ÂÆà + CSoundData::SetPackMode(); // Miles ���� �ݹ��� ���� std::string strPackName, strTexCachePackName; for (DWORD i = 1; i < TextLoader.GetLineCount() - 1; i += 2) @@ -353,7 +349,7 @@ bool RunMainScript(CPythonLauncher& pyLauncher, const char* lpCmdLine) SplitLine(lpCmdLine,seperator,&stVec); if (CmdSize == stVec.size() && stVec[0]==loginMark) { - char buf[MAX_PATH]; //TODO ¾Æ·¡ ÇÔ¼ö string ÇüÅ·Π¼öÁ¤ + char buf[MAX_PATH]; //TODO �Ʒ� �Լ� string ���·� ���� base64_decode(stVec[2].c_str(),buf); stVec[2] = buf; string_join(seperator,stVec,&stCmdLine); @@ -462,12 +458,12 @@ bool Main(HINSTANCE hInstance, LPSTR lpCmdLine) if (pyLauncher.Create()) { - ret=RunMainScript(pyLauncher, lpCmdLine); //°ÔÀÓ ½ÇÇàÁß¿£ ÇÔ¼ö°¡ ³¡³ªÁö ¾Ê´Â´Ù. + ret=RunMainScript(pyLauncher, lpCmdLine); //���� �����߿� �Լ��� ������ �ʴ´�. } //ProcessScanner_ReleaseQuitEvent(); - //°ÔÀÓ Á¾·á½Ã. + //���� �����. app->Clear(); timeEndPeriod(1); @@ -537,20 +533,6 @@ bool __IsLocaleVersion(LPSTR lpCmdLine) return (strcmp(lpCmdLine, "--perforce-revision") == 0); } -#ifdef USE_OPENID -//2012.07.16 ±è¿ë¿í -//ÀϺ» OpenID Áö¿ø. ÀÎÁõÅ° ÀÎÀÚ Ãß°¡ -bool __IsOpenIDAuthKeyOption(LPSTR lpCmdLine) -{ - return (strcmp(lpCmdLine, "--openid-authkey") == 0); -} - -bool __IsOpenIDTestOption(LPSTR lpCmdLine) //Ŭ¶óÀ̾ðÆ®¿¡¼­ ·Î±×ÀÎÀÌ °¡´ÉÇÏ´Ù. -{ - return (strcmp(lpCmdLine, "--openid-test") == 0); -} -#endif /* USE_OPENID */ - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { if (strstr(lpCmdLine, "--hackshield") != 0) @@ -567,14 +549,13 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi SetDefaultCodePage(LocaleService_GetCodePage()); bool bQuit = false; - bool bAuthKeyChecked = false; //OpenID ¹öÀü¿¡¼­ ÀÎÁõÅ°°¡ µé¾î¿Ô´ÂÁö ¾Ë±â À§ÇÑ ÀÎÀÚ. int nArgc = 0; PCHAR* szArgv = CommandLineToArgv( lpCmdLine, &nArgc ); for( int i=0; i < nArgc; i++ ) { if(szArgv[i] == 0) continue; - if (__IsLocaleVersion(szArgv[i])) // #0000829: [M2EU] ¹öÀü ÆÄÀÏÀÌ Ç×»ó »ý±âÁö ¾Êµµ·Ï ¼öÁ¤ + if (__IsLocaleVersion(szArgv[i])) // #0000829: [M2EU] ���� ������ �׻� ������ �ʵ��� ���� { char szModuleName[MAX_PATH]; char szVersionPath[MAX_PATH]; @@ -601,7 +582,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi bQuit = true; } else if ((strcmp(szArgv[i], "--force-set-locale") == 0)) { - // locale ¼³Á¤¿£ ÀÎÀÚ°¡ µÎ °³ ´õ ÇÊ¿äÇÔ (·ÎÄÉÀÏ ¸íĪ, µ¥ÀÌÅÍ °æ·Î) + // locale ������ ���ڰ� �� �� �� �ʿ��� (������ ��Ī, ������ ���) if (nArgc <= i + 2) { MessageBox(NULL, "Invalid arguments", ApplicationStringTable_GetStringz(IDS_APP_NAME, "APP_NAME"), MB_ICONSTOP); @@ -613,49 +594,13 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi LocaleService_ForceSetLocale(localeName, localePath); } -#ifdef USE_OPENID - else if (__IsOpenIDAuthKeyOption(szArgv[i])) //2012.07.16 OpenID : ±è¿ë¿í - { - // ÀÎÁõÅ° ¼³Á¤¿£ ÀÎÀÚ°¡ ÇÑ °³ ´õ ÇÊ¿äÇÔ (ÀÎÁõÅ°) - if (nArgc <= i + 1) - { - MessageBox(NULL, "Invalid arguments", ApplicationStringTable_GetStringz(IDS_APP_NAME, "APP_NAME"), MB_ICONSTOP); - goto Clean; - } - - const char* authKey = szArgv[++i]; - - //ongoing (2012.07.16) - //ÀÎÁõÅ° ÀúÀåÇÏ´Â ºÎºÐ - LocaleService_SetOpenIDAuthKey(authKey); - - bAuthKeyChecked = true; - } - else if (__IsOpenIDTestOption(szArgv[i])) - { - openid_test = 1; - - } -#endif /* USE_OPENID */ } -#ifdef USE_OPENID - //OpenID - //OpenID Ŭ¶óÀ̾ðÆ®ÀÇ °æ¿ìÀÎÁõÅ°¸¦ ¹Þ¾Æ¿ÀÁö ¾ÊÀ» °æ¿ì (À¥À» Á¦¿ÜÇÏ°í ½ÇÇà ½Ã) Ŭ¶óÀ̾ðÆ® Á¾·á. - - if (false == bAuthKeyChecked && !openid_test) - { - MessageBox(NULL, "Invalid execution", ApplicationStringTable_GetStringz(IDS_APP_NAME, "APP_NAME"), MB_ICONSTOP); - goto Clean; - } -#endif /* USE_OPENID */ - - if(bQuit) goto Clean; #if defined(NEEDED_COMMAND_ARGUMENT) - // ¿É¼ÇÀÌ ¾øÀ¸¸é ºñÁ¤»ó ½ÇÇàÀ¸·Î °£ÁÖ, ÇÁ·Î±×·¥ Á¾·á + // �ɼ��� ������ ������ �������� ����, ���α׷� ���� if (strstr(lpCmdLine, NEEDED_COMMAND_ARGUMENT) == 0) { MessageBox(NULL, ApplicationStringTable_GetStringz(IDS_ERR_MUST_LAUNCH_FROM_PATCHER, "ERR_MUST_LAUNCH_FROM_PATCHER"), ApplicationStringTable_GetStringz(IDS_APP_NAME, "APP_NAME"), MB_ICONSTOP); goto Clean; @@ -713,7 +658,7 @@ static void GrannyError(granny_log_message_type Type, int Setup(LPSTR lpCmdLine) { /* - * ŸÀÌ¸Ó Á¤¹Ðµµ¸¦ ¿Ã¸°´Ù. + * Ÿ�̸� ����� �ø���. */ TIMECAPS tc; UINT wTimerRes; @@ -725,7 +670,7 @@ int Setup(LPSTR lpCmdLine) timeBeginPeriod(wTimerRes); /* - * ±×·¡´Ï ¿¡·¯ Çڵ鸵 + * �׷��� ���� �ڵ鸵 */ granny_log_callback Callback;