From dff6e8c23bbdbce55c1227f3a45dcdab0aa77ad4 Mon Sep 17 00:00:00 2001 From: CPunch Date: Thu, 20 Aug 2020 10:44:49 -0500 Subject: [PATCH] better structs header --- src/structs/0104.hpp | 3239 +----------------------------------------- 1 file changed, 2 insertions(+), 3237 deletions(-) diff --git a/src/structs/0104.hpp b/src/structs/0104.hpp index e5aca9a..4fcc151 100644 --- a/src/structs/0104.hpp +++ b/src/structs/0104.hpp @@ -1,6 +1,7 @@ /* genstructs.py */ #pragma pack(push) + #pragma pack(4) struct sPCStyle { int64_t iPC_UID; @@ -17,18 +18,14 @@ struct sPCStyle { int8_t iBody; int32_t iClass; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sPCStyle2 { int8_t iAppearanceFlag; int8_t iTutorialFlag; int8_t iPayzoneFlag; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sRunningQuest { int32_t m_aCurrTaskID; @@ -37,9 +34,7 @@ struct sRunningQuest { int m_aNeededItemID[3]; int m_aNeededItemCount[3]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sOnItem { int16_t iEquipHandID; @@ -50,12 +45,7 @@ struct sOnItem { int16_t iEquipFaceID; int16_t iEquipBackID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(2) struct sOnItem_Index { int16_t iEquipUBID_index; @@ -64,9 +54,7 @@ struct sOnItem_Index { int16_t iFaceStyle; int16_t iHairStyle; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sItemBase { int16_t iType; @@ -74,12 +62,7 @@ struct sItemBase { int32_t iOpt; int32_t iTimeLimit; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sItemTrade { int16_t iType; @@ -88,12 +71,7 @@ struct sItemTrade { int32_t iInvenNum; int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sItemVendor { int32_t iVendorID; @@ -101,54 +79,32 @@ struct sItemVendor { sItemBase item; int32_t iSortNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sItemReward { sItemBase sItem; int32_t eIL; int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sTimeLimitItemDeleteInfo2CL { int32_t eIL; int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sNanoTuneNeedItemInfo2CL { int32_t iSlotNum; sItemBase ItemBase; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sEmailItemInfoFromCL { int32_t iSlotNum; sItemBase ItemInven; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sEPRecord { int16_t uiScore; @@ -156,9 +112,7 @@ struct sEPRecord { int8_t uiRing; int16_t uiTime; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sBuddyBaseInfo { int32_t iID; @@ -171,23 +125,13 @@ struct sBuddyBaseInfo { int8_t iGender; int8_t iNameCheckFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sBuddyStyleInfo { sPCStyle sBuddyStyle; sItemBase aEquip[9]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSYSTEMTIME { int32_t wYear; @@ -199,12 +143,7 @@ struct sSYSTEMTIME { int32_t wSecond; int32_t wMilliseconds; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sEmailInfo { int64_t iEmailIndex; @@ -217,29 +156,20 @@ struct sEmailInfo { sSYSTEMTIME DeleteTime; int32_t iItemCandyFlag; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sNano { int16_t iID; int16_t iSkillID; int16_t iStamina; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(2) struct sNanoBank { int16_t iSkillID; int16_t iStamina; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sTimeBuff { uint64_t iTimeLimit; @@ -248,12 +178,7 @@ struct sTimeBuff { int32_t iValue; int32_t iConfirmNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sTimeBuff_Svr { uint64_t iTimeLimit; @@ -263,12 +188,7 @@ struct sTimeBuff_Svr { int32_t iConfirmNum; int16_t iTimeFlow; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPCLoadData2CL { int16_t iUserLevel; @@ -311,12 +231,7 @@ struct sPCLoadData2CL { int64_t iFirstUseFlag2; int aiPCSkill[33]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPCAppearanceData { int32_t iID; @@ -335,12 +250,7 @@ struct sPCAppearanceData { sNano Nano; int32_t eRT; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sNPCAppearanceData { int32_t iNPC_ID; @@ -353,12 +263,7 @@ struct sNPCAppearanceData { int32_t iAngle; int32_t iBarkerType; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sBulletAppearanceData { int32_t iBullet_ID; @@ -367,12 +272,7 @@ struct sBulletAppearanceData { int32_t iZ; int32_t iAngle; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sTransportationLoadData { int32_t iAISvrID; @@ -384,12 +284,7 @@ struct sTransportationLoadData { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sTransportationAppearanceData { int32_t eTT; @@ -399,12 +294,7 @@ struct sTransportationAppearanceData { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sShinyAppearanceData { int32_t iShiny_ID; @@ -414,12 +304,7 @@ struct sShinyAppearanceData { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sAttackResult { int32_t eCT; @@ -429,12 +314,7 @@ struct sAttackResult { int32_t iHP; int8_t iHitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sCAttackResult { int32_t eCT; @@ -450,12 +330,7 @@ struct sCAttackResult { int32_t iConditionBitFlag; int32_t eCSTB___Del; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Damage { int32_t eCT; @@ -464,12 +339,7 @@ struct sSkillResult_Damage { int32_t iDamage; int32_t iHP; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_DotDamage { int32_t eCT; @@ -481,12 +351,7 @@ struct sSkillResult_DotDamage { int32_t bNanoDeactive; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Heal_HP { int32_t eCT; @@ -494,12 +359,7 @@ struct sSkillResult_Heal_HP { int32_t iHealHP; int32_t iHP; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Heal_Stamina { int32_t eCT; @@ -507,12 +367,7 @@ struct sSkillResult_Heal_Stamina { int16_t iHealNanoStamina; sNano Nano; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Stamina_Self { int32_t eCT; @@ -522,12 +377,7 @@ struct sSkillResult_Stamina_Self { int16_t iHealNanoStamina; sNano Nano; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Damage_N_Debuff { int32_t eCT; @@ -539,12 +389,7 @@ struct sSkillResult_Damage_N_Debuff { int32_t bNanoDeactive; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Buff { int32_t eCT; @@ -552,12 +397,7 @@ struct sSkillResult_Buff { int32_t bProtected; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_BatteryDrain { int32_t eCT; @@ -571,12 +411,7 @@ struct sSkillResult_BatteryDrain { int32_t bNanoDeactive; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Damage_N_Move { int32_t eCT; @@ -589,12 +424,7 @@ struct sSkillResult_Damage_N_Move { int32_t iMoveZ; int32_t iBlockMove; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Move { int32_t eCT; @@ -604,70 +434,40 @@ struct sSkillResult_Move { int32_t iMoveY; int32_t iMoveZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sSkillResult_Resurrect { int32_t eCT; int32_t iID; int32_t iRegenHP; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPC_HP { int32_t iPC_ID; int32_t iHP; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPC_BATTERYs { int32_t iPC_ID; int32_t iBatteryW; int32_t iBatteryN; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPC_NanoSlots { int aNanoSlots[3]; int16_t iActiveNanoSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPC_Nano { int32_t iPC_ID; sNano Nano; int16_t iActiveNanoSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPCRegenData { int32_t iHP; @@ -678,12 +478,7 @@ struct sPCRegenData { int16_t iActiveNanoSlotNum; sNano Nanos[3]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPCRegenDataForOtherPC { int32_t iPC_ID; @@ -697,24 +492,14 @@ struct sPCRegenDataForOtherPC { int8_t iSpecialState; sNano Nano; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPCBullet { int32_t eAT; int32_t iID; int32_t bCharged; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sNPCBullet { int32_t eAT; @@ -722,12 +507,7 @@ struct sNPCBullet { int32_t bCharged; int32_t eST; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sNPCLocationData { int32_t iNPC_Type; @@ -737,12 +517,7 @@ struct sNPCLocationData { int32_t iAngle; int32_t iRoute; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sGroupNPCLocationData { int32_t iGroupType; @@ -753,12 +528,7 @@ struct sGroupNPCLocationData { int32_t iRoute; int aGroupNPCIDs[5]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPCGroupMemberInfo { int32_t iPC_ID; @@ -778,12 +548,7 @@ struct sPCGroupMemberInfo { int32_t bNano; sNano Nano; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sNPCGroupMemberInfo { int32_t iNPC_ID; @@ -795,12 +560,7 @@ struct sNPCGroupMemberInfo { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sEPElement { int32_t iLID; @@ -813,51 +573,32 @@ struct sEPElement { int32_t iEnable; int32_t iONOFF; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sCNStreetStall_ItemInfo_for_Client { int32_t iListNum; sItemBase Item; int32_t iPrice; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sQuickSlot { int16_t iType; int16_t iID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_ENTER { char16_t szID[33]; int32_t iTempValue; int64_t iEnterSerialKey; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_EXIT { int32_t iID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_MOVE { uint64_t iCliTime; @@ -871,12 +612,7 @@ struct sP_CL2FE_REQ_PC_MOVE { uint8_t cKeyValue; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_STOP { uint64_t iCliTime; @@ -884,12 +620,7 @@ struct sP_CL2FE_REQ_PC_STOP { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_JUMP { uint64_t iCliTime; @@ -903,56 +634,31 @@ struct sP_CL2FE_REQ_PC_JUMP { uint8_t cKeyValue; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ATTACK_NPCs { int32_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_FREECHAT_MESSAGE { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_REGEN { int32_t iRegenType; int32_t eIL; int32_t iIndex; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_ITEM_MOVE { int32_t eFrom; @@ -960,24 +666,14 @@ struct sP_CL2FE_REQ_ITEM_MOVE { int32_t eTo; int32_t iToSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TASK_START { int32_t iTaskNum; int32_t iNPC_ID; int32_t iEscortNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TASK_END { int32_t iTaskNum; @@ -986,49 +682,30 @@ struct sP_CL2FE_REQ_PC_TASK_END { int8_t iBox2Choice; int32_t iEscortNPC_ID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2FE_REQ_NANO_EQUIP { int16_t iNanoID; int16_t iNanoSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(2) struct sP_CL2FE_REQ_NANO_UNEQUIP { int16_t iNanoSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(2) struct sP_CL2FE_REQ_NANO_ACTIVE { int16_t iNanoSlotNum; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_NANO_TUNE { int16_t iNanoID; int16_t iTuneID; int aiNeedItemSlotNum[10]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_NANO_SKILL_USE { int8_t iBulletID; @@ -1037,64 +714,34 @@ struct sP_CL2FE_REQ_NANO_SKILL_USE { int32_t iArg3; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TASK_STOP { int32_t iTaskNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TASK_CONTINUE { int32_t iTaskNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GOTO { int32_t iToX; int32_t iToY; int32_t iToZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_CHARGE_NANO_STAMINA { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_KILL_QUEST_NPCs { int32_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_VENDOR_ITEM_BUY { int32_t iNPC_ID; @@ -1103,34 +750,19 @@ struct sP_CL2FE_REQ_PC_VENDOR_ITEM_BUY { sItemBase Item; int32_t iInvenSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL { int32_t iInvenSlotNum; int32_t iItemCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ITEM_DELETE { int32_t eIL; int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GIVE_ITEM { int32_t eIL; @@ -1138,22 +770,12 @@ struct sP_CL2FE_REQ_PC_GIVE_ITEM { sItemBase Item; int32_t iTimeLeft; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ROCKET_STYLE_READY { int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ROCKET_STYLE_FIRE { int32_t iSkillID; @@ -1164,12 +786,7 @@ struct sP_CL2FE_REQ_PC_ROCKET_STYLE_FIRE { int32_t iToY; int32_t iToZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ROCKET_STYLE_HIT { int8_t iBulletID; @@ -1178,22 +795,12 @@ struct sP_CL2FE_REQ_PC_ROCKET_STYLE_HIT { int32_t iZ; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GRENADE_STYLE_READY { int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GRENADE_STYLE_FIRE { int32_t iSkillID; @@ -1201,12 +808,7 @@ struct sP_CL2FE_REQ_PC_GRENADE_STYLE_FIRE { int32_t iToY; int32_t iToZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GRENADE_STYLE_HIT { int8_t iBulletID; @@ -1215,71 +817,41 @@ struct sP_CL2FE_REQ_PC_GRENADE_STYLE_HIT { int32_t iZ; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_NANO_CREATE { int16_t iNanoID; int32_t iNeedQuestItemSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_OFFER { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_OFFER_CANCEL { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_OFFER_ACCEPT { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_OFFER_REFUSAL { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_OFFER_ABORT { int32_t iID_Request; @@ -1287,48 +859,28 @@ struct sP_CL2FE_REQ_PC_TRADE_OFFER_ABORT { int32_t iID_To; int16_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_CONFIRM { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_CONFIRM_CANCEL { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_CONFIRM_ABORT { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_ITEM_REGISTER { int32_t iID_Request; @@ -1336,12 +888,7 @@ struct sP_CL2FE_REQ_PC_TRADE_ITEM_REGISTER { int32_t iID_To; sItemTrade Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_ITEM_UNREGISTER { int32_t iID_Request; @@ -1349,12 +896,7 @@ struct sP_CL2FE_REQ_PC_TRADE_ITEM_UNREGISTER { int32_t iID_To; sItemTrade Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_CASH_REGISTER { int32_t iID_Request; @@ -1362,12 +904,7 @@ struct sP_CL2FE_REQ_PC_TRADE_CASH_REGISTER { int32_t iID_To; int32_t iCandy; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRADE_EMOTES_CHAT { int32_t iID_Request; @@ -1377,54 +914,29 @@ struct sP_CL2FE_REQ_PC_TRADE_EMOTES_CHAT { int32_t iEmoteCode; int8_t iFreeChatUse; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_BANK_OPEN { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_BANK_CLOSE { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_VENDOR_START { int32_t iNPC_ID; int32_t iVendorID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_VENDOR_TABLE_UPDATE { int32_t iNPC_ID; int32_t iVendorID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_VENDOR_ITEM_RESTORE_BUY { int32_t iNPC_ID; @@ -1433,55 +945,30 @@ struct sP_CL2FE_REQ_PC_VENDOR_ITEM_RESTORE_BUY { sItemBase Item; int32_t iInvenSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_COMBAT_BEGIN { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_COMBAT_END { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_REQUEST_MAKE_BUDDY { int32_t iBuddyID; int64_t iBuddyPCUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_ACCEPT_MAKE_BUDDY { int8_t iAcceptFlag; int32_t iBuddyID; int64_t iBuddyPCUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE { char16_t szFreeChat[128]; @@ -1489,12 +976,7 @@ struct sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE { char16_t szFreeChat[128]; @@ -1502,52 +984,30 @@ struct sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_GET_BUDDY_STYLE { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SET_BUDDY_BLOCK { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_REMOVE_BUDDY { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_GET_BUDDY_STATE { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_JUMPPAD { uint64_t iCliTime; @@ -1560,12 +1020,7 @@ struct sP_CL2FE_REQ_PC_JUMPPAD { int32_t iAngle; uint8_t cKeyValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_LAUNCHER { uint64_t iCliTime; @@ -1578,12 +1033,7 @@ struct sP_CL2FE_REQ_PC_LAUNCHER { int32_t iAngle; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ZIPLINE { uint64_t iCliTime; @@ -1605,12 +1055,7 @@ struct sP_CL2FE_REQ_PC_ZIPLINE { int32_t iAngle; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_MOVEPLATFORM { uint64_t iCliTime; @@ -1629,12 +1074,7 @@ struct sP_CL2FE_REQ_PC_MOVEPLATFORM { uint8_t cKeyValue; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SLOPE { uint64_t iCliTime; @@ -1649,84 +1089,51 @@ struct sP_CL2FE_REQ_PC_SLOPE { float fVZ; int32_t iSlopeID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_STATE_CHANGE { int32_t iState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_MAP_WARP { int32_t iMapNum; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2FE_REQ_PC_GIVE_NANO { int16_t iNanoID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_NPC_SUMMON { int32_t iNPCType; int16_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_NPC_UNSUMMON { int32_t iNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_ITEM_CHEST_OPEN { int32_t eIL; int32_t iSlotNum; sItemBase ChestItem; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2FE_REQ_PC_GIVE_NANO_SKILL { int16_t iNanoID; int16_t iNanoSkillID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_DOT_DAMAGE_ONOFF { int32_t iFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_VENDOR_BATTERY_BUY { int32_t iNPC_ID; @@ -1734,12 +1141,7 @@ struct sP_CL2FE_REQ_PC_VENDOR_BATTERY_BUY { int8_t iListID; sItemBase Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_WARP_USE_NPC { int32_t iNPC_ID; @@ -1749,223 +1151,122 @@ struct sP_CL2FE_REQ_PC_WARP_USE_NPC { int32_t eIL2; int32_t iItemSlot2; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GROUP_INVITE { int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GROUP_INVITE_REFUSE { int32_t iID_From; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_GROUP_JOIN { int32_t iID_From; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_PC_GROUP_LEAVE { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT { int32_t iID_From; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_BUDDY_WARP { int64_t iBuddyPCUID; int8_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_GET_MEMBER_STYLE { int32_t iMemberID; int64_t iMemberUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_GET_GROUP_STYLE { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2FE_REQ_PC_CHANGE_MENTOR { int16_t iMentor; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_GET_BUDDY_LOCATION { int64_t iBuddyPCUID; int8_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_NPC_GROUP_SUMMON { int32_t iNPCGroupType; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_WARP_TO_PC { int32_t iPC_ID; int32_t iPCUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_RANK_GET_LIST { int32_t iRankListPageNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_RANK_GET_DETAIL { int32_t iEP_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_RANK_GET_PC_INFO { int32_t iEP_ID; char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_RACE_START { int32_t iStartEcomID; int32_t iEPRaceMode; int32_t iEPTicketItemSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_RACE_END { int32_t iEndEcomID; int32_t iEPTicketItemSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_RACE_CANCEL { int32_t iStartEcomID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_EP_GET_RING { int32_t iRingLID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_IM_CHANGE_SWITCH_STATUS { int32_t iSwitchLID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SHINY_PICKUP { int32_t iShinyID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SHINY_SUMMON { int32_t iShinyType; @@ -1973,12 +1274,7 @@ struct sP_CL2FE_REQ_SHINY_SUMMON { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_MOVETRANSPORTATION { uint64_t iCliTime; @@ -1996,81 +1292,46 @@ struct sP_CL2FE_REQ_PC_MOVETRANSPORTATION { uint8_t cKeyValue; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_ALL_GROUP_FREECHAT_MESSAGE { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_ANY_GROUP_FREECHAT_MESSAGE { char16_t szFreeChat[128]; int32_t iEmoteCode; int32_t iGroupPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_BARKER { int32_t iMissionTaskID; int32_t iNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_ALL_GROUP_MENUCHAT_MESSAGE { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SEND_ANY_GROUP_MENUCHAT_MESSAGE { char16_t szFreeChat[128]; int32_t iEmoteCode; int32_t iGroupPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_REGIST_TRANSPORTATION_LOCATION { int32_t eTT; int32_t iNPC_ID; int32_t iLocationID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_WARP_USE_TRANSPORTATION { int32_t iNPC_ID; @@ -2078,35 +1339,20 @@ struct sP_CL2FE_REQ_PC_WARP_USE_TRANSPORTATION { int32_t eIL; int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_PC_SPECIAL_STATE_SWITCH { int32_t iPC_ID; int8_t iSpecialStateFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_PC_SET_VALUE { int32_t iPC_ID; int32_t iSetValueType; int32_t iSetValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_KICK_PLAYER { int32_t iPC_ID; @@ -2116,12 +1362,7 @@ struct sP_CL2FE_GM_REQ_KICK_PLAYER { char16_t szTargetPC_LastName[18]; int64_t iTargetPC_UID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_TARGET_PC_TELEPORT { int32_t iPC_ID; @@ -2142,12 +1383,7 @@ struct sP_CL2FE_GM_REQ_TARGET_PC_TELEPORT { char16_t szGoalPC_LastName[18]; int64_t iGoalPC_UID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_PC_LOCATION { int32_t eTargetSearchBy; @@ -2156,12 +1392,7 @@ struct sP_CL2FE_GM_REQ_PC_LOCATION { char16_t szTargetPC_LastName[18]; int64_t iTargetPC_UID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_PC_ANNOUNCE { int8_t iAreaType; @@ -2169,153 +1400,88 @@ struct sP_CL2FE_GM_REQ_PC_ANNOUNCE { int32_t iDuringTime; char16_t szAnnounceMsg[512]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_SET_PC_BLOCK { int32_t iBlock_ID; int64_t iBlock_PCUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_REGIST_RXCOM { int32_t iNPCID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2FE_GM_REQ_PC_MOTD_REGISTER { int8_t iType; char16_t szSystemMsg[512]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_ITEM_USE { int32_t eIL; int32_t iSlotNum; int16_t iNanoSlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_WARP_USE_RECALL { int32_t iGroupMemberID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REP_LIVE_CHECK { int32_t iTempValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_MISSION_COMPLETE { int32_t iMissionNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TASK_COMPLETE { int32_t iTaskNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_NPC_INTERACTION { int32_t iNPC_ID; int32_t bFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_DOT_HEAL_ONOFF { int32_t iFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SPECIAL_STATE_SWITCH { int32_t iPC_ID; int8_t iSpecialStateFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_PC_EMAIL_UPDATE_CHECK { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_READ_EMAIL { int64_t iEmailIndex; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sP_CL2FE_REQ_PC_RECV_EMAIL_PAGE_LIST { int8_t iPageNum; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_DELETE_EMAIL { int64_t iEmailIndexArray[5]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SEND_EMAIL { int64_t iTo_PCUID; @@ -2324,34 +1490,19 @@ struct sP_CL2FE_REQ_PC_SEND_EMAIL { sEmailItemInfoFromCL aItem[4]; int32_t iCash; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_RECV_EMAIL_ITEM { int64_t iEmailIndex; int32_t iSlotNum; int32_t iEmailItemSlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_RECV_EMAIL_CANDY { int64_t iEmailIndex; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF { int32_t eTargetSearchBy; @@ -2362,52 +1513,27 @@ struct sP_CL2FE_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF { int32_t iONOFF; int8_t iSpecialStateFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SET_CURRENT_MISSION_ID { int32_t iCurrentMissionID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_NPC_GROUP_INVITE { int32_t iNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_NPC_GROUP_KICK { int32_t iNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_FIRST_USE_FLAG_SET { int32_t iFlagCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TRANSPORT_WARP { int32_t iTransport_ID; @@ -2415,12 +1541,7 @@ struct sP_CL2FE_REQ_PC_TRANSPORT_WARP { int32_t iLcY; int32_t iLcZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_TIME_TO_GO_WARP { int32_t iNPC_ID; @@ -2432,65 +1553,39 @@ struct sP_CL2FE_REQ_PC_TIME_TO_GO_WARP { int32_t iPC_Level; int32_t iPayFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_RECV_EMAIL_ITEM_ALL { int64_t iEmailIndex; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_CHANNEL_INFO { uint8_t UNUSED; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_PC_CHANNEL_NUM { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_WARP_CHANNEL { int32_t iChannelNum; int8_t iWarpType; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_LOADING_COMPLETE { int32_t iPC_ID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY { int32_t iAcceptFlag; @@ -2498,42 +1593,22 @@ struct sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ATTACK_CHARs { int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_READY { int32_t iStreetStallItemInvenSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_CANCEL { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_REGIST_ITEM { int32_t iItemListNum; @@ -2541,54 +1616,29 @@ struct sP_CL2FE_PC_STREETSTALL_REQ_REGIST_ITEM { sItemBase Item; int32_t iPrice; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_UNREGIST_ITEM { int32_t iItemListNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_SALE_START { int32_t iStreetStallItemInvenSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_ITEM_LIST { int32_t iStreetStallPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_PC_STREETSTALL_REQ_ITEM_BUY { int32_t iStreetStallPC_ID; int32_t iItemListNum; int32_t iEmptyInvenSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ITEM_COMBINATION { int32_t iCostumeItemSlot; @@ -2596,23 +1646,13 @@ struct sP_CL2FE_REQ_PC_ITEM_COMBINATION { int32_t iCashItemSlot1; int32_t iCashItemSlot2; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_SET_PC_SKILL { int32_t iSkillSlotNum; int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SKILL_ADD { int32_t iSkillSlotNum; @@ -2621,23 +1661,13 @@ struct sP_CL2FE_REQ_PC_SKILL_ADD { int32_t iPreSkillSlotNum; int32_t iPreSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SKILL_DEL { int32_t iSkillSlotNum; int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_SKILL_USE { int32_t iSkillSlotNum; @@ -2656,12 +1686,7 @@ struct sP_CL2FE_REQ_PC_SKILL_USE { int32_t iTargetLocationZ; int32_t iTargetCount; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ROPE { uint64_t iCliTime; @@ -2676,12 +1701,7 @@ struct sP_CL2FE_REQ_PC_ROPE { uint8_t cKeyValue; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_BELT { uint64_t iCliTime; @@ -2700,51 +1720,29 @@ struct sP_CL2FE_REQ_PC_BELT { uint8_t cKeyValue; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_PC_VEHICLE_ON { uint8_t UNUSED; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2FE_REQ_PC_VEHICLE_OFF { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2FE_REQ_PC_REGIST_QUICK_SLOT { int32_t iSlotNum; int16_t iItemType; int16_t iItemID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_DISASSEMBLE_ITEM { int32_t iItemSlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_GM_REQ_REWARD_RATE { int32_t iGetSet; @@ -2752,12 +1750,7 @@ struct sP_CL2FE_GM_REQ_REWARD_RATE { int32_t iRewardRateIndex; int32_t iSetRateValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2FE_REQ_PC_ITEM_ENCHANT { int32_t iEnchantItemSlot; @@ -2766,12 +1759,7 @@ struct sP_CL2FE_REQ_PC_ITEM_ENCHANT { int32_t iCashItemSlot1; int32_t iCashItemSlot2; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_LOGIN { char16_t szID[33]; @@ -2783,12 +1771,7 @@ struct sP_CL2LS_REQ_LOGIN { uint8_t szCookie_TEGid[64]; uint8_t szCookie_authid[255]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_CHECK_CHAR_NAME { int32_t iFNCode; @@ -2797,12 +1780,7 @@ struct sP_CL2LS_REQ_CHECK_CHAR_NAME { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_SAVE_CHAR_NAME { int8_t iSlotNum; @@ -2813,96 +1791,58 @@ struct sP_CL2LS_REQ_SAVE_CHAR_NAME { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_CHAR_CREATE { sPCStyle PCStyle; sOnItem sOn_Item; sOnItem_Index sOn_Item_Index; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_CHAR_SELECT { int64_t iPC_UID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_CHAR_DELETE { int64_t iPC_UID; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sP_CL2LS_REQ_SHARD_SELECT { int8_t ShardNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_CL2LS_REQ_SHARD_LIST_INFO { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2LS_CHECK_NAME_LIST { int32_t iFNCode; int32_t iMNCode; int32_t iLNCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_SAVE_CHAR_TUTOR { int64_t iPC_UID; int8_t iTutorialFlag; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_CL2LS_REQ_PC_EXIT_DUPLICATE { char16_t szID[33]; char16_t szPassword[33]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_CL2LS_REP_LIVE_CHECK { int32_t iTempValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_CL2LS_REQ_CHANGE_CHAR_NAME { int64_t iPCUID; @@ -2914,147 +1854,83 @@ struct sP_CL2LS_REQ_CHANGE_CHAR_NAME { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sP_CL2LS_REQ_SERVER_SELECT { int8_t ServerNum; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sPacket { uint32_t dwType; uint8_t szData[4096]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPacket_Full { uint32_t dwSize; uint32_t dwType; uint8_t szData[4096]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPacket2x { uint32_t dwType; uint8_t szData[8192]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sPacket2x_Full { uint32_t dwSize; uint32_t dwType; uint8_t szData[8192]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_ERROR { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ENTER_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ENTER_SUCC { int32_t iID; sPCLoadData2CL PCLoadData2CL; uint64_t uiSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_NEW { sPCAppearanceData PCAppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_EXIT_FAIL { int32_t iID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_EXIT_SUCC { int32_t iID; int32_t iExitCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_EXIT { int32_t iID; int32_t iExitType; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_AROUND { int32_t iPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_MOVE { uint64_t iCliTime; @@ -3070,12 +1946,7 @@ struct sP_FE2CL_PC_MOVE { int32_t iID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STOP { uint64_t iCliTime; @@ -3085,12 +1956,7 @@ struct sP_FE2CL_PC_STOP { int32_t iID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_JUMP { uint64_t iCliTime; @@ -3106,32 +1972,17 @@ struct sP_FE2CL_PC_JUMP { int32_t iID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_ENTER { sNPCAppearanceData NPCAppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_EXIT { int32_t iNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_MOVE { int32_t iNPC_ID; @@ -3141,145 +1992,80 @@ struct sP_FE2CL_NPC_MOVE { int32_t iSpeed; int16_t iMoveStyle; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_NEW { sNPCAppearanceData NPCAppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_AROUND { int32_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_AROUND_DEL_PC { int32_t iPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_AROUND_DEL_NPC { int32_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC { int32_t iPC_ID; char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_FAIL { int32_t iErrorCode; char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ATTACK_NPCs_SUCC { int32_t iBatteryW; int32_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ATTACK_NPCs { int32_t iPC_ID; int32_t iNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_ATTACK_PCs { int32_t iNPC_ID; int32_t iPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_REGEN_SUCC { sPCRegenData PCRegenData; int32_t bMoveLocation; int32_t iFusionMatter; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC { int32_t iPC_ID; char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_FAIL { int32_t iErrorCode; char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ITEM_MOVE_SUCC { int32_t eFrom; @@ -3289,67 +2075,37 @@ struct sP_FE2CL_PC_ITEM_MOVE_SUCC { int32_t iToSlotNum; sItemBase ToSlotItem; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_EQUIP_CHANGE { int32_t iPC_ID; int32_t iEquipSlotNum; sItemBase EquipSlotItem; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_START_SUCC { int32_t iTaskNum; int32_t iRemainTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_START_FAIL { int32_t iTaskNum; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_END_SUCC { int32_t iTaskNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_END_FAIL { int32_t iTaskNum; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_SKILL_READY { int32_t iNPC_ID; @@ -3358,12 +2114,7 @@ struct sP_FE2CL_NPC_SKILL_READY { int32_t iValue2; int32_t iValue3; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_SKILL_FIRE { int32_t iNPC_ID; @@ -3372,12 +2123,7 @@ struct sP_FE2CL_NPC_SKILL_FIRE { int32_t iVY; int32_t iVZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_SKILL_HIT { int32_t iNPC_ID; @@ -3388,12 +2134,7 @@ struct sP_FE2CL_NPC_SKILL_HIT { int32_t eST; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_SKILL_CORRUPTION_READY { int32_t iNPC_ID; @@ -3403,12 +2144,7 @@ struct sP_FE2CL_NPC_SKILL_CORRUPTION_READY { int32_t iValue2; int32_t iValue3; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_SKILL_CORRUPTION_HIT { int32_t iNPC_ID; @@ -3419,56 +2155,31 @@ struct sP_FE2CL_NPC_SKILL_CORRUPTION_HIT { int32_t iValue3; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_SKILL_CANCEL { int32_t iNPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NANO_EQUIP_SUCC { int16_t iNanoID; int16_t iNanoSlotNum; int32_t bNanoDeactive; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NANO_UNEQUIP_SUCC { int16_t iNanoSlotNum; int32_t bNanoDeactive; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NANO_ACTIVE_SUCC { int16_t iActiveNanoSlotNum; int32_t eCSTB___Add; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NANO_TUNE_SUCC { int16_t iNanoID; @@ -3477,12 +2188,7 @@ struct sP_FE2CL_REP_NANO_TUNE_SUCC { int aiItemSlotNum[10]; sItemBase aItem[10]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NANO_ACTIVE { int32_t iPC_ID; @@ -3490,12 +2196,7 @@ struct sP_FE2CL_NANO_ACTIVE { int32_t iConditionBitFlag; int32_t eCSTB___Add; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NANO_SKILL_USE_SUCC { int32_t iPC_ID; @@ -3510,12 +2211,7 @@ struct sP_FE2CL_NANO_SKILL_USE_SUCC { int32_t eST; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NANO_SKILL_USE { int32_t iPC_ID; @@ -3530,76 +2226,41 @@ struct sP_FE2CL_NANO_SKILL_USE { int32_t eST; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_STOP_SUCC { int32_t iTaskNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_STOP_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_CONTINUE_SUCC { int32_t iTaskNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TASK_CONTINUE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_GOTO_SUCC { int32_t iX; int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_CHARGE_NANO_STAMINA { int32_t iBatteryN; int16_t iNanoID; int16_t iNanoStamina; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TICK { int32_t iHP; @@ -3607,44 +2268,24 @@ struct sP_FE2CL_REP_PC_TICK { int32_t iBatteryN; int32_t bResetMissionFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_KILL_QUEST_NPCs_SUCC { int32_t iNPCID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_SUCC { int32_t iCandy; int32_t iInvenSlotNum; sItemBase Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_SUCC { int32_t iCandy; @@ -3652,44 +2293,24 @@ struct sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_SUCC { sItemBase Item; sItemBase ItemStay; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_DELETE_SUCC { int32_t eIL; int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ROCKET_STYLE_READY { int32_t iPC_ID; int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ROCKET_STYLE_FIRE_SUCC { int32_t iSkillID; @@ -3706,12 +2327,7 @@ struct sP_FE2CL_REP_PC_ROCKET_STYLE_FIRE_SUCC { int16_t iNanoID; int16_t iNanoStamina; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ROCKET_STYLE_FIRE { int32_t iPC_ID; @@ -3725,12 +2341,7 @@ struct sP_FE2CL_PC_ROCKET_STYLE_FIRE { sPCBullet Bullet; int32_t bNanoDeactive; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ROCKET_STYLE_HIT { int32_t iPC_ID; @@ -3738,23 +2349,13 @@ struct sP_FE2CL_PC_ROCKET_STYLE_HIT { sPCBullet Bullet; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GRENADE_STYLE_READY { int32_t iPC_ID; int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_GRENADE_STYLE_FIRE_SUCC { int32_t iSkillID; @@ -3768,12 +2369,7 @@ struct sP_FE2CL_REP_PC_GRENADE_STYLE_FIRE_SUCC { int16_t iNanoID; int16_t iNanoStamina; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GRENADE_STYLE_FIRE { int32_t iPC_ID; @@ -3784,12 +2380,7 @@ struct sP_FE2CL_PC_GRENADE_STYLE_FIRE { sPCBullet Bullet; int32_t bNanoDeactive; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GRENADE_STYLE_HIT { int32_t iPC_ID; @@ -3797,60 +2388,35 @@ struct sP_FE2CL_PC_GRENADE_STYLE_HIT { sPCBullet Bullet; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_OFFER { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_OFFER_CANCEL { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_OFFER_SUCC { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_OFFER_REFUSAL { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_OFFER_ABORT { int32_t iID_Request; @@ -3858,48 +2424,28 @@ struct sP_FE2CL_REP_PC_TRADE_OFFER_ABORT { int32_t iID_To; int16_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CONFIRM { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CONFIRM_CANCEL { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CONFIRM_ABORT { int32_t iID_Request; int32_t iID_From; int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CONFIRM_SUCC { int32_t iID_Request; @@ -3909,12 +2455,7 @@ struct sP_FE2CL_REP_PC_TRADE_CONFIRM_SUCC { int32_t iCandy; sItemTrade ItemStay[12]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CONFIRM_FAIL { int32_t iID_Request; @@ -3922,12 +2463,7 @@ struct sP_FE2CL_REP_PC_TRADE_CONFIRM_FAIL { int32_t iID_To; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_SUCC { int32_t iID_Request; @@ -3936,12 +2472,7 @@ struct sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_SUCC { sItemTrade TradeItem; sItemTrade InvenItem; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_FAIL { int32_t iID_Request; @@ -3949,12 +2480,7 @@ struct sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_FAIL { int32_t iID_To; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_SUCC { int32_t iID_Request; @@ -3963,12 +2489,7 @@ struct sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_SUCC { sItemTrade TradeItem; sItemTrade InvenItem; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_FAIL { int32_t iID_Request; @@ -3976,12 +2497,7 @@ struct sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_FAIL { int32_t iID_To; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_SUCC { int32_t iID_Request; @@ -3989,12 +2505,7 @@ struct sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_SUCC { int32_t iID_To; int32_t iCandy; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_FAIL { int32_t iID_Request; @@ -4002,12 +2513,7 @@ struct sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_FAIL { int32_t iID_To; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT { int32_t iID_Request; @@ -4016,12 +2522,7 @@ struct sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_NANO_CREATE_SUCC { int32_t iPC_FusionMatter; @@ -4030,172 +2531,92 @@ struct sP_FE2CL_REP_PC_NANO_CREATE_SUCC { sNano Nano; int16_t iPC_Level; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_NANO_CREATE_FAIL { int32_t iPC_ID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NANO_TUNE_FAIL { int32_t iPC_ID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BANK_OPEN_SUCC { sItemBase aBank[119]; int32_t iExtraBank; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BANK_OPEN_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BANK_CLOSE_SUCC { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BANK_CLOSE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_START_SUCC { int32_t iNPC_ID; int32_t iVendorID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_START_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_SUCC { sItemVendor item[20]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_ITEM_RESTORE_BUY_SUCC { int32_t iCandy; int32_t iInvenSlotNum; sItemBase Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_ITEM_RESTORE_BUY_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT { int32_t eCT; int32_t iID; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_GIVE_ITEM_SUCC { int32_t eIL; int32_t iSlotNum; sItemBase Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_GIVE_ITEM_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC { int32_t iID; @@ -4203,69 +2624,39 @@ struct sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC { int8_t iListNum; int8_t iBuddyCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BUDDYLIST_INFO_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC { int32_t iRequestID; int32_t iBuddyID; int64_t iBuddyPCUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_FAIL { int32_t iBuddyID; int64_t iBuddyPCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC { int8_t iBuddySlot; sBuddyBaseInfo BuddyInfo; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL { int32_t iBuddyID; int64_t iBuddyPCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC { int64_t iFromPCUID; @@ -4273,12 +2664,7 @@ struct sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_FAIL { int32_t iErrorCode; @@ -4286,12 +2672,7 @@ struct sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_FAIL { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC { int64_t iFromPCUID; @@ -4299,12 +2680,7 @@ struct sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_FAIL { int32_t iErrorCode; @@ -4312,100 +2688,55 @@ struct sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_FAIL { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_BUDDY_STYLE_SUCC { int64_t iBuddyPCUID; int8_t iBuddySlot; sBuddyStyleInfo sBuddyStyle; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_BUDDY_STYLE_FAIL { int32_t iErrorCode; int64_t iBuddyPCUID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_BUDDY_STATE_SUCC { int aBuddyID[50]; uint8_t aBuddyState[50]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_BUDDY_STATE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SET_BUDDY_BLOCK_SUCC { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SET_BUDDY_BLOCK_FAIL { int64_t iBuddyPCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REMOVE_BUDDY_SUCC { int64_t iBuddyPCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REMOVE_BUDDY_FAIL { int64_t iBuddyPCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_JUMPPAD { uint64_t iCliTime; @@ -4420,12 +2751,7 @@ struct sP_FE2CL_PC_JUMPPAD { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_LAUNCHER { uint64_t iCliTime; @@ -4440,12 +2766,7 @@ struct sP_FE2CL_PC_LAUNCHER { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ZIPLINE { uint64_t iCliTime; @@ -4469,12 +2790,7 @@ struct sP_FE2CL_PC_ZIPLINE { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_MOVEPLATFORM { uint64_t iCliTime; @@ -4495,12 +2811,7 @@ struct sP_FE2CL_PC_MOVEPLATFORM { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_SLOPE { uint64_t iCliTime; @@ -4517,23 +2828,13 @@ struct sP_FE2CL_PC_SLOPE { float fVZ; int32_t iSlopeID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STATE_CHANGE { int32_t iPC_ID; int8_t iState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER { int32_t iRequestID; @@ -4541,12 +2842,7 @@ struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REWARD_ITEM { int32_t m_iCandy; @@ -4559,67 +2855,37 @@ struct sP_FE2CL_REP_REWARD_ITEM { int32_t iNPC_TypeID; int32_t iTaskID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_ITEM_CHEST_OPEN_SUCC { int32_t iSlotNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_ITEM_CHEST_OPEN_FAIL { int32_t iSlotNum; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK { int32_t eCT; int32_t iID; int16_t iTB_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_SUCC { int32_t iCandy; int32_t iBatteryW; int32_t iBatteryN; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_ROCKET_STYLE_FIRE { int32_t iNPC_ID; @@ -4632,12 +2898,7 @@ struct sP_FE2CL_NPC_ROCKET_STYLE_FIRE { int8_t iBulletID; sNPCBullet Bullet; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_GRENADE_STYLE_FIRE { int32_t iNPC_ID; @@ -4647,12 +2908,7 @@ struct sP_FE2CL_NPC_GRENADE_STYLE_FIRE { int8_t iBulletID; sNPCBullet Bullet; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_BULLET_STYLE_HIT { int32_t iNPC_ID; @@ -4660,131 +2916,74 @@ struct sP_FE2CL_NPC_BULLET_STYLE_HIT { sNPCBullet Bullet; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_CHARACTER_ATTACK_CHARACTERs { int32_t eCT; int32_t iCharacterID; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_INVITE { int32_t iHostID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_INVITE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_INVITE_REFUSE { int32_t iID_To; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_JOIN { int32_t iID_NewMember; int32_t iMemberPCCnt; int32_t iMemberNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_JOIN_FAIL { int32_t iID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_JOIN_SUCC { int32_t iID_NewMember; int32_t iMemberPCCnt; int32_t iMemberNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_LEAVE { int32_t iID_LeaveMember; int32_t iMemberPCCnt; int32_t iMemberNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_GROUP_LEAVE_FAIL { int32_t iID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_PC_GROUP_LEAVE_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_PC_GROUP_MEMBER_INFO { int32_t iID; int32_t iMemberPCCnt; int32_t iMemberNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC { int32_t iX; @@ -4795,108 +2994,58 @@ struct sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC { sItemBase Item; int32_t iCandy; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_WARP_USE_NPC_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_AVATAR_EMOTES_CHAT { int32_t iID_From; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_CHANGE_MENTOR_SUCC { int16_t iMentor; int16_t iMentorCnt; int32_t iFusionMatter; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_CHANGE_MENTOR_FAIL { int16_t iMentor; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_MEMBER_STYLE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_MEMBER_STYLE_SUCC { int32_t iMemberID; int64_t iMemberUID; sBuddyStyleInfo BuddyStyleInfo; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_GROUP_STYLE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_GROUP_STYLE_SUCC { int32_t iMemberCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_REGEN { sPCRegenDataForOtherPC PCRegenDataForOtherPC; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_INSTANCE_MAP_INFO { int32_t iInstanceMapNum; @@ -4914,33 +3063,18 @@ struct sP_FE2CL_INSTANCE_MAP_INFO { int32_t iEPTopRecord_RingCount; int32_t iEPSwitch_StatusON_Cnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_TRANSPORTATION_ENTER { sTransportationAppearanceData AppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_TRANSPORTATION_EXIT { int32_t eTT; int32_t iT_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_TRANSPORTATION_MOVE { int32_t eTT; @@ -4951,91 +3085,49 @@ struct sP_FE2CL_TRANSPORTATION_MOVE { int32_t iSpeed; int16_t iMoveStyle; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_TRANSPORTATION_NEW { sTransportationAppearanceData AppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_TRANSPORTATION_AROUND { int32_t iCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_AROUND_DEL_TRANSPORTATION { int32_t eTT; int32_t iCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_REP_EP_RANK_LIST { uint8_t UNUSED; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_REP_EP_RANK_DETAIL { uint8_t UNUSED; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_REP_EP_RANK_PC_INFO { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_REP_EP_RACE_START_SUCC { uint64_t iStartTick; int32_t iLimitTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_RACE_START_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_RACE_END_SUCC { int32_t iEPRaceMode; @@ -5053,63 +3145,33 @@ struct sP_FE2CL_REP_EP_RACE_END_SUCC { int32_t iFatigue; int32_t iFatigue_Level; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_RACE_END_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_RACE_CANCEL_SUCC { int32_t iTemp; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_RACE_CANCEL_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_GET_RING_SUCC { int32_t iRingLID; int32_t iRingCount_Get; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_EP_GET_RING_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_IM_CHANGE_SWITCH_STATUS { int32_t iMapNum; @@ -5117,80 +3179,43 @@ struct sP_FE2CL_REP_IM_CHANGE_SWITCH_STATUS { int32_t iSwitchGID; int32_t iSwitchStatus; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_SHINY_ENTER { sShinyAppearanceData ShinyAppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_SHINY_EXIT { int32_t iShinyID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_SHINY_NEW { sShinyAppearanceData ShinyAppearanceData; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_SHINY_AROUND { int32_t iShinyCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_AROUND_DEL_SHINY { int32_t iShinyCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_REP_SHINY_PICKUP_FAIL { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_REP_SHINY_PICKUP_SUCC { int16_t iSkillID; int32_t eCSTB; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_MOVETRANSPORTATION { uint64_t iCliTime; @@ -5210,24 +3235,14 @@ struct sP_FE2CL_PC_MOVETRANSPORTATION { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_SUCC { int32_t iSendPCID; char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_FAIL { int32_t iSendPCID; @@ -5235,12 +3250,7 @@ struct sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_FAIL { int32_t iEmoteCode; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_SUCC { int32_t iSendPCID; @@ -5248,12 +3258,7 @@ struct sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_SUCC { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_FAIL { int32_t iSendPCID; @@ -5262,35 +3267,20 @@ struct sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_FAIL { int32_t iEmoteCode; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_BARKER { int32_t iNPC_ID; int32_t iMissionStringID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_SUCC { int32_t iSendPCID; char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_FAIL { int32_t iSendPCID; @@ -5298,12 +3288,7 @@ struct sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_FAIL { int32_t iEmoteCode; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_SUCC { int32_t iSendPCID; @@ -5311,12 +3296,7 @@ struct sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_SUCC { char16_t szFreeChat[128]; int32_t iEmoteCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_FAIL { int32_t iSendPCID; @@ -5325,24 +3305,14 @@ struct sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_FAIL { int32_t iEmoteCode; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_FAIL { int32_t eTT; int32_t iLocationID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC { int32_t eTT; @@ -5350,23 +3320,13 @@ struct sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC { int32_t iWarpLocationFlag; int64_t aWyvernLocationFlag[2]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_FAIL { int32_t iTransportationID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC { int32_t eTT; @@ -5375,72 +3335,42 @@ struct sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC { int32_t iZ; int32_t iCandy; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_ANNOUNCE_MSG { int8_t iAnnounceType; int32_t iDuringTime; char16_t szAnnounceMsg[512]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SPECIAL_STATE_SWITCH_SUCC { int32_t iPC_ID; int8_t iReqSpecialStateFlag; int8_t iSpecialState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_SPECIAL_STATE_CHANGE { int32_t iPC_ID; int8_t iReqSpecialStateFlag; int8_t iSpecialState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_GM_REP_PC_SET_VALUE { int32_t iPC_ID; int32_t iSetValueType; int32_t iSetValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_GM_PC_CHANGE_VALUE { int32_t iPC_ID; int32_t iSetValueType; int32_t iSetValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_GM_REP_PC_LOCATION { int64_t iTargetPC_UID; @@ -5455,70 +3385,40 @@ struct sP_FE2CL_GM_REP_PC_LOCATION { char16_t szTargetPC_FirstName[10]; char16_t szTargetPC_LastName[18]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_GM_REP_PC_ANNOUNCE { int8_t iAnnounceType; int32_t iDuringTime; char16_t szAnnounceMsg[512]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BUDDY_WARP_FAIL { int64_t iBuddyPCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_CHANGE_LEVEL { int32_t iPC_ID; int16_t iPC_Level; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SET_PC_BLOCK_SUCC { int32_t iBlock_ID; int64_t iBlock_PCUID; int8_t iBuddySlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_SET_PC_BLOCK_FAIL { int32_t iBlock_ID; int64_t iBlock_PCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REGIST_RXCOM { int32_t iMapNum; @@ -5526,58 +3426,34 @@ struct sP_FE2CL_REP_REGIST_RXCOM { int32_t iY; int32_t iZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_REGIST_RXCOM_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_INVEN_FULL_MSG { int8_t iType; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REQ_LIVE_CHECK { int32_t iTempValue; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_FE2CL_PC_MOTD_LOGIN { int8_t iType; char16_t szSystemMsg[512]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_USE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_USE_SUCC { int32_t iPC_ID; @@ -5588,12 +3464,7 @@ struct sP_FE2CL_REP_PC_ITEM_USE_SUCC { int32_t eST; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ITEM_USE { int32_t iPC_ID; @@ -5601,12 +3472,7 @@ struct sP_FE2CL_PC_ITEM_USE { int32_t eST; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_BUDDY_LOCATION_SUCC { int64_t iBuddyPCUID; @@ -5616,56 +3482,31 @@ struct sP_FE2CL_REP_GET_BUDDY_LOCATION_SUCC { int32_t iZ; int8_t iShardNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GET_BUDDY_LOCATION_FAIL { int64_t iBuddyPCUID; int8_t iSlotNum; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RIDING_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RIDING_SUCC { int32_t iPC_ID; int32_t eRT; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_RIDING { int32_t iPC_ID; int32_t eRT; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_BROOMSTICK_MOVE { int32_t iPC_ID; @@ -5674,54 +3515,29 @@ struct sP_FE2CL_PC_BROOMSTICK_MOVE { int32_t iToZ; int32_t iSpeed; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_BUDDY_WARP_OTHER_SHARD_SUCC { int64_t iBuddyPCUID; int8_t iShardNum; int32_t iChannelNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_WARP_USE_RECALL_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_EXIT_DUPLICATE { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_MISSION_COMPLETE_SUCC { int32_t iMissionNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_BUFF_UPDATE { int32_t eCSTB; @@ -5730,22 +3546,12 @@ struct sP_FE2CL_PC_BUFF_UPDATE { sTimeBuff TimeBuff; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_NEW_EMAIL { int32_t iNewEmailCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_READ_EMAIL_SUCC { int64_t iEmailIndex; @@ -5753,101 +3559,56 @@ struct sP_FE2CL_REP_PC_READ_EMAIL_SUCC { sItemBase aItem[4]; int32_t iCash; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_READ_EMAIL_FAIL { int64_t iEmailIndex; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_PAGE_LIST_SUCC { int8_t iPageNum; sEmailInfo aEmailInfo[5]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_PAGE_LIST_FAIL { int8_t iPageNum; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_DELETE_EMAIL_SUCC { int64_t iEmailIndexArray[5]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_DELETE_EMAIL_FAIL { int64_t iEmailIndexArray[5]; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SEND_EMAIL_SUCC { int64_t iTo_PCUID; int32_t iCandy; sEmailItemInfoFromCL aItem[4]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SEND_EMAIL_FAIL { int64_t iTo_PCUID; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_SUCC { int64_t iEmailIndex; int32_t iSlotNum; int32_t iEmailItemSlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_FAIL { int64_t iEmailIndex; @@ -5855,34 +3616,19 @@ struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_FAIL { int32_t iEmailItemSlot; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_CANDY_SUCC { int64_t iEmailIndex; int32_t iCandy; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_CANDY_FAIL { int64_t iEmailIndex; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_SUDDEN_DEAD { int32_t iPC_ID; @@ -5890,12 +3636,7 @@ struct sP_FE2CL_PC_SUDDEN_DEAD { int32_t iDamage; int32_t iHP; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF_SUCC { int32_t iTargetPC_ID; @@ -5904,32 +3645,17 @@ struct sP_FE2CL_REP_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF_SUCC { int8_t iReqSpecialStateFlag; int8_t iSpecialState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SET_CURRENT_MISSION_ID { int32_t iCurrentMissionID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NPC_GROUP_INVITE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NPC_GROUP_INVITE_SUCC { int32_t iPC_ID; @@ -5937,22 +3663,12 @@ struct sP_FE2CL_REP_NPC_GROUP_INVITE_SUCC { int32_t iMemberPCCnt; int32_t iMemberNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NPC_GROUP_KICK_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_NPC_GROUP_KICK_SUCC { int32_t iPC_ID; @@ -5960,12 +3676,7 @@ struct sP_FE2CL_REP_NPC_GROUP_KICK_SUCC { int32_t iMemberPCCnt; int32_t iMemberNPCCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_EVENT { int32_t iPC_ID; @@ -5974,12 +3685,7 @@ struct sP_FE2CL_PC_EVENT { int32_t iEventValue2; int32_t iEventValue3; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRANSPORT_WARP_SUCC { sTransportationAppearanceData TransportationAppearanceData; @@ -5987,12 +3693,7 @@ struct sP_FE2CL_REP_PC_TRANSPORT_WARP_SUCC { int32_t iLcY; int32_t iLcZ; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT_FAIL { int32_t iID_Request; @@ -6002,92 +3703,50 @@ struct sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT_FAIL { int32_t iEmoteCode; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_ALL_SUCC { int64_t iEmailIndex; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_ALL_FAIL { int64_t iEmailIndex; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_LOADING_COMPLETE_SUCC { int32_t iPC_ID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sChannelInfo { int32_t iChannelNum; int32_t iCurrentUserCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_CHANNEL_INFO { int32_t iCurrChannelNum; int32_t iChannelCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_CHANNEL_NUM { int32_t iChannelNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_WARP_CHANNEL_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_REP_PC_WARP_CHANNEL_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC { char16_t szFirstName[9]; @@ -6095,24 +3754,14 @@ struct sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC { int64_t iPCUID; int8_t iNameCheckFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_FAIL { char16_t szFirstName[9]; char16_t szLastName[17]; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_FIND_NAME_ACCEPT_BUDDY_FAIL { char16_t szFirstName[9]; @@ -6121,74 +3770,42 @@ struct sP_FE2CL_REP_PC_FIND_NAME_ACCEPT_BUDDY_FAIL { int8_t iNameCheckFlag; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_REP_PC_BUDDY_WARP_SAME_SHARD_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_PC_ATTACK_CHARs_SUCC { int32_t iBatteryW; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ATTACK_CHARs { int32_t iPC_ID; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_NPC_ATTACK_CHARs { int32_t iNPC_ID; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_CHANGE_LEVEL_SUCC { int32_t iLevel; int32_t iFusionMatter; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_NANO_CREATE { int32_t iPC_ID; int16_t iNanoID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_READY_SUCC { int32_t iStreetStallItemInvenSlotNum; @@ -6196,36 +3813,22 @@ struct sP_FE2CL_PC_STREETSTALL_REP_READY_SUCC { float fTaxPercentage; int8_t iPCCharState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_READY_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sP_FE2CL_PC_STREETSTALL_REP_CANCEL_SUCC { int8_t iPCCharState; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_CANCEL_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_SUCC { int32_t iItemListNum; @@ -6233,85 +3836,45 @@ struct sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_SUCC { sItemBase Item; int32_t iPrice; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_UNREGIST_ITEM_SUCC { int32_t iItemListNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_UNREGIST_ITEM_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_SALE_START_SUCC { int32_t iStreetStallItemInvenSlotNum; sItemBase OpenItem; int32_t ePCCharState; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_SALE_START_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_LIST { int32_t iStreetStallPC_ID; int32_t iItemListCount; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_LIST_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_BUYER { int32_t iStreetStallPC_ID; @@ -6320,12 +3883,7 @@ struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_BUYER { sItemBase PC_Item; int32_t iItemListNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_SELLER { int32_t iBuyerPC_ID; @@ -6334,22 +3892,12 @@ struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_SELLER { sItemBase StreetStallPC_Item; int32_t iItemListNum; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_COMBINATION_SUCC { int32_t iNewItemSlot; @@ -6360,12 +3908,7 @@ struct sP_FE2CL_REP_PC_ITEM_COMBINATION_SUCC { int32_t iCandy; int32_t iSuccessFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_COMBINATION_FAIL { int32_t iErrorCode; @@ -6374,12 +3917,7 @@ struct sP_FE2CL_REP_PC_ITEM_COMBINATION_FAIL { int32_t iCashItemSlot1; int32_t iCashItemSlot2; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_CASH_BUFF_UPDATE { int32_t eCSTB; @@ -6387,12 +3925,7 @@ struct sP_FE2CL_PC_CASH_BUFF_UPDATE { sTimeBuff TimeBuff; int32_t iConditionBitFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SKILL_ADD_SUCC { int32_t iSkillSlotNum; @@ -6400,43 +3933,23 @@ struct sP_FE2CL_REP_PC_SKILL_ADD_SUCC { int32_t iSkillItemInvenSlotNum; sItemBase SkillItem; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SKILL_ADD_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SKILL_DEL_SUCC { int32_t iSkillSlotNum; int32_t iSkillID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SKILL_DEL_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SKILL_USE_SUCC { int32_t iPC_ID; @@ -6455,22 +3968,12 @@ struct sP_FE2CL_REP_PC_SKILL_USE_SUCC { int32_t iTargetLocationZ; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_SKILL_USE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_SKILL_USE { int32_t iPC_ID; @@ -6489,12 +3992,7 @@ struct sP_FE2CL_PC_SKILL_USE { int32_t iTargetLocationZ; int32_t iTargetCnt; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_ROPE { uint64_t iCliTime; @@ -6511,12 +4009,7 @@ struct sP_FE2CL_PC_ROPE { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_BELT { uint64_t iCliTime; @@ -6537,115 +4030,67 @@ struct sP_FE2CL_PC_BELT { int32_t iPC_ID; uint64_t iSvrTime; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_PC_VEHICLE_ON_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_PC_VEHICLE_ON_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_FE2CL_PC_VEHICLE_OFF_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_PC_VEHICLE_OFF_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_FE2CL_PC_QUICK_SLOT_INFO { sQuickSlot aQuickSlot[8]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_FE2CL_REP_PC_REGIST_QUICK_SLOT_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_REGIST_QUICK_SLOT_SUCC { int32_t iSlotNum; int16_t iItemType; int16_t iItemID; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_PC_DELETE_TIME_LIMIT_ITEM { int32_t iItemListCount; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_DISASSEMBLE_ITEM_SUCC { int32_t iNewItemSlot; sItemBase sNewItem; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_DISASSEMBLE_ITEM_FAIL { int32_t iErrorCode; int32_t iItemSlot; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_GM_REP_REWARD_RATE_SUCC { float afRewardRate_Taros[5]; float afRewardRate_FusionMatter[5]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_ENCHANT_SUCC { int32_t iEnchantItemSlot; @@ -6659,12 +4104,7 @@ struct sP_FE2CL_REP_PC_ITEM_ENCHANT_SUCC { int32_t iCandy; int32_t iSuccessFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_FE2CL_REP_PC_ITEM_ENCHANT_FAIL { int32_t iErrorCode; @@ -6674,12 +4114,7 @@ struct sP_FE2CL_REP_PC_ITEM_ENCHANT_FAIL { int32_t iCashItemSlot1; int32_t iCashItemSlot2; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_LOGIN_SUCC { int8_t iCharCount; @@ -6690,23 +4125,13 @@ struct sP_LS2CL_REP_LOGIN_SUCC { char16_t szID[33]; int32_t iOpenBetaFlag; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_LOGIN_FAIL { int32_t iErrorCode; char16_t szID[33]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHAR_INFO { int8_t iSlot; @@ -6718,27 +4143,18 @@ struct sP_LS2CL_REP_CHAR_INFO { int32_t iZ; sItemBase aEquip[9]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(2) struct sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_LS2CL_REP_CHECK_CHAR_NAME_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC { int64_t iPC_UID; @@ -6747,22 +4163,12 @@ struct sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_SAVE_CHAR_NAME_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHAR_CREATE_SUCC { int16_t iLevel; @@ -6770,92 +4176,54 @@ struct sP_LS2CL_REP_CHAR_CREATE_SUCC { sPCStyle2 sPC_Style2; sOnItem sOn_Item; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHAR_CREATE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_LS2CL_REP_CHAR_SELECT_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_LS2CL_REP_CHAR_SELECT_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sP_LS2CL_REP_CHAR_DELETE_SUCC { int8_t iSlotNum; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_LS2CL_REP_CHAR_DELETE_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_SHARD_SELECT_SUCC { uint8_t g_FE_ServerIP[16]; int32_t g_FE_ServerPort; int64_t iEnterSerialKey; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_SHARD_SELECT_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(1) struct sP_LS2CL_REP_VERSION_CHECK_SUCC { uint8_t UNUSED; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(4) struct sP_LS2CL_REP_VERSION_CHECK_FAIL { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHECK_NAME_LIST_SUCC { int32_t iFNCode; @@ -6863,12 +4231,7 @@ struct sP_LS2CL_REP_CHECK_NAME_LIST_SUCC { int32_t iLNCode; int64_t aNameCodeFlag[8]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHECK_NAME_LIST_FAIL { int32_t iFNCode; @@ -6876,32 +4239,17 @@ struct sP_LS2CL_REP_CHECK_NAME_LIST_FAIL { int32_t iLNCode; int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_PC_EXIT_DUPLICATE { int32_t iErrorCode; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REQ_LIVE_CHECK { int32_t iTempValue; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC { int64_t iPC_UID; @@ -6909,600 +4257,21 @@ struct sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC { char16_t szFirstName[9]; char16_t szLastName[17]; }; -#pragma pack(pop) -<<<<<<< HEAD -======= -#pragma pack(push) ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 #pragma pack(4) struct sP_LS2CL_REP_CHANGE_CHAR_NAME_FAIL { int64_t iPC_UID; int8_t iSlotNum; int32_t iErrorCode; }; -#pragma pack(pop) -#pragma pack(push) #pragma pack(1) struct sP_LS2CL_REP_SHARD_LIST_INFO_SUCC { uint8_t aShardConnectFlag[26]; }; -<<<<<<< HEAD #pragma pack(pop) -======= -#pragma pack(pop) - - -typedef struct sP_CL2FE_REQ_PC_ENTER sP_CL2FE_REQ_PC_ENTER; -typedef struct sP_CL2FE_REQ_PC_EXIT sP_CL2FE_REQ_PC_EXIT; -typedef struct sP_CL2FE_REQ_PC_MOVE sP_CL2FE_REQ_PC_MOVE; -typedef struct sP_CL2FE_REQ_PC_STOP sP_CL2FE_REQ_PC_STOP; -typedef struct sP_CL2FE_REQ_PC_JUMP sP_CL2FE_REQ_PC_JUMP; -typedef struct sP_CL2FE_REQ_PC_ATTACK_NPCs sP_CL2FE_REQ_PC_ATTACK_NPCs; -typedef struct sP_CL2FE_REQ_SEND_FREECHAT_MESSAGE sP_CL2FE_REQ_SEND_FREECHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE sP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_PC_REGEN sP_CL2FE_REQ_PC_REGEN; -typedef struct sP_CL2FE_REQ_ITEM_MOVE sP_CL2FE_REQ_ITEM_MOVE; -typedef struct sP_CL2FE_REQ_PC_TASK_START sP_CL2FE_REQ_PC_TASK_START; -typedef struct sP_CL2FE_REQ_PC_TASK_END sP_CL2FE_REQ_PC_TASK_END; -typedef struct sP_CL2FE_REQ_NANO_EQUIP sP_CL2FE_REQ_NANO_EQUIP; -typedef struct sP_CL2FE_REQ_NANO_UNEQUIP sP_CL2FE_REQ_NANO_UNEQUIP; -typedef struct sP_CL2FE_REQ_NANO_ACTIVE sP_CL2FE_REQ_NANO_ACTIVE; -typedef struct sP_CL2FE_REQ_NANO_TUNE sP_CL2FE_REQ_NANO_TUNE; -typedef struct sP_CL2FE_REQ_NANO_SKILL_USE sP_CL2FE_REQ_NANO_SKILL_USE; -typedef struct sP_CL2FE_REQ_PC_TASK_STOP sP_CL2FE_REQ_PC_TASK_STOP; -typedef struct sP_CL2FE_REQ_PC_TASK_CONTINUE sP_CL2FE_REQ_PC_TASK_CONTINUE; -typedef struct sP_CL2FE_REQ_PC_GOTO sP_CL2FE_REQ_PC_GOTO; -typedef struct sP_CL2FE_REQ_CHARGE_NANO_STAMINA sP_CL2FE_REQ_CHARGE_NANO_STAMINA; -typedef struct sP_CL2FE_REQ_PC_KILL_QUEST_NPCs sP_CL2FE_REQ_PC_KILL_QUEST_NPCs; -typedef struct sP_CL2FE_REQ_PC_VENDOR_ITEM_BUY sP_CL2FE_REQ_PC_VENDOR_ITEM_BUY; -typedef struct sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL; -typedef struct sP_CL2FE_REQ_PC_ITEM_DELETE sP_CL2FE_REQ_PC_ITEM_DELETE; -typedef struct sP_CL2FE_REQ_PC_GIVE_ITEM sP_CL2FE_REQ_PC_GIVE_ITEM; -typedef struct sP_CL2FE_REQ_PC_ROCKET_STYLE_READY sP_CL2FE_REQ_PC_ROCKET_STYLE_READY; -typedef struct sP_CL2FE_REQ_PC_ROCKET_STYLE_FIRE sP_CL2FE_REQ_PC_ROCKET_STYLE_FIRE; -typedef struct sP_CL2FE_REQ_PC_ROCKET_STYLE_HIT sP_CL2FE_REQ_PC_ROCKET_STYLE_HIT; -typedef struct sP_CL2FE_REQ_PC_GRENADE_STYLE_READY sP_CL2FE_REQ_PC_GRENADE_STYLE_READY; -typedef struct sP_CL2FE_REQ_PC_GRENADE_STYLE_FIRE sP_CL2FE_REQ_PC_GRENADE_STYLE_FIRE; -typedef struct sP_CL2FE_REQ_PC_GRENADE_STYLE_HIT sP_CL2FE_REQ_PC_GRENADE_STYLE_HIT; -typedef struct sP_CL2FE_REQ_PC_NANO_CREATE sP_CL2FE_REQ_PC_NANO_CREATE; -typedef struct sP_CL2FE_REQ_PC_TRADE_OFFER sP_CL2FE_REQ_PC_TRADE_OFFER; -typedef struct sP_CL2FE_REQ_PC_TRADE_OFFER_CANCEL sP_CL2FE_REQ_PC_TRADE_OFFER_CANCEL; -typedef struct sP_CL2FE_REQ_PC_TRADE_OFFER_ACCEPT sP_CL2FE_REQ_PC_TRADE_OFFER_ACCEPT; -typedef struct sP_CL2FE_REQ_PC_TRADE_OFFER_REFUSAL sP_CL2FE_REQ_PC_TRADE_OFFER_REFUSAL; -typedef struct sP_CL2FE_REQ_PC_TRADE_OFFER_ABORT sP_CL2FE_REQ_PC_TRADE_OFFER_ABORT; -typedef struct sP_CL2FE_REQ_PC_TRADE_CONFIRM sP_CL2FE_REQ_PC_TRADE_CONFIRM; -typedef struct sP_CL2FE_REQ_PC_TRADE_CONFIRM_CANCEL sP_CL2FE_REQ_PC_TRADE_CONFIRM_CANCEL; -typedef struct sP_CL2FE_REQ_PC_TRADE_CONFIRM_ABORT sP_CL2FE_REQ_PC_TRADE_CONFIRM_ABORT; -typedef struct sP_CL2FE_REQ_PC_TRADE_ITEM_REGISTER sP_CL2FE_REQ_PC_TRADE_ITEM_REGISTER; -typedef struct sP_CL2FE_REQ_PC_TRADE_ITEM_UNREGISTER sP_CL2FE_REQ_PC_TRADE_ITEM_UNREGISTER; -typedef struct sP_CL2FE_REQ_PC_TRADE_CASH_REGISTER sP_CL2FE_REQ_PC_TRADE_CASH_REGISTER; -typedef struct sP_CL2FE_REQ_PC_TRADE_EMOTES_CHAT sP_CL2FE_REQ_PC_TRADE_EMOTES_CHAT; -typedef struct sP_CL2FE_REQ_PC_BANK_OPEN sP_CL2FE_REQ_PC_BANK_OPEN; -typedef struct sP_CL2FE_REQ_PC_BANK_CLOSE sP_CL2FE_REQ_PC_BANK_CLOSE; -typedef struct sP_CL2FE_REQ_PC_VENDOR_START sP_CL2FE_REQ_PC_VENDOR_START; -typedef struct sP_CL2FE_REQ_PC_VENDOR_TABLE_UPDATE sP_CL2FE_REQ_PC_VENDOR_TABLE_UPDATE; -typedef struct sP_CL2FE_REQ_PC_VENDOR_ITEM_RESTORE_BUY sP_CL2FE_REQ_PC_VENDOR_ITEM_RESTORE_BUY; -typedef struct sP_CL2FE_REQ_PC_COMBAT_BEGIN sP_CL2FE_REQ_PC_COMBAT_BEGIN; -typedef struct sP_CL2FE_REQ_PC_COMBAT_END sP_CL2FE_REQ_PC_COMBAT_END; -typedef struct sP_CL2FE_REQ_REQUEST_MAKE_BUDDY sP_CL2FE_REQ_REQUEST_MAKE_BUDDY; -typedef struct sP_CL2FE_REQ_ACCEPT_MAKE_BUDDY sP_CL2FE_REQ_ACCEPT_MAKE_BUDDY; -typedef struct sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_GET_BUDDY_STYLE sP_CL2FE_REQ_GET_BUDDY_STYLE; -typedef struct sP_CL2FE_REQ_SET_BUDDY_BLOCK sP_CL2FE_REQ_SET_BUDDY_BLOCK; -typedef struct sP_CL2FE_REQ_REMOVE_BUDDY sP_CL2FE_REQ_REMOVE_BUDDY; -typedef struct sP_CL2FE_REQ_GET_BUDDY_STATE sP_CL2FE_REQ_GET_BUDDY_STATE; -typedef struct sP_CL2FE_REQ_PC_JUMPPAD sP_CL2FE_REQ_PC_JUMPPAD; -typedef struct sP_CL2FE_REQ_PC_LAUNCHER sP_CL2FE_REQ_PC_LAUNCHER; -typedef struct sP_CL2FE_REQ_PC_ZIPLINE sP_CL2FE_REQ_PC_ZIPLINE; -typedef struct sP_CL2FE_REQ_PC_MOVEPLATFORM sP_CL2FE_REQ_PC_MOVEPLATFORM; -typedef struct sP_CL2FE_REQ_PC_SLOPE sP_CL2FE_REQ_PC_SLOPE; -typedef struct sP_CL2FE_REQ_PC_STATE_CHANGE sP_CL2FE_REQ_PC_STATE_CHANGE; -typedef struct sP_CL2FE_REQ_PC_MAP_WARP sP_CL2FE_REQ_PC_MAP_WARP; -typedef struct sP_CL2FE_REQ_PC_GIVE_NANO sP_CL2FE_REQ_PC_GIVE_NANO; -typedef struct sP_CL2FE_REQ_NPC_SUMMON sP_CL2FE_REQ_NPC_SUMMON; -typedef struct sP_CL2FE_REQ_NPC_UNSUMMON sP_CL2FE_REQ_NPC_UNSUMMON; -typedef struct sP_CL2FE_REQ_ITEM_CHEST_OPEN sP_CL2FE_REQ_ITEM_CHEST_OPEN; -typedef struct sP_CL2FE_REQ_PC_GIVE_NANO_SKILL sP_CL2FE_REQ_PC_GIVE_NANO_SKILL; -typedef struct sP_CL2FE_DOT_DAMAGE_ONOFF sP_CL2FE_DOT_DAMAGE_ONOFF; -typedef struct sP_CL2FE_REQ_PC_VENDOR_BATTERY_BUY sP_CL2FE_REQ_PC_VENDOR_BATTERY_BUY; -typedef struct sP_CL2FE_REQ_PC_WARP_USE_NPC sP_CL2FE_REQ_PC_WARP_USE_NPC; -typedef struct sP_CL2FE_REQ_PC_GROUP_INVITE sP_CL2FE_REQ_PC_GROUP_INVITE; -typedef struct sP_CL2FE_REQ_PC_GROUP_INVITE_REFUSE sP_CL2FE_REQ_PC_GROUP_INVITE_REFUSE; -typedef struct sP_CL2FE_REQ_PC_GROUP_JOIN sP_CL2FE_REQ_PC_GROUP_JOIN; -typedef struct sP_CL2FE_REQ_PC_GROUP_LEAVE sP_CL2FE_REQ_PC_GROUP_LEAVE; -typedef struct sP_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT sP_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT; -typedef struct sP_CL2FE_REQ_PC_BUDDY_WARP sP_CL2FE_REQ_PC_BUDDY_WARP; -typedef struct sP_CL2FE_REQ_GET_MEMBER_STYLE sP_CL2FE_REQ_GET_MEMBER_STYLE; -typedef struct sP_CL2FE_REQ_GET_GROUP_STYLE sP_CL2FE_REQ_GET_GROUP_STYLE; -typedef struct sP_CL2FE_REQ_PC_CHANGE_MENTOR sP_CL2FE_REQ_PC_CHANGE_MENTOR; -typedef struct sP_CL2FE_REQ_GET_BUDDY_LOCATION sP_CL2FE_REQ_GET_BUDDY_LOCATION; -typedef struct sP_CL2FE_REQ_NPC_GROUP_SUMMON sP_CL2FE_REQ_NPC_GROUP_SUMMON; -typedef struct sP_CL2FE_REQ_PC_WARP_TO_PC sP_CL2FE_REQ_PC_WARP_TO_PC; -typedef struct sP_CL2FE_REQ_EP_RANK_GET_LIST sP_CL2FE_REQ_EP_RANK_GET_LIST; -typedef struct sP_CL2FE_REQ_EP_RANK_GET_DETAIL sP_CL2FE_REQ_EP_RANK_GET_DETAIL; -typedef struct sP_CL2FE_REQ_EP_RANK_GET_PC_INFO sP_CL2FE_REQ_EP_RANK_GET_PC_INFO; -typedef struct sP_CL2FE_REQ_EP_RACE_START sP_CL2FE_REQ_EP_RACE_START; -typedef struct sP_CL2FE_REQ_EP_RACE_END sP_CL2FE_REQ_EP_RACE_END; -typedef struct sP_CL2FE_REQ_EP_RACE_CANCEL sP_CL2FE_REQ_EP_RACE_CANCEL; -typedef struct sP_CL2FE_REQ_EP_GET_RING sP_CL2FE_REQ_EP_GET_RING; -typedef struct sP_CL2FE_REQ_IM_CHANGE_SWITCH_STATUS sP_CL2FE_REQ_IM_CHANGE_SWITCH_STATUS; -typedef struct sP_CL2FE_REQ_SHINY_PICKUP sP_CL2FE_REQ_SHINY_PICKUP; -typedef struct sP_CL2FE_REQ_SHINY_SUMMON sP_CL2FE_REQ_SHINY_SUMMON; -typedef struct sP_CL2FE_REQ_PC_MOVETRANSPORTATION sP_CL2FE_REQ_PC_MOVETRANSPORTATION; -typedef struct sP_CL2FE_REQ_SEND_ALL_GROUP_FREECHAT_MESSAGE sP_CL2FE_REQ_SEND_ALL_GROUP_FREECHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_SEND_ANY_GROUP_FREECHAT_MESSAGE sP_CL2FE_REQ_SEND_ANY_GROUP_FREECHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_BARKER sP_CL2FE_REQ_BARKER; -typedef struct sP_CL2FE_REQ_SEND_ALL_GROUP_MENUCHAT_MESSAGE sP_CL2FE_REQ_SEND_ALL_GROUP_MENUCHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_SEND_ANY_GROUP_MENUCHAT_MESSAGE sP_CL2FE_REQ_SEND_ANY_GROUP_MENUCHAT_MESSAGE; -typedef struct sP_CL2FE_REQ_REGIST_TRANSPORTATION_LOCATION sP_CL2FE_REQ_REGIST_TRANSPORTATION_LOCATION; -typedef struct sP_CL2FE_REQ_PC_WARP_USE_TRANSPORTATION sP_CL2FE_REQ_PC_WARP_USE_TRANSPORTATION; -typedef struct sP_CL2FE_GM_REQ_PC_SPECIAL_STATE_SWITCH sP_CL2FE_GM_REQ_PC_SPECIAL_STATE_SWITCH; -typedef struct sP_CL2FE_GM_REQ_PC_SET_VALUE sP_CL2FE_GM_REQ_PC_SET_VALUE; -typedef struct sP_CL2FE_GM_REQ_KICK_PLAYER sP_CL2FE_GM_REQ_KICK_PLAYER; -typedef struct sP_CL2FE_GM_REQ_TARGET_PC_TELEPORT sP_CL2FE_GM_REQ_TARGET_PC_TELEPORT; -typedef struct sP_CL2FE_GM_REQ_PC_LOCATION sP_CL2FE_GM_REQ_PC_LOCATION; -typedef struct sP_CL2FE_GM_REQ_PC_ANNOUNCE sP_CL2FE_GM_REQ_PC_ANNOUNCE; -typedef struct sP_CL2FE_REQ_SET_PC_BLOCK sP_CL2FE_REQ_SET_PC_BLOCK; -typedef struct sP_CL2FE_REQ_REGIST_RXCOM sP_CL2FE_REQ_REGIST_RXCOM; -typedef struct sP_CL2FE_GM_REQ_PC_MOTD_REGISTER sP_CL2FE_GM_REQ_PC_MOTD_REGISTER; -typedef struct sP_CL2FE_REQ_ITEM_USE sP_CL2FE_REQ_ITEM_USE; -typedef struct sP_CL2FE_REQ_WARP_USE_RECALL sP_CL2FE_REQ_WARP_USE_RECALL; -typedef struct sP_CL2FE_REP_LIVE_CHECK sP_CL2FE_REP_LIVE_CHECK; -typedef struct sP_CL2FE_REQ_PC_MISSION_COMPLETE sP_CL2FE_REQ_PC_MISSION_COMPLETE; -typedef struct sP_CL2FE_REQ_PC_TASK_COMPLETE sP_CL2FE_REQ_PC_TASK_COMPLETE; -typedef struct sP_CL2FE_REQ_NPC_INTERACTION sP_CL2FE_REQ_NPC_INTERACTION; -typedef struct sP_CL2FE_DOT_HEAL_ONOFF sP_CL2FE_DOT_HEAL_ONOFF; -typedef struct sP_CL2FE_REQ_PC_SPECIAL_STATE_SWITCH sP_CL2FE_REQ_PC_SPECIAL_STATE_SWITCH; -typedef struct sP_CL2FE_REQ_PC_EMAIL_UPDATE_CHECK sP_CL2FE_REQ_PC_EMAIL_UPDATE_CHECK; -typedef struct sP_CL2FE_REQ_PC_READ_EMAIL sP_CL2FE_REQ_PC_READ_EMAIL; -typedef struct sP_CL2FE_REQ_PC_RECV_EMAIL_PAGE_LIST sP_CL2FE_REQ_PC_RECV_EMAIL_PAGE_LIST; -typedef struct sP_CL2FE_REQ_PC_DELETE_EMAIL sP_CL2FE_REQ_PC_DELETE_EMAIL; -typedef struct sP_CL2FE_REQ_PC_SEND_EMAIL sP_CL2FE_REQ_PC_SEND_EMAIL; -typedef struct sP_CL2FE_REQ_PC_RECV_EMAIL_ITEM sP_CL2FE_REQ_PC_RECV_EMAIL_ITEM; -typedef struct sP_CL2FE_REQ_PC_RECV_EMAIL_CANDY sP_CL2FE_REQ_PC_RECV_EMAIL_CANDY; -typedef struct sP_CL2FE_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF sP_CL2FE_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF; -typedef struct sP_CL2FE_REQ_PC_SET_CURRENT_MISSION_ID sP_CL2FE_REQ_PC_SET_CURRENT_MISSION_ID; -typedef struct sP_CL2FE_REQ_NPC_GROUP_INVITE sP_CL2FE_REQ_NPC_GROUP_INVITE; -typedef struct sP_CL2FE_REQ_NPC_GROUP_KICK sP_CL2FE_REQ_NPC_GROUP_KICK; -typedef struct sP_CL2FE_REQ_PC_FIRST_USE_FLAG_SET sP_CL2FE_REQ_PC_FIRST_USE_FLAG_SET; -typedef struct sP_CL2FE_REQ_PC_TRANSPORT_WARP sP_CL2FE_REQ_PC_TRANSPORT_WARP; -typedef struct sP_CL2FE_REQ_PC_TIME_TO_GO_WARP sP_CL2FE_REQ_PC_TIME_TO_GO_WARP; -typedef struct sP_CL2FE_REQ_PC_RECV_EMAIL_ITEM_ALL sP_CL2FE_REQ_PC_RECV_EMAIL_ITEM_ALL; -typedef struct sP_CL2FE_REQ_CHANNEL_INFO sP_CL2FE_REQ_CHANNEL_INFO; -typedef struct sP_CL2FE_REQ_PC_CHANNEL_NUM sP_CL2FE_REQ_PC_CHANNEL_NUM; -typedef struct sP_CL2FE_REQ_PC_WARP_CHANNEL sP_CL2FE_REQ_PC_WARP_CHANNEL; -typedef struct sP_CL2FE_REQ_PC_LOADING_COMPLETE sP_CL2FE_REQ_PC_LOADING_COMPLETE; -typedef struct sP_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY sP_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY; -typedef struct sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY; -typedef struct sP_CL2FE_REQ_PC_ATTACK_CHARs sP_CL2FE_REQ_PC_ATTACK_CHARs; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_READY sP_CL2FE_PC_STREETSTALL_REQ_READY; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_CANCEL sP_CL2FE_PC_STREETSTALL_REQ_CANCEL; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_REGIST_ITEM sP_CL2FE_PC_STREETSTALL_REQ_REGIST_ITEM; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_UNREGIST_ITEM sP_CL2FE_PC_STREETSTALL_REQ_UNREGIST_ITEM; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_SALE_START sP_CL2FE_PC_STREETSTALL_REQ_SALE_START; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_ITEM_LIST sP_CL2FE_PC_STREETSTALL_REQ_ITEM_LIST; -typedef struct sP_CL2FE_PC_STREETSTALL_REQ_ITEM_BUY sP_CL2FE_PC_STREETSTALL_REQ_ITEM_BUY; -typedef struct sP_CL2FE_REQ_PC_ITEM_COMBINATION sP_CL2FE_REQ_PC_ITEM_COMBINATION; -typedef struct sP_CL2FE_GM_REQ_SET_PC_SKILL sP_CL2FE_GM_REQ_SET_PC_SKILL; -typedef struct sP_CL2FE_REQ_PC_SKILL_ADD sP_CL2FE_REQ_PC_SKILL_ADD; -typedef struct sP_CL2FE_REQ_PC_SKILL_DEL sP_CL2FE_REQ_PC_SKILL_DEL; -typedef struct sP_CL2FE_REQ_PC_SKILL_USE sP_CL2FE_REQ_PC_SKILL_USE; -typedef struct sP_CL2FE_REQ_PC_ROPE sP_CL2FE_REQ_PC_ROPE; -typedef struct sP_CL2FE_REQ_PC_BELT sP_CL2FE_REQ_PC_BELT; -typedef struct sP_CL2FE_REQ_PC_VEHICLE_ON sP_CL2FE_REQ_PC_VEHICLE_ON; -typedef struct sP_CL2FE_REQ_PC_VEHICLE_OFF sP_CL2FE_REQ_PC_VEHICLE_OFF; -typedef struct sP_CL2FE_REQ_PC_REGIST_QUICK_SLOT sP_CL2FE_REQ_PC_REGIST_QUICK_SLOT; -typedef struct sP_CL2FE_REQ_PC_DISASSEMBLE_ITEM sP_CL2FE_REQ_PC_DISASSEMBLE_ITEM; -typedef struct sP_CL2FE_GM_REQ_REWARD_RATE sP_CL2FE_GM_REQ_REWARD_RATE; -typedef struct sP_CL2FE_REQ_PC_ITEM_ENCHANT sP_CL2FE_REQ_PC_ITEM_ENCHANT; -typedef struct sP_CL2LS_REQ_LOGIN sP_CL2LS_REQ_LOGIN; -typedef struct sP_CL2LS_REQ_CHECK_CHAR_NAME sP_CL2LS_REQ_CHECK_CHAR_NAME; -typedef struct sP_CL2LS_REQ_SAVE_CHAR_NAME sP_CL2LS_REQ_SAVE_CHAR_NAME; -typedef struct sP_CL2LS_REQ_CHAR_CREATE sP_CL2LS_REQ_CHAR_CREATE; -typedef struct sP_CL2LS_REQ_CHAR_SELECT sP_CL2LS_REQ_CHAR_SELECT; -typedef struct sP_CL2LS_REQ_CHAR_DELETE sP_CL2LS_REQ_CHAR_DELETE; -typedef struct sP_CL2LS_REQ_SHARD_SELECT sP_CL2LS_REQ_SHARD_SELECT; -typedef struct sP_CL2LS_REQ_SHARD_LIST_INFO sP_CL2LS_REQ_SHARD_LIST_INFO; -typedef struct sP_CL2LS_CHECK_NAME_LIST sP_CL2LS_CHECK_NAME_LIST; -typedef struct sP_CL2LS_REQ_SAVE_CHAR_TUTOR sP_CL2LS_REQ_SAVE_CHAR_TUTOR; -typedef struct sP_CL2LS_REQ_PC_EXIT_DUPLICATE sP_CL2LS_REQ_PC_EXIT_DUPLICATE; -typedef struct sP_CL2LS_REP_LIVE_CHECK sP_CL2LS_REP_LIVE_CHECK; -typedef struct sP_CL2LS_REQ_CHANGE_CHAR_NAME sP_CL2LS_REQ_CHANGE_CHAR_NAME; -typedef struct sP_CL2LS_REQ_SERVER_SELECT sP_CL2LS_REQ_SERVER_SELECT; -typedef struct sPacket sPacket; -typedef struct sPacket_Full sPacket_Full; -typedef struct sPacket2x sPacket2x; -typedef struct sPacket2x_Full sPacket2x_Full; -typedef struct sP_FE2CL_ERROR sP_FE2CL_ERROR; -typedef struct sP_FE2CL_REP_PC_ENTER_FAIL sP_FE2CL_REP_PC_ENTER_FAIL; -typedef struct sP_FE2CL_REP_PC_ENTER_SUCC sP_FE2CL_REP_PC_ENTER_SUCC; -typedef struct sP_FE2CL_PC_NEW sP_FE2CL_PC_NEW; -typedef struct sP_FE2CL_REP_PC_EXIT_FAIL sP_FE2CL_REP_PC_EXIT_FAIL; -typedef struct sP_FE2CL_REP_PC_EXIT_SUCC sP_FE2CL_REP_PC_EXIT_SUCC; -typedef struct sP_FE2CL_PC_EXIT sP_FE2CL_PC_EXIT; -typedef struct sP_FE2CL_PC_AROUND sP_FE2CL_PC_AROUND; -typedef struct sP_FE2CL_PC_MOVE sP_FE2CL_PC_MOVE; -typedef struct sP_FE2CL_PC_STOP sP_FE2CL_PC_STOP; -typedef struct sP_FE2CL_PC_JUMP sP_FE2CL_PC_JUMP; -typedef struct sP_FE2CL_NPC_ENTER sP_FE2CL_NPC_ENTER; -typedef struct sP_FE2CL_NPC_EXIT sP_FE2CL_NPC_EXIT; -typedef struct sP_FE2CL_NPC_MOVE sP_FE2CL_NPC_MOVE; -typedef struct sP_FE2CL_NPC_NEW sP_FE2CL_NPC_NEW; -typedef struct sP_FE2CL_NPC_AROUND sP_FE2CL_NPC_AROUND; -typedef struct sP_FE2CL_AROUND_DEL_PC sP_FE2CL_AROUND_DEL_PC; -typedef struct sP_FE2CL_AROUND_DEL_NPC sP_FE2CL_AROUND_DEL_NPC; -typedef struct sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_PC_ATTACK_NPCs_SUCC sP_FE2CL_PC_ATTACK_NPCs_SUCC; -typedef struct sP_FE2CL_PC_ATTACK_NPCs sP_FE2CL_PC_ATTACK_NPCs; -typedef struct sP_FE2CL_NPC_ATTACK_PCs sP_FE2CL_NPC_ATTACK_PCs; -typedef struct sP_FE2CL_REP_PC_REGEN_SUCC sP_FE2CL_REP_PC_REGEN_SUCC; -typedef struct sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_PC_ITEM_MOVE_SUCC sP_FE2CL_PC_ITEM_MOVE_SUCC; -typedef struct sP_FE2CL_PC_EQUIP_CHANGE sP_FE2CL_PC_EQUIP_CHANGE; -typedef struct sP_FE2CL_REP_PC_TASK_START_SUCC sP_FE2CL_REP_PC_TASK_START_SUCC; -typedef struct sP_FE2CL_REP_PC_TASK_START_FAIL sP_FE2CL_REP_PC_TASK_START_FAIL; -typedef struct sP_FE2CL_REP_PC_TASK_END_SUCC sP_FE2CL_REP_PC_TASK_END_SUCC; -typedef struct sP_FE2CL_REP_PC_TASK_END_FAIL sP_FE2CL_REP_PC_TASK_END_FAIL; -typedef struct sP_FE2CL_NPC_SKILL_READY sP_FE2CL_NPC_SKILL_READY; -typedef struct sP_FE2CL_NPC_SKILL_FIRE sP_FE2CL_NPC_SKILL_FIRE; -typedef struct sP_FE2CL_NPC_SKILL_HIT sP_FE2CL_NPC_SKILL_HIT; -typedef struct sP_FE2CL_NPC_SKILL_CORRUPTION_READY sP_FE2CL_NPC_SKILL_CORRUPTION_READY; -typedef struct sP_FE2CL_NPC_SKILL_CORRUPTION_HIT sP_FE2CL_NPC_SKILL_CORRUPTION_HIT; -typedef struct sP_FE2CL_NPC_SKILL_CANCEL sP_FE2CL_NPC_SKILL_CANCEL; -typedef struct sP_FE2CL_REP_NANO_EQUIP_SUCC sP_FE2CL_REP_NANO_EQUIP_SUCC; -typedef struct sP_FE2CL_REP_NANO_UNEQUIP_SUCC sP_FE2CL_REP_NANO_UNEQUIP_SUCC; -typedef struct sP_FE2CL_REP_NANO_ACTIVE_SUCC sP_FE2CL_REP_NANO_ACTIVE_SUCC; -typedef struct sP_FE2CL_REP_NANO_TUNE_SUCC sP_FE2CL_REP_NANO_TUNE_SUCC; -typedef struct sP_FE2CL_NANO_ACTIVE sP_FE2CL_NANO_ACTIVE; -typedef struct sP_FE2CL_NANO_SKILL_USE_SUCC sP_FE2CL_NANO_SKILL_USE_SUCC; -typedef struct sP_FE2CL_NANO_SKILL_USE sP_FE2CL_NANO_SKILL_USE; -typedef struct sP_FE2CL_REP_PC_TASK_STOP_SUCC sP_FE2CL_REP_PC_TASK_STOP_SUCC; -typedef struct sP_FE2CL_REP_PC_TASK_STOP_FAIL sP_FE2CL_REP_PC_TASK_STOP_FAIL; -typedef struct sP_FE2CL_REP_PC_TASK_CONTINUE_SUCC sP_FE2CL_REP_PC_TASK_CONTINUE_SUCC; -typedef struct sP_FE2CL_REP_PC_TASK_CONTINUE_FAIL sP_FE2CL_REP_PC_TASK_CONTINUE_FAIL; -typedef struct sP_FE2CL_REP_PC_GOTO_SUCC sP_FE2CL_REP_PC_GOTO_SUCC; -typedef struct sP_FE2CL_REP_CHARGE_NANO_STAMINA sP_FE2CL_REP_CHARGE_NANO_STAMINA; -typedef struct sP_FE2CL_REP_PC_TICK sP_FE2CL_REP_PC_TICK; -typedef struct sP_FE2CL_REP_PC_KILL_QUEST_NPCs_SUCC sP_FE2CL_REP_PC_KILL_QUEST_NPCs_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_SUCC sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_FAIL sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_FAIL; -typedef struct sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_SUCC sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_FAIL sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_FAIL; -typedef struct sP_FE2CL_REP_PC_ITEM_DELETE_SUCC sP_FE2CL_REP_PC_ITEM_DELETE_SUCC; -typedef struct sP_FE2CL_PC_ROCKET_STYLE_READY sP_FE2CL_PC_ROCKET_STYLE_READY; -typedef struct sP_FE2CL_REP_PC_ROCKET_STYLE_FIRE_SUCC sP_FE2CL_REP_PC_ROCKET_STYLE_FIRE_SUCC; -typedef struct sP_FE2CL_PC_ROCKET_STYLE_FIRE sP_FE2CL_PC_ROCKET_STYLE_FIRE; -typedef struct sP_FE2CL_PC_ROCKET_STYLE_HIT sP_FE2CL_PC_ROCKET_STYLE_HIT; -typedef struct sP_FE2CL_PC_GRENADE_STYLE_READY sP_FE2CL_PC_GRENADE_STYLE_READY; -typedef struct sP_FE2CL_REP_PC_GRENADE_STYLE_FIRE_SUCC sP_FE2CL_REP_PC_GRENADE_STYLE_FIRE_SUCC; -typedef struct sP_FE2CL_PC_GRENADE_STYLE_FIRE sP_FE2CL_PC_GRENADE_STYLE_FIRE; -typedef struct sP_FE2CL_PC_GRENADE_STYLE_HIT sP_FE2CL_PC_GRENADE_STYLE_HIT; -typedef struct sP_FE2CL_REP_PC_TRADE_OFFER sP_FE2CL_REP_PC_TRADE_OFFER; -typedef struct sP_FE2CL_REP_PC_TRADE_OFFER_CANCEL sP_FE2CL_REP_PC_TRADE_OFFER_CANCEL; -typedef struct sP_FE2CL_REP_PC_TRADE_OFFER_SUCC sP_FE2CL_REP_PC_TRADE_OFFER_SUCC; -typedef struct sP_FE2CL_REP_PC_TRADE_OFFER_REFUSAL sP_FE2CL_REP_PC_TRADE_OFFER_REFUSAL; -typedef struct sP_FE2CL_REP_PC_TRADE_OFFER_ABORT sP_FE2CL_REP_PC_TRADE_OFFER_ABORT; -typedef struct sP_FE2CL_REP_PC_TRADE_CONFIRM sP_FE2CL_REP_PC_TRADE_CONFIRM; -typedef struct sP_FE2CL_REP_PC_TRADE_CONFIRM_CANCEL sP_FE2CL_REP_PC_TRADE_CONFIRM_CANCEL; -typedef struct sP_FE2CL_REP_PC_TRADE_CONFIRM_ABORT sP_FE2CL_REP_PC_TRADE_CONFIRM_ABORT; -typedef struct sP_FE2CL_REP_PC_TRADE_CONFIRM_SUCC sP_FE2CL_REP_PC_TRADE_CONFIRM_SUCC; -typedef struct sP_FE2CL_REP_PC_TRADE_CONFIRM_FAIL sP_FE2CL_REP_PC_TRADE_CONFIRM_FAIL; -typedef struct sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_SUCC sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_SUCC; -typedef struct sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_FAIL sP_FE2CL_REP_PC_TRADE_ITEM_REGISTER_FAIL; -typedef struct sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_SUCC sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_SUCC; -typedef struct sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_FAIL sP_FE2CL_REP_PC_TRADE_ITEM_UNREGISTER_FAIL; -typedef struct sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_SUCC sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_SUCC; -typedef struct sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_FAIL sP_FE2CL_REP_PC_TRADE_CASH_REGISTER_FAIL; -typedef struct sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT; -typedef struct sP_FE2CL_REP_PC_NANO_CREATE_SUCC sP_FE2CL_REP_PC_NANO_CREATE_SUCC; -typedef struct sP_FE2CL_REP_PC_NANO_CREATE_FAIL sP_FE2CL_REP_PC_NANO_CREATE_FAIL; -typedef struct sP_FE2CL_REP_NANO_TUNE_FAIL sP_FE2CL_REP_NANO_TUNE_FAIL; -typedef struct sP_FE2CL_REP_PC_BANK_OPEN_SUCC sP_FE2CL_REP_PC_BANK_OPEN_SUCC; -typedef struct sP_FE2CL_REP_PC_BANK_OPEN_FAIL sP_FE2CL_REP_PC_BANK_OPEN_FAIL; -typedef struct sP_FE2CL_REP_PC_BANK_CLOSE_SUCC sP_FE2CL_REP_PC_BANK_CLOSE_SUCC; -typedef struct sP_FE2CL_REP_PC_BANK_CLOSE_FAIL sP_FE2CL_REP_PC_BANK_CLOSE_FAIL; -typedef struct sP_FE2CL_REP_PC_VENDOR_START_SUCC sP_FE2CL_REP_PC_VENDOR_START_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_START_FAIL sP_FE2CL_REP_PC_VENDOR_START_FAIL; -typedef struct sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_SUCC sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_FAIL sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_FAIL; -typedef struct sP_FE2CL_REP_PC_VENDOR_ITEM_RESTORE_BUY_SUCC sP_FE2CL_REP_PC_VENDOR_ITEM_RESTORE_BUY_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_ITEM_RESTORE_BUY_FAIL sP_FE2CL_REP_PC_VENDOR_ITEM_RESTORE_BUY_FAIL; -typedef struct sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT; -typedef struct sP_FE2CL_REP_PC_GIVE_ITEM_SUCC sP_FE2CL_REP_PC_GIVE_ITEM_SUCC; -typedef struct sP_FE2CL_REP_PC_GIVE_ITEM_FAIL sP_FE2CL_REP_PC_GIVE_ITEM_FAIL; -typedef struct sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC; -typedef struct sP_FE2CL_REP_PC_BUDDYLIST_INFO_FAIL sP_FE2CL_REP_PC_BUDDYLIST_INFO_FAIL; -typedef struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC; -typedef struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_FAIL sP_FE2CL_REP_REQUEST_MAKE_BUDDY_FAIL; -typedef struct sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC; -typedef struct sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL; -typedef struct sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_REP_GET_BUDDY_STYLE_SUCC sP_FE2CL_REP_GET_BUDDY_STYLE_SUCC; -typedef struct sP_FE2CL_REP_GET_BUDDY_STYLE_FAIL sP_FE2CL_REP_GET_BUDDY_STYLE_FAIL; -typedef struct sP_FE2CL_REP_GET_BUDDY_STATE_SUCC sP_FE2CL_REP_GET_BUDDY_STATE_SUCC; -typedef struct sP_FE2CL_REP_GET_BUDDY_STATE_FAIL sP_FE2CL_REP_GET_BUDDY_STATE_FAIL; -typedef struct sP_FE2CL_REP_SET_BUDDY_BLOCK_SUCC sP_FE2CL_REP_SET_BUDDY_BLOCK_SUCC; -typedef struct sP_FE2CL_REP_SET_BUDDY_BLOCK_FAIL sP_FE2CL_REP_SET_BUDDY_BLOCK_FAIL; -typedef struct sP_FE2CL_REP_REMOVE_BUDDY_SUCC sP_FE2CL_REP_REMOVE_BUDDY_SUCC; -typedef struct sP_FE2CL_REP_REMOVE_BUDDY_FAIL sP_FE2CL_REP_REMOVE_BUDDY_FAIL; -typedef struct sP_FE2CL_PC_JUMPPAD sP_FE2CL_PC_JUMPPAD; -typedef struct sP_FE2CL_PC_LAUNCHER sP_FE2CL_PC_LAUNCHER; -typedef struct sP_FE2CL_PC_ZIPLINE sP_FE2CL_PC_ZIPLINE; -typedef struct sP_FE2CL_PC_MOVEPLATFORM sP_FE2CL_PC_MOVEPLATFORM; -typedef struct sP_FE2CL_PC_SLOPE sP_FE2CL_PC_SLOPE; -typedef struct sP_FE2CL_PC_STATE_CHANGE sP_FE2CL_PC_STATE_CHANGE; -typedef struct sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER; -typedef struct sP_FE2CL_REP_REWARD_ITEM sP_FE2CL_REP_REWARD_ITEM; -typedef struct sP_FE2CL_REP_ITEM_CHEST_OPEN_SUCC sP_FE2CL_REP_ITEM_CHEST_OPEN_SUCC; -typedef struct sP_FE2CL_REP_ITEM_CHEST_OPEN_FAIL sP_FE2CL_REP_ITEM_CHEST_OPEN_FAIL; -typedef struct sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK; -typedef struct sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_SUCC sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_SUCC; -typedef struct sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_FAIL sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_FAIL; -typedef struct sP_FE2CL_NPC_ROCKET_STYLE_FIRE sP_FE2CL_NPC_ROCKET_STYLE_FIRE; -typedef struct sP_FE2CL_NPC_GRENADE_STYLE_FIRE sP_FE2CL_NPC_GRENADE_STYLE_FIRE; -typedef struct sP_FE2CL_NPC_BULLET_STYLE_HIT sP_FE2CL_NPC_BULLET_STYLE_HIT; -typedef struct sP_FE2CL_CHARACTER_ATTACK_CHARACTERs sP_FE2CL_CHARACTER_ATTACK_CHARACTERs; -typedef struct sP_FE2CL_PC_GROUP_INVITE sP_FE2CL_PC_GROUP_INVITE; -typedef struct sP_FE2CL_PC_GROUP_INVITE_FAIL sP_FE2CL_PC_GROUP_INVITE_FAIL; -typedef struct sP_FE2CL_PC_GROUP_INVITE_REFUSE sP_FE2CL_PC_GROUP_INVITE_REFUSE; -typedef struct sP_FE2CL_PC_GROUP_JOIN sP_FE2CL_PC_GROUP_JOIN; -typedef struct sP_FE2CL_PC_GROUP_JOIN_FAIL sP_FE2CL_PC_GROUP_JOIN_FAIL; -typedef struct sP_FE2CL_PC_GROUP_JOIN_SUCC sP_FE2CL_PC_GROUP_JOIN_SUCC; -typedef struct sP_FE2CL_PC_GROUP_LEAVE sP_FE2CL_PC_GROUP_LEAVE; -typedef struct sP_FE2CL_PC_GROUP_LEAVE_FAIL sP_FE2CL_PC_GROUP_LEAVE_FAIL; -typedef struct sP_FE2CL_PC_GROUP_LEAVE_SUCC sP_FE2CL_PC_GROUP_LEAVE_SUCC; -typedef struct sP_FE2CL_PC_GROUP_MEMBER_INFO sP_FE2CL_PC_GROUP_MEMBER_INFO; -typedef struct sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC; -typedef struct sP_FE2CL_REP_PC_WARP_USE_NPC_FAIL sP_FE2CL_REP_PC_WARP_USE_NPC_FAIL; -typedef struct sP_FE2CL_REP_PC_AVATAR_EMOTES_CHAT sP_FE2CL_REP_PC_AVATAR_EMOTES_CHAT; -typedef struct sP_FE2CL_REP_PC_CHANGE_MENTOR_SUCC sP_FE2CL_REP_PC_CHANGE_MENTOR_SUCC; -typedef struct sP_FE2CL_REP_PC_CHANGE_MENTOR_FAIL sP_FE2CL_REP_PC_CHANGE_MENTOR_FAIL; -typedef struct sP_FE2CL_REP_GET_MEMBER_STYLE_FAIL sP_FE2CL_REP_GET_MEMBER_STYLE_FAIL; -typedef struct sP_FE2CL_REP_GET_MEMBER_STYLE_SUCC sP_FE2CL_REP_GET_MEMBER_STYLE_SUCC; -typedef struct sP_FE2CL_REP_GET_GROUP_STYLE_FAIL sP_FE2CL_REP_GET_GROUP_STYLE_FAIL; -typedef struct sP_FE2CL_REP_GET_GROUP_STYLE_SUCC sP_FE2CL_REP_GET_GROUP_STYLE_SUCC; -typedef struct sP_FE2CL_PC_REGEN sP_FE2CL_PC_REGEN; -typedef struct sP_FE2CL_INSTANCE_MAP_INFO sP_FE2CL_INSTANCE_MAP_INFO; -typedef struct sP_FE2CL_TRANSPORTATION_ENTER sP_FE2CL_TRANSPORTATION_ENTER; -typedef struct sP_FE2CL_TRANSPORTATION_EXIT sP_FE2CL_TRANSPORTATION_EXIT; -typedef struct sP_FE2CL_TRANSPORTATION_MOVE sP_FE2CL_TRANSPORTATION_MOVE; -typedef struct sP_FE2CL_TRANSPORTATION_NEW sP_FE2CL_TRANSPORTATION_NEW; -typedef struct sP_FE2CL_TRANSPORTATION_AROUND sP_FE2CL_TRANSPORTATION_AROUND; -typedef struct sP_FE2CL_AROUND_DEL_TRANSPORTATION sP_FE2CL_AROUND_DEL_TRANSPORTATION; -typedef struct sP_FE2CL_REP_EP_RANK_LIST sP_FE2CL_REP_EP_RANK_LIST; -typedef struct sP_FE2CL_REP_EP_RANK_DETAIL sP_FE2CL_REP_EP_RANK_DETAIL; -typedef struct sP_FE2CL_REP_EP_RANK_PC_INFO sP_FE2CL_REP_EP_RANK_PC_INFO; -typedef struct sP_FE2CL_REP_EP_RACE_START_SUCC sP_FE2CL_REP_EP_RACE_START_SUCC; -typedef struct sP_FE2CL_REP_EP_RACE_START_FAIL sP_FE2CL_REP_EP_RACE_START_FAIL; -typedef struct sP_FE2CL_REP_EP_RACE_END_SUCC sP_FE2CL_REP_EP_RACE_END_SUCC; -typedef struct sP_FE2CL_REP_EP_RACE_END_FAIL sP_FE2CL_REP_EP_RACE_END_FAIL; -typedef struct sP_FE2CL_REP_EP_RACE_CANCEL_SUCC sP_FE2CL_REP_EP_RACE_CANCEL_SUCC; -typedef struct sP_FE2CL_REP_EP_RACE_CANCEL_FAIL sP_FE2CL_REP_EP_RACE_CANCEL_FAIL; -typedef struct sP_FE2CL_REP_EP_GET_RING_SUCC sP_FE2CL_REP_EP_GET_RING_SUCC; -typedef struct sP_FE2CL_REP_EP_GET_RING_FAIL sP_FE2CL_REP_EP_GET_RING_FAIL; -typedef struct sP_FE2CL_REP_IM_CHANGE_SWITCH_STATUS sP_FE2CL_REP_IM_CHANGE_SWITCH_STATUS; -typedef struct sP_FE2CL_SHINY_ENTER sP_FE2CL_SHINY_ENTER; -typedef struct sP_FE2CL_SHINY_EXIT sP_FE2CL_SHINY_EXIT; -typedef struct sP_FE2CL_SHINY_NEW sP_FE2CL_SHINY_NEW; -typedef struct sP_FE2CL_SHINY_AROUND sP_FE2CL_SHINY_AROUND; -typedef struct sP_FE2CL_AROUND_DEL_SHINY sP_FE2CL_AROUND_DEL_SHINY; -typedef struct sP_FE2CL_REP_SHINY_PICKUP_FAIL sP_FE2CL_REP_SHINY_PICKUP_FAIL; -typedef struct sP_FE2CL_REP_SHINY_PICKUP_SUCC sP_FE2CL_REP_SHINY_PICKUP_SUCC; -typedef struct sP_FE2CL_PC_MOVETRANSPORTATION sP_FE2CL_PC_MOVETRANSPORTATION; -typedef struct sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_ANY_GROUP_FREECHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_REP_BARKER sP_FE2CL_REP_BARKER; -typedef struct sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_SUCC sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_SUCC; -typedef struct sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_FAIL sP_FE2CL_REP_SEND_ANY_GROUP_MENUCHAT_MESSAGE_FAIL; -typedef struct sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_FAIL sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_FAIL; -typedef struct sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC sP_FE2CL_REP_PC_REGIST_TRANSPORTATION_LOCATION_SUCC; -typedef struct sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_FAIL sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_FAIL; -typedef struct sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC; -typedef struct sP_FE2CL_ANNOUNCE_MSG sP_FE2CL_ANNOUNCE_MSG; -typedef struct sP_FE2CL_REP_PC_SPECIAL_STATE_SWITCH_SUCC sP_FE2CL_REP_PC_SPECIAL_STATE_SWITCH_SUCC; -typedef struct sP_FE2CL_PC_SPECIAL_STATE_CHANGE sP_FE2CL_PC_SPECIAL_STATE_CHANGE; -typedef struct sP_FE2CL_GM_REP_PC_SET_VALUE sP_FE2CL_GM_REP_PC_SET_VALUE; -typedef struct sP_FE2CL_GM_PC_CHANGE_VALUE sP_FE2CL_GM_PC_CHANGE_VALUE; -typedef struct sP_FE2CL_GM_REP_PC_LOCATION sP_FE2CL_GM_REP_PC_LOCATION; -typedef struct sP_FE2CL_GM_REP_PC_ANNOUNCE sP_FE2CL_GM_REP_PC_ANNOUNCE; -typedef struct sP_FE2CL_REP_PC_BUDDY_WARP_FAIL sP_FE2CL_REP_PC_BUDDY_WARP_FAIL; -typedef struct sP_FE2CL_REP_PC_CHANGE_LEVEL sP_FE2CL_REP_PC_CHANGE_LEVEL; -typedef struct sP_FE2CL_REP_SET_PC_BLOCK_SUCC sP_FE2CL_REP_SET_PC_BLOCK_SUCC; -typedef struct sP_FE2CL_REP_SET_PC_BLOCK_FAIL sP_FE2CL_REP_SET_PC_BLOCK_FAIL; -typedef struct sP_FE2CL_REP_REGIST_RXCOM sP_FE2CL_REP_REGIST_RXCOM; -typedef struct sP_FE2CL_REP_REGIST_RXCOM_FAIL sP_FE2CL_REP_REGIST_RXCOM_FAIL; -typedef struct sP_FE2CL_PC_INVEN_FULL_MSG sP_FE2CL_PC_INVEN_FULL_MSG; -typedef struct sP_FE2CL_REQ_LIVE_CHECK sP_FE2CL_REQ_LIVE_CHECK; -typedef struct sP_FE2CL_PC_MOTD_LOGIN sP_FE2CL_PC_MOTD_LOGIN; -typedef struct sP_FE2CL_REP_PC_ITEM_USE_FAIL sP_FE2CL_REP_PC_ITEM_USE_FAIL; -typedef struct sP_FE2CL_REP_PC_ITEM_USE_SUCC sP_FE2CL_REP_PC_ITEM_USE_SUCC; -typedef struct sP_FE2CL_PC_ITEM_USE sP_FE2CL_PC_ITEM_USE; -typedef struct sP_FE2CL_REP_GET_BUDDY_LOCATION_SUCC sP_FE2CL_REP_GET_BUDDY_LOCATION_SUCC; -typedef struct sP_FE2CL_REP_GET_BUDDY_LOCATION_FAIL sP_FE2CL_REP_GET_BUDDY_LOCATION_FAIL; -typedef struct sP_FE2CL_REP_PC_RIDING_FAIL sP_FE2CL_REP_PC_RIDING_FAIL; -typedef struct sP_FE2CL_REP_PC_RIDING_SUCC sP_FE2CL_REP_PC_RIDING_SUCC; -typedef struct sP_FE2CL_PC_RIDING sP_FE2CL_PC_RIDING; -typedef struct sP_FE2CL_PC_BROOMSTICK_MOVE sP_FE2CL_PC_BROOMSTICK_MOVE; -typedef struct sP_FE2CL_REP_PC_BUDDY_WARP_OTHER_SHARD_SUCC sP_FE2CL_REP_PC_BUDDY_WARP_OTHER_SHARD_SUCC; -typedef struct sP_FE2CL_REP_WARP_USE_RECALL_FAIL sP_FE2CL_REP_WARP_USE_RECALL_FAIL; -typedef struct sP_FE2CL_REP_PC_EXIT_DUPLICATE sP_FE2CL_REP_PC_EXIT_DUPLICATE; -typedef struct sP_FE2CL_REP_PC_MISSION_COMPLETE_SUCC sP_FE2CL_REP_PC_MISSION_COMPLETE_SUCC; -typedef struct sP_FE2CL_PC_BUFF_UPDATE sP_FE2CL_PC_BUFF_UPDATE; -typedef struct sP_FE2CL_REP_PC_NEW_EMAIL sP_FE2CL_REP_PC_NEW_EMAIL; -typedef struct sP_FE2CL_REP_PC_READ_EMAIL_SUCC sP_FE2CL_REP_PC_READ_EMAIL_SUCC; -typedef struct sP_FE2CL_REP_PC_READ_EMAIL_FAIL sP_FE2CL_REP_PC_READ_EMAIL_FAIL; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_PAGE_LIST_SUCC sP_FE2CL_REP_PC_RECV_EMAIL_PAGE_LIST_SUCC; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_PAGE_LIST_FAIL sP_FE2CL_REP_PC_RECV_EMAIL_PAGE_LIST_FAIL; -typedef struct sP_FE2CL_REP_PC_DELETE_EMAIL_SUCC sP_FE2CL_REP_PC_DELETE_EMAIL_SUCC; -typedef struct sP_FE2CL_REP_PC_DELETE_EMAIL_FAIL sP_FE2CL_REP_PC_DELETE_EMAIL_FAIL; -typedef struct sP_FE2CL_REP_PC_SEND_EMAIL_SUCC sP_FE2CL_REP_PC_SEND_EMAIL_SUCC; -typedef struct sP_FE2CL_REP_PC_SEND_EMAIL_FAIL sP_FE2CL_REP_PC_SEND_EMAIL_FAIL; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_SUCC sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_SUCC; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_FAIL sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_FAIL; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_CANDY_SUCC sP_FE2CL_REP_PC_RECV_EMAIL_CANDY_SUCC; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_CANDY_FAIL sP_FE2CL_REP_PC_RECV_EMAIL_CANDY_FAIL; -typedef struct sP_FE2CL_PC_SUDDEN_DEAD sP_FE2CL_PC_SUDDEN_DEAD; -typedef struct sP_FE2CL_REP_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF_SUCC sP_FE2CL_REP_GM_REQ_TARGET_PC_SPECIAL_STATE_ONOFF_SUCC; -typedef struct sP_FE2CL_REP_PC_SET_CURRENT_MISSION_ID sP_FE2CL_REP_PC_SET_CURRENT_MISSION_ID; -typedef struct sP_FE2CL_REP_NPC_GROUP_INVITE_FAIL sP_FE2CL_REP_NPC_GROUP_INVITE_FAIL; -typedef struct sP_FE2CL_REP_NPC_GROUP_INVITE_SUCC sP_FE2CL_REP_NPC_GROUP_INVITE_SUCC; -typedef struct sP_FE2CL_REP_NPC_GROUP_KICK_FAIL sP_FE2CL_REP_NPC_GROUP_KICK_FAIL; -typedef struct sP_FE2CL_REP_NPC_GROUP_KICK_SUCC sP_FE2CL_REP_NPC_GROUP_KICK_SUCC; -typedef struct sP_FE2CL_PC_EVENT sP_FE2CL_PC_EVENT; -typedef struct sP_FE2CL_REP_PC_TRANSPORT_WARP_SUCC sP_FE2CL_REP_PC_TRANSPORT_WARP_SUCC; -typedef struct sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT_FAIL sP_FE2CL_REP_PC_TRADE_EMOTES_CHAT_FAIL; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_ALL_SUCC sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_ALL_SUCC; -typedef struct sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_ALL_FAIL sP_FE2CL_REP_PC_RECV_EMAIL_ITEM_ALL_FAIL; -typedef struct sP_FE2CL_REP_PC_LOADING_COMPLETE_SUCC sP_FE2CL_REP_PC_LOADING_COMPLETE_SUCC; -typedef struct sChannelInfo sChannelInfo; -typedef struct sP_FE2CL_REP_CHANNEL_INFO sP_FE2CL_REP_CHANNEL_INFO; -typedef struct sP_FE2CL_REP_PC_CHANNEL_NUM sP_FE2CL_REP_PC_CHANNEL_NUM; -typedef struct sP_FE2CL_REP_PC_WARP_CHANNEL_FAIL sP_FE2CL_REP_PC_WARP_CHANNEL_FAIL; -typedef struct sP_FE2CL_REP_PC_WARP_CHANNEL_SUCC sP_FE2CL_REP_PC_WARP_CHANNEL_SUCC; -typedef struct sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC; -typedef struct sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_FAIL sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_FAIL; -typedef struct sP_FE2CL_REP_PC_FIND_NAME_ACCEPT_BUDDY_FAIL sP_FE2CL_REP_PC_FIND_NAME_ACCEPT_BUDDY_FAIL; -typedef struct sP_FE2CL_REP_PC_BUDDY_WARP_SAME_SHARD_SUCC sP_FE2CL_REP_PC_BUDDY_WARP_SAME_SHARD_SUCC; -typedef struct sP_FE2CL_PC_ATTACK_CHARs_SUCC sP_FE2CL_PC_ATTACK_CHARs_SUCC; -typedef struct sP_FE2CL_PC_ATTACK_CHARs sP_FE2CL_PC_ATTACK_CHARs; -typedef struct sP_FE2CL_NPC_ATTACK_CHARs sP_FE2CL_NPC_ATTACK_CHARs; -typedef struct sP_FE2CL_REP_PC_CHANGE_LEVEL_SUCC sP_FE2CL_REP_PC_CHANGE_LEVEL_SUCC; -typedef struct sP_FE2CL_REP_PC_NANO_CREATE sP_FE2CL_REP_PC_NANO_CREATE; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_READY_SUCC sP_FE2CL_PC_STREETSTALL_REP_READY_SUCC; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_READY_FAIL sP_FE2CL_PC_STREETSTALL_REP_READY_FAIL; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_CANCEL_SUCC sP_FE2CL_PC_STREETSTALL_REP_CANCEL_SUCC; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_CANCEL_FAIL sP_FE2CL_PC_STREETSTALL_REP_CANCEL_FAIL; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_SUCC sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_SUCC; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_FAIL sP_FE2CL_PC_STREETSTALL_REP_REGIST_ITEM_FAIL; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_UNREGIST_ITEM_SUCC sP_FE2CL_PC_STREETSTALL_REP_UNREGIST_ITEM_SUCC; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_UNREGIST_ITEM_FAIL sP_FE2CL_PC_STREETSTALL_REP_UNREGIST_ITEM_FAIL; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_SALE_START_SUCC sP_FE2CL_PC_STREETSTALL_REP_SALE_START_SUCC; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_SALE_START_FAIL sP_FE2CL_PC_STREETSTALL_REP_SALE_START_FAIL; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_LIST sP_FE2CL_PC_STREETSTALL_REP_ITEM_LIST; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_LIST_FAIL sP_FE2CL_PC_STREETSTALL_REP_ITEM_LIST_FAIL; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_BUYER sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_BUYER; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_SELLER sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_SUCC_SELLER; -typedef struct sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_FAIL sP_FE2CL_PC_STREETSTALL_REP_ITEM_BUY_FAIL; -typedef struct sP_FE2CL_REP_PC_ITEM_COMBINATION_SUCC sP_FE2CL_REP_PC_ITEM_COMBINATION_SUCC; -typedef struct sP_FE2CL_REP_PC_ITEM_COMBINATION_FAIL sP_FE2CL_REP_PC_ITEM_COMBINATION_FAIL; -typedef struct sP_FE2CL_PC_CASH_BUFF_UPDATE sP_FE2CL_PC_CASH_BUFF_UPDATE; -typedef struct sP_FE2CL_REP_PC_SKILL_ADD_SUCC sP_FE2CL_REP_PC_SKILL_ADD_SUCC; -typedef struct sP_FE2CL_REP_PC_SKILL_ADD_FAIL sP_FE2CL_REP_PC_SKILL_ADD_FAIL; -typedef struct sP_FE2CL_REP_PC_SKILL_DEL_SUCC sP_FE2CL_REP_PC_SKILL_DEL_SUCC; -typedef struct sP_FE2CL_REP_PC_SKILL_DEL_FAIL sP_FE2CL_REP_PC_SKILL_DEL_FAIL; -typedef struct sP_FE2CL_REP_PC_SKILL_USE_SUCC sP_FE2CL_REP_PC_SKILL_USE_SUCC; -typedef struct sP_FE2CL_REP_PC_SKILL_USE_FAIL sP_FE2CL_REP_PC_SKILL_USE_FAIL; -typedef struct sP_FE2CL_PC_SKILL_USE sP_FE2CL_PC_SKILL_USE; -typedef struct sP_FE2CL_PC_ROPE sP_FE2CL_PC_ROPE; -typedef struct sP_FE2CL_PC_BELT sP_FE2CL_PC_BELT; -typedef struct sP_FE2CL_PC_VEHICLE_ON_SUCC sP_FE2CL_PC_VEHICLE_ON_SUCC; -typedef struct sP_FE2CL_PC_VEHICLE_ON_FAIL sP_FE2CL_PC_VEHICLE_ON_FAIL; -typedef struct sP_FE2CL_PC_VEHICLE_OFF_SUCC sP_FE2CL_PC_VEHICLE_OFF_SUCC; -typedef struct sP_FE2CL_PC_VEHICLE_OFF_FAIL sP_FE2CL_PC_VEHICLE_OFF_FAIL; -typedef struct sP_FE2CL_PC_QUICK_SLOT_INFO sP_FE2CL_PC_QUICK_SLOT_INFO; -typedef struct sP_FE2CL_REP_PC_REGIST_QUICK_SLOT_FAIL sP_FE2CL_REP_PC_REGIST_QUICK_SLOT_FAIL; -typedef struct sP_FE2CL_REP_PC_REGIST_QUICK_SLOT_SUCC sP_FE2CL_REP_PC_REGIST_QUICK_SLOT_SUCC; -typedef struct sP_FE2CL_PC_DELETE_TIME_LIMIT_ITEM sP_FE2CL_PC_DELETE_TIME_LIMIT_ITEM; -typedef struct sP_FE2CL_REP_PC_DISASSEMBLE_ITEM_SUCC sP_FE2CL_REP_PC_DISASSEMBLE_ITEM_SUCC; -typedef struct sP_FE2CL_REP_PC_DISASSEMBLE_ITEM_FAIL sP_FE2CL_REP_PC_DISASSEMBLE_ITEM_FAIL; -typedef struct sP_FE2CL_GM_REP_REWARD_RATE_SUCC sP_FE2CL_GM_REP_REWARD_RATE_SUCC; -typedef struct sP_FE2CL_REP_PC_ITEM_ENCHANT_SUCC sP_FE2CL_REP_PC_ITEM_ENCHANT_SUCC; -typedef struct sP_FE2CL_REP_PC_ITEM_ENCHANT_FAIL sP_FE2CL_REP_PC_ITEM_ENCHANT_FAIL; -typedef struct sP_LS2CL_REP_LOGIN_SUCC sP_LS2CL_REP_LOGIN_SUCC; -typedef struct sP_LS2CL_REP_LOGIN_FAIL sP_LS2CL_REP_LOGIN_FAIL; -typedef struct sP_LS2CL_REP_CHAR_INFO sP_LS2CL_REP_CHAR_INFO; -typedef struct sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC; -typedef struct sP_LS2CL_REP_CHECK_CHAR_NAME_FAIL sP_LS2CL_REP_CHECK_CHAR_NAME_FAIL; -typedef struct sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC; -typedef struct sP_LS2CL_REP_SAVE_CHAR_NAME_FAIL sP_LS2CL_REP_SAVE_CHAR_NAME_FAIL; -typedef struct sP_LS2CL_REP_CHAR_CREATE_SUCC sP_LS2CL_REP_CHAR_CREATE_SUCC; -typedef struct sP_LS2CL_REP_CHAR_CREATE_FAIL sP_LS2CL_REP_CHAR_CREATE_FAIL; -typedef struct sP_LS2CL_REP_CHAR_SELECT_SUCC sP_LS2CL_REP_CHAR_SELECT_SUCC; -typedef struct sP_LS2CL_REP_CHAR_SELECT_FAIL sP_LS2CL_REP_CHAR_SELECT_FAIL; -typedef struct sP_LS2CL_REP_CHAR_DELETE_SUCC sP_LS2CL_REP_CHAR_DELETE_SUCC; -typedef struct sP_LS2CL_REP_CHAR_DELETE_FAIL sP_LS2CL_REP_CHAR_DELETE_FAIL; -typedef struct sP_LS2CL_REP_SHARD_SELECT_SUCC sP_LS2CL_REP_SHARD_SELECT_SUCC; -typedef struct sP_LS2CL_REP_SHARD_SELECT_FAIL sP_LS2CL_REP_SHARD_SELECT_FAIL; -typedef struct sP_LS2CL_REP_VERSION_CHECK_SUCC sP_LS2CL_REP_VERSION_CHECK_SUCC; -typedef struct sP_LS2CL_REP_VERSION_CHECK_FAIL sP_LS2CL_REP_VERSION_CHECK_FAIL; -typedef struct sP_LS2CL_REP_CHECK_NAME_LIST_SUCC sP_LS2CL_REP_CHECK_NAME_LIST_SUCC; -typedef struct sP_LS2CL_REP_CHECK_NAME_LIST_FAIL sP_LS2CL_REP_CHECK_NAME_LIST_FAIL; -typedef struct sP_LS2CL_REP_PC_EXIT_DUPLICATE sP_LS2CL_REP_PC_EXIT_DUPLICATE; -typedef struct sP_LS2CL_REQ_LIVE_CHECK sP_LS2CL_REQ_LIVE_CHECK; -typedef struct sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC; -typedef struct sP_LS2CL_REP_CHANGE_CHAR_NAME_FAIL sP_LS2CL_REP_CHANGE_CHAR_NAME_FAIL; -typedef struct sP_LS2CL_REP_SHARD_LIST_INFO_SUCC sP_LS2CL_REP_SHARD_LIST_INFO_SUCC; -typedef struct sPCStyle sPCStyle; -typedef struct sPCStyle2 sPCStyle2; -typedef struct sRunningQuest sRunningQuest; -typedef struct sOnItem sOnItem; -typedef struct sOnItem_Index sOnItem_Index; -typedef struct sItemBase sItemBase; -typedef struct sItemTrade sItemTrade; -typedef struct sItemVendor sItemVendor; -typedef struct sItemReward sItemReward; -typedef struct sTimeLimitItemDeleteInfo2CL sTimeLimitItemDeleteInfo2CL; -typedef struct sNanoTuneNeedItemInfo2CL sNanoTuneNeedItemInfo2CL; -typedef struct sEmailItemInfoFromCL sEmailItemInfoFromCL; -typedef struct sEPRecord sEPRecord; -typedef struct sBuddyBaseInfo sBuddyBaseInfo; -typedef struct sBuddyStyleInfo sBuddyStyleInfo; -typedef struct sSYSTEMTIME sSYSTEMTIME; -typedef struct sEmailInfo sEmailInfo; -typedef struct sNano sNano; -typedef struct sNanoBank sNanoBank; -typedef struct sTimeBuff sTimeBuff; -typedef struct sTimeBuff_Svr sTimeBuff_Svr; -typedef struct sPCLoadData2CL sPCLoadData2CL; -typedef struct sPCAppearanceData sPCAppearanceData; -typedef struct sNPCAppearanceData sNPCAppearanceData; -typedef struct sBulletAppearanceData sBulletAppearanceData; -typedef struct sTransportationLoadData sTransportationLoadData; -typedef struct sTransportationAppearanceData sTransportationAppearanceData; -typedef struct sShinyAppearanceData sShinyAppearanceData; -typedef struct sAttackResult sAttackResult; -typedef struct sCAttackResult sCAttackResult; -typedef struct sSkillResult_Damage sSkillResult_Damage; -typedef struct sSkillResult_DotDamage sSkillResult_DotDamage; -typedef struct sSkillResult_Heal_HP sSkillResult_Heal_HP; -typedef struct sSkillResult_Heal_Stamina sSkillResult_Heal_Stamina; -typedef struct sSkillResult_Stamina_Self sSkillResult_Stamina_Self; -typedef struct sSkillResult_Damage_N_Debuff sSkillResult_Damage_N_Debuff; -typedef struct sSkillResult_Buff sSkillResult_Buff; -typedef struct sSkillResult_BatteryDrain sSkillResult_BatteryDrain; -typedef struct sSkillResult_Damage_N_Move sSkillResult_Damage_N_Move; -typedef struct sSkillResult_Move sSkillResult_Move; -typedef struct sSkillResult_Resurrect sSkillResult_Resurrect; -typedef struct sPC_HP sPC_HP; -typedef struct sPC_BATTERYs sPC_BATTERYs; -typedef struct sPC_NanoSlots sPC_NanoSlots; -typedef struct sPC_Nano sPC_Nano; -typedef struct sPCRegenData sPCRegenData; -typedef struct sPCRegenDataForOtherPC sPCRegenDataForOtherPC; -typedef struct sPCBullet sPCBullet; -typedef struct sNPCBullet sNPCBullet; -typedef struct sNPCLocationData sNPCLocationData; -typedef struct sGroupNPCLocationData sGroupNPCLocationData; -typedef struct sPCGroupMemberInfo sPCGroupMemberInfo; -typedef struct sNPCGroupMemberInfo sNPCGroupMemberInfo; -typedef struct sEPElement sEPElement; -typedef struct sCNStreetStall_ItemInfo_for_Client sCNStreetStall_ItemInfo_for_Client; -typedef struct sQuickSlot sQuickSlot; ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 static_assert(sizeof(sP_CL2FE_REQ_PC_ENTER) == 80 || sizeof(sP_CL2FE_REQ_PC_ENTER) == 0); static_assert(sizeof(sP_CL2FE_REQ_PC_EXIT) == 4 || sizeof(sP_CL2FE_REQ_PC_EXIT) == 0); static_assert(sizeof(sP_CL2FE_REQ_PC_MOVE) == 44 || sizeof(sP_CL2FE_REQ_PC_MOVE) == 0); @@ -8068,8 +4837,4 @@ static_assert(sizeof(sPCGroupMemberInfo) == 112 || sizeof(sPCGroupMemberInfo) == static_assert(sizeof(sNPCGroupMemberInfo) == 32 || sizeof(sNPCGroupMemberInfo) == 0); static_assert(sizeof(sEPElement) == 36 || sizeof(sEPElement) == 0); static_assert(sizeof(sCNStreetStall_ItemInfo_for_Client) == 20 || sizeof(sCNStreetStall_ItemInfo_for_Client) == 0); -<<<<<<< HEAD -static_assert(sizeof(sQuickSlot) == 4 || sizeof(sQuickSlot) == 0); -======= -static_assert(sizeof(sQuickSlot) == 4 || sizeof(sQuickSlot) == 0); ->>>>>>> a0065c2050c1b0f8d680b3399e1838989b6f5191 +static_assert(sizeof(sQuickSlot) == 4 || sizeof(sQuickSlot) == 0); \ No newline at end of file