Merge branch 'nightly' into comment-encoding

src/common/billing.h

@@ -1,15 +0,0 @@
-#ifndef __INC_METIN_II_COMMON_BILLING_H__
-#define __INC_METIN_II_COMMON_BILLING_H__
-
-enum EBillingTypes
-{
-	BILLING_NONE,
-	BILLING_IP_FREE,
-	BILLING_FREE,
-	BILLING_IP_TIME,
-	BILLING_IP_DAY,
-	BILLING_TIME,
-	BILLING_DAY,
-};
-
-#endif

src/common/item_length.h

@@ -333,6 +333,8 @@ enum ELimitTypes
 	LIMIT_DEX,
 	LIMIT_INT,
 	LIMIT_CON,
+
+	// TODO: Remove this and re-check the validity of item_proto afterwards
 	LIMIT_PCBANG,
 
 	/// 착용 여부와 상관 없이 실시간으로 시간 차감 (socket0에 소멸 시간이 박힘: unix_timestamp 타입)

src/common/length.h

@@ -16,8 +16,6 @@ enum EMisc
 	ABILITY_MAX_NUM			= 50,
 	EMPIRE_MAX_NUM			= 4,
 	BANWORD_MAX_LEN			= 24,
-	SMS_MAX_LEN				= 80,
-	MOBILE_MAX_LEN			= 32,
 	SOCIAL_ID_MAX_LEN		= 18,
     MAP_ALLOW_MAX_LEN       = 128,
 

src/common/tables.h

@@ -49,7 +49,6 @@ enum
 	HEADER_GD_ADD_AFFECT		= 32,
 	HEADER_GD_REMOVE_AFFECT		= 33,
 
-	HEADER_GD_HIGHSCORE_REGISTER	= 34,
 	HEADER_GD_ITEM_FLUSH		= 35,
 
 	HEADER_GD_PARTY_CREATE		= 36,
@@ -63,7 +62,6 @@ enum
 	HEADER_GD_RELOAD_PROTO		= 43,
 
 	HEADER_GD_CHANGE_NAME		= 44,
-	HEADER_GD_SMS				= 45,
 
 	HEADER_GD_GUILD_CHANGE_LADDER_POINT	= 46,
 	HEADER_GD_GUILD_USE_SKILL		= 47,
@@ -99,9 +97,6 @@ enum
 
 	HEADER_GD_AUTH_LOGIN		= 100,
 	HEADER_GD_LOGIN_BY_KEY		= 101,
-	HEADER_GD_BILLING_EXPIRE	= 104,
-	HEADER_GD_VCARD				= 105,
-	HEADER_GD_BILLING_CHECK		= 106,
 	HEADER_GD_MALL_LOAD			= 107,
 
 	HEADER_GD_MYSHOP_PRICELIST_UPDATE	= 108,		///< 가격정보 갱신 요청
@@ -109,12 +104,6 @@ enum
 
 	HEADER_GD_BLOCK_CHAT				= 110,
 
-	// PCBANG_IP_LIST_BY_AUTH
-	HEADER_GD_PCBANG_REQUEST_IP_LIST	= 111,
-	HEADER_GD_PCBANG_CLEAR_IP_LIST		= 112,
-	HEADER_GD_PCBANG_INSERT_IP			= 113,
-	// END_OF_PCBANG_IP_LIST_BY_AUTH
-
 	HEADER_GD_HAMMER_OF_TOR			= 114,
 	HEADER_GD_RELOAD_ADMIN			= 115,			///<운영자 정보 요청
 	HEADER_GD_BREAK_MARRIAGE		= 116,			///< 결혼 파기
@@ -129,8 +118,6 @@ enum
 	HEADER_GD_DEC_MONARCH_MONEY = 125,
 
 	HEADER_GD_CHANGE_MONARCH_LORD = 126,
-	HEADER_GD_BLOCK_COUNTRY_IP		= 127,		// 광대역 IP-Block
-	HEADER_GD_BLOCK_EXCEPTION		= 128,		// 광대역 IP-Block 예외
 
 	HEADER_GD_REQ_CHANGE_GUILD_MASTER	= 129,
 
@@ -238,12 +225,6 @@ enum
 
 	HEADER_DG_CHANGE_CHARACTER_PRIV	= 127,
 
-	HEADER_DG_BILLING_REPAIR		= 128,
-	HEADER_DG_BILLING_EXPIRE		= 129,
-	HEADER_DG_BILLING_LOGIN		= 130,
-	HEADER_DG_VCARD			= 131,
-	HEADER_DG_BILLING_CHECK		= 132,
-
 	HEADER_DG_CREATE_OBJECT		= 140,
 	HEADER_DG_DELETE_OBJECT		= 141,
 	HEADER_DG_UPDATE_LAND		= 142,
@@ -272,8 +253,6 @@ enum
 
 	HEADER_DG_CHANGE_MONARCH_LORD_ACK = 169,
 	HEADER_DG_UPDATE_MONARCH_INFO	= 170,
