From bb2bed7b00dc17e55516c9d412a534b5c8861eca Mon Sep 17 00:00:00 2001 From: Uleat Date: Fri, 3 Oct 2014 02:03:48 -0400 Subject: [PATCH] Fixed OP_AugmentInfo packet processing that I broked'd --- changelog.txt | 3 +++ common/eq_packet_structs.h | 6 +++--- common/patches/client62.cpp | 5 ----- common/patches/client62_ops.h | 1 - common/patches/client62_structs.h | 5 ----- common/patches/rof_structs.h | 6 +++--- common/patches/sod_structs.h | 6 +++--- common/patches/sof_structs.h | 6 +++--- common/patches/titanium.cpp | 3 --- common/patches/titanium_ops.h | 1 - common/patches/underfoot_structs.h | 6 +++--- 11 files changed, 18 insertions(+), 30 deletions(-) diff --git a/changelog.txt b/changelog.txt index 81233fcd7..b31afa449 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 10/03/2014 == +Uleat: Fixed Ti(6.2) OP_AugmentInfo translation that I broke (does not currently need and I mis-read a process) + == 10/02/2014 == Uleat: First round of Ti/6.2 translators added - needed for re-enumeration diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index 47516b24a..8e5588e5c 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -4312,9 +4312,9 @@ struct ControlBoat_Struct { struct AugmentInfo_Struct { -/*000*/ uint32 itemid; // id of the solvent needed -/*004*/ uint8 window; // window to display the information in -/*005*/ uint8 unknown005[67]; // total packet length 72, all the rest were always 00 +/*000*/ uint32 itemid; // id of the solvent needed +/*004*/ uint8 window; // window to display the information in +/*005*/ uint8 unknown005[67]; // total packet length 72, all the rest were always 00 /*072*/ }; diff --git a/common/patches/client62.cpp b/common/patches/client62.cpp index bbc8757d0..d9def3dbb 100644 --- a/common/patches/client62.cpp +++ b/common/patches/client62.cpp @@ -990,11 +990,6 @@ namespace Client62 FINISH_DIRECT_DECODE(); } -#if 0 - // needs to be tested (and OpCode found) - DECODE(OP_AugmentInfo) { DECODE_FORWARD(OP_ReadBook); } -#endif - DECODE(OP_AugmentItem) { DECODE_LENGTH_EXACT(structs::AugmentItem_Struct); diff --git a/common/patches/client62_ops.h b/common/patches/client62_ops.h index 0ff0cdaa7..eb7ff2205 100644 --- a/common/patches/client62_ops.h +++ b/common/patches/client62_ops.h @@ -34,7 +34,6 @@ E(OP_ZoneSpawns) // incoming packets that require a DECODE translation: D(OP_AdventureMerchantSell) D(OP_ApplyPoison) -//D(OP_AugmentInfo) - needs opcode for conf file update D(OP_AugmentItem) D(OP_CastSpell) D(OP_CharacterCreate) diff --git a/common/patches/client62_structs.h b/common/patches/client62_structs.h index 70f05859e..24e273682 100644 --- a/common/patches/client62_structs.h +++ b/common/patches/client62_structs.h @@ -3099,11 +3099,6 @@ struct GuildMemberUpdate_Struct { /*72*/ uint32 unknown072; }; - - - - - }; //end namespace structs }; //end namespace Client62 diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h index 9cec4f5fa..0549b4b58 100644 --- a/common/patches/rof_structs.h +++ b/common/patches/rof_structs.h @@ -4585,9 +4585,9 @@ struct ItemQuaternaryBodyStruct struct AugmentInfo_Struct { -/*000*/ uint32 itemid; // id of the solvent needed -/*004*/ uint8 window; // window to display the information in -/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 +/*000*/ uint32 itemid; // id of the solvent needed +/*004*/ uint8 window; // window to display the information in +/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 /*076*/ }; diff --git a/common/patches/sod_structs.h b/common/patches/sod_structs.h index ea4726a62..64d907c5b 100644 --- a/common/patches/sod_structs.h +++ b/common/patches/sod_structs.h @@ -4109,9 +4109,9 @@ struct ItemQuaternaryBodyStruct struct AugmentInfo_Struct { -/*000*/ uint32 itemid; // id of the solvent needed -/*004*/ uint8 window; // window to display the information in -/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 +/*000*/ uint32 itemid; // id of the solvent needed +/*004*/ uint8 window; // window to display the information in +/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 /*076*/ }; diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h index 0beb17db6..5164af3eb 100644 --- a/common/patches/sof_structs.h +++ b/common/patches/sof_structs.h @@ -3963,9 +3963,9 @@ struct ItemQuaternaryBodyStruct struct AugmentInfo_Struct { -/*000*/ uint32 itemid; // id of the solvent needed -/*004*/ uint8 window; // window to display the information in -/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 +/*000*/ uint32 itemid; // id of the solvent needed +/*004*/ uint8 window; // window to display the information in +/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 /*076*/ }; diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 92695f7a1..d0235049d 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -1347,9 +1347,6 @@ namespace Titanium FINISH_DIRECT_DECODE(); } - // needs to be tested - DECODE(OP_AugmentInfo) { DECODE_FORWARD(OP_ReadBook); } - DECODE(OP_AugmentItem) { DECODE_LENGTH_EXACT(structs::AugmentItem_Struct); diff --git a/common/patches/titanium_ops.h b/common/patches/titanium_ops.h index 2aa3d8071..338558602 100644 --- a/common/patches/titanium_ops.h +++ b/common/patches/titanium_ops.h @@ -47,7 +47,6 @@ E(OP_ZoneSpawns) // incoming packets that require a DECODE translation: D(OP_AdventureMerchantSell) D(OP_ApplyPoison) -D(OP_AugmentInfo) D(OP_AugmentItem) D(OP_CastSpell) D(OP_CharacterCreate) diff --git a/common/patches/underfoot_structs.h b/common/patches/underfoot_structs.h index f7716834b..ab263d6c4 100644 --- a/common/patches/underfoot_structs.h +++ b/common/patches/underfoot_structs.h @@ -4160,9 +4160,9 @@ struct ItemQuaternaryBodyStruct struct AugmentInfo_Struct { -/*000*/ uint32 itemid; // id of the solvent needed -/*004*/ uint8 window; // window to display the information in -/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 +/*000*/ uint32 itemid; // id of the solvent needed +/*004*/ uint8 window; // window to display the information in +/*005*/ uint8 unknown005[71]; // total packet length 76, all the rest were always 00 /*076*/ };