-	HEADER_DG_BLOCK_COUNTRY_IP		= 171,		// 광대역 IP-Block
-	HEADER_DG_BLOCK_EXCEPTION		= 172,		// 광대역 IP-Block 예외 account
 
 	HEADER_DG_ACK_CHANGE_GUILD_MASTER = 173,
 
@@ -441,7 +420,6 @@ typedef struct SPlayerTable
 
 	BYTE	skill_group;
 	LONG	lAlignment;
-	char	szMobile[MOBILE_MAX_LEN + 1];
 
 	WORD	stat_reset_count;
 
@@ -851,14 +829,6 @@ typedef struct SPacketGDRemoveAffect
 	BYTE	bApplyOn;
 } TPacketGDRemoveAffect;
 
-typedef struct SPacketGDHighscore
-{
-	DWORD	dwPID;
-	LONG	lValue;
-	char	cDir;
-	char	szBoard[21];
-} TPacketGDHighscore;
-
 typedef struct SPacketPartyCreate
 {
 	DWORD	dwLeaderPID;
@@ -997,14 +967,6 @@ typedef struct SPacketGuildLadderPoint
 	LONG lChange;
 } TPacketGuildLadderPoint;
 
-typedef struct SPacketGDSMS
-{
-	char szFrom[CHARACTER_NAME_MAX_LEN + 1];
-	char szTo[CHARACTER_NAME_MAX_LEN + 1];
-	char szMobile[MOBILE_MAX_LEN + 1];
-	char szMsg[SMS_MAX_LEN + 1];
-} TPacketGDSMS;
-
 typedef struct SPacketGuildUseSkill
 {
 	DWORD dwGuild;
@@ -1032,9 +994,7 @@ typedef struct SPacketGDAuthLogin
 	char	szLogin[LOGIN_MAX_LEN + 1];
 	char	szSocialID[SOCIAL_ID_MAX_LEN + 1];
 	DWORD	adwClientKey[4];
-	BYTE	bBillType;
-	DWORD	dwBillID;
-	DWORD		iPremiumTimes[PREMIUM_MAX_NUM];
+	DWORD	iPremiumTimes[PREMIUM_MAX_NUM];
 } TPacketGDAuthLogin;
 
 typedef struct SPacketGDLoginByKey
@@ -1146,26 +1106,6 @@ typedef struct SPacketSetEventFlag
 	LONG	lValue;
 } TPacketSetEventFlag;
 
-typedef struct SPacketBillingLogin
-{
-	DWORD	dwLoginKey;
-	BYTE	bLogin;
-} TPacketBillingLogin;
-
-typedef struct SPacketBillingRepair
-{
-	DWORD	dwLoginKey;
-	char	szLogin[LOGIN_MAX_LEN + 1];
-	char	szHost[MAX_HOST_LENGTH + 1];
-} TPacketBillingRepair;
-
-typedef struct SPacketBillingExpire
-{
-	char	szLogin[LOGIN_MAX_LEN + 1];
-	BYTE	bBillType;
-	DWORD	dwRemainSeconds;
-} TPacketBillingExpire;
-
 typedef struct SPacketLoginOnSetup
 {
 	DWORD   dwID;
@@ -1193,15 +1133,6 @@ typedef struct SPacketGDHammerOfTor
 	DWORD	delay;
 } TPacketGDHammerOfTor;
 
-typedef struct SPacketGDVCard
-{
-	DWORD	dwID;
-	char	szSellCharacter[CHARACTER_NAME_MAX_LEN + 1];
-	char	szSellAccount[LOGIN_MAX_LEN + 1];
-	char	szBuyCharacter[CHARACTER_NAME_MAX_LEN + 1];
-	char	szBuyAccount[LOGIN_MAX_LEN + 1];
-} TPacketGDVCard;
-
 typedef struct SGuildReserve
 {
 	DWORD       dwID;
@@ -1306,15 +1237,6 @@ typedef struct
 	LONG lDuration;
 } TPacketBlockChat;
 
-// PCBANG_IP_LIST
-typedef struct SPacketPCBangIP
-{
-	DWORD id;
-	DWORD ip;
-} TPacketPCBangIP;
-// END_OF_PCBANG_IP_LIST
-
-
 //ADMIN_MANAGER
 typedef struct TAdminInfo
 {
@@ -1379,26 +1301,6 @@ typedef struct tChangeMonarchLordACK
 	char szDate[32];
 } TPacketChangeMonarchLordACK;
 
-// Block Country Ip
-typedef struct tBlockCountryIp
-{
-	DWORD	ip_from;
-	DWORD	ip_to;
-} TPacketBlockCountryIp;
-
-enum EBlockExceptionCommand
-{
-	BLOCK_EXCEPTION_CMD_ADD = 1,
-	BLOCK_EXCEPTION_CMD_DEL = 2,
-};
-
-// Block Exception Account
-typedef struct tBlockException
-{
-	BYTE	cmd;	// 1 == add, 2 == delete
-	char	login[LOGIN_MAX_LEN + 1];
-}TPacketBlockException;
-
 typedef struct tChangeGuildMaster
 {
 	DWORD dwGuildID;