From a9093e9015324199190aa929d81cc6f8d05634d2 Mon Sep 17 00:00:00 2001 From: Gtker Date: Sat, 19 Nov 2022 17:06:45 +0100 Subject: [PATCH] woww: Add layout for SMSG_PLAYER_SKINNED --- epan/dissectors/packet-woww.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/epan/dissectors/packet-woww.c b/epan/dissectors/packet-woww.c index a1b1db7ac0..128d1e497f 100644 --- a/epan/dissectors/packet-woww.c +++ b/epan/dissectors/packet-woww.c @@ -751,6 +751,7 @@ static int hf_woww_spell_trigger = -1; static int hf_woww_spell_visual_kit = -1; static int hf_woww_spells = -1; static int hf_woww_spirit = -1; +static int hf_woww_spirit_released = -1; static int hf_woww_spline_elevation = -1; static int hf_woww_spline_flag = -1; static int hf_woww_spline_id = -1; @@ -876,7 +877,6 @@ static int hf_woww_yesterday_honor = -1; static int hf_woww_yesterday_honorable = -1; static int hf_woww_z = -1; static int hf_woww_z_speed = -1; -static int hf_woww_zone_id = -1; static int hf_woww_zone_or_sort = -1; static int hf_woww_zones = -1; /* AUTOGENERATED_END_HF */ @@ -14497,6 +14497,9 @@ add_body_fields(guint32 opcode, ptvcursor_add(ptv, hf_woww_guid, 8, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_area, 4, ENC_LITTLE_ENDIAN); break; + case SMSG_PLAYER_SKINNED: + ptvcursor_add(ptv, hf_woww_spirit_released, 1, ENC_NA); + break; case SMSG_PLAY_MUSIC: ptvcursor_add(ptv, hf_woww_sound_id, 4, ENC_LITTLE_ENDIAN); break; @@ -14846,8 +14849,8 @@ add_body_fields(guint32 opcode, ptvcursor_add(ptv, hf_woww_spell_school, 4, ENC_LITTLE_ENDIAN); break; case SMSG_SPELLDISPELLOG: - ptvcursor_add(ptv, hf_woww_victim, 8, ENC_LITTLE_ENDIAN); - ptvcursor_add(ptv, hf_woww_caster, 8, ENC_LITTLE_ENDIAN); + add_packed_guid(ptv, pinfo); + add_packed_guid(ptv, pinfo); ptvcursor_add_ret_uint(ptv, hf_woww_amount_of_spells, 4, ENC_LITTLE_ENDIAN, &amount_of_spells); for (i = 0; i < amount_of_spells; ++i) { ptvcursor_add(ptv, hf_woww_spells, 4, ENC_LITTLE_ENDIAN); @@ -15000,7 +15003,7 @@ add_body_fields(guint32 opcode, ptvcursor_add(ptv, hf_woww_delay_time, 4, ENC_LITTLE_ENDIAN); break; case SMSG_SPELL_FAILED_OTHER: - ptvcursor_add(ptv, hf_woww_caster_guid, 8, ENC_LITTLE_ENDIAN); + ptvcursor_add(ptv, hf_woww_caster, 8, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_id, 4, ENC_LITTLE_ENDIAN); break; case SMSG_SPELL_FAILURE: @@ -15194,7 +15197,7 @@ add_body_fields(guint32 opcode, break; case SMSG_SUMMON_REQUEST: ptvcursor_add(ptv, hf_woww_summoner_guid, 8, ENC_LITTLE_ENDIAN); - ptvcursor_add(ptv, hf_woww_zone_id, 4, ENC_LITTLE_ENDIAN); + ptvcursor_add(ptv, hf_woww_area, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_auto_decline_time_in_msecs, 4, ENC_LITTLE_ENDIAN); break; case SMSG_SUPERCEDED_SPELL: @@ -19796,6 +19799,12 @@ proto_register_woww(void) NULL, HFILL } }, + { &hf_woww_spirit_released, + { "Spirit Released", "woww.spirit.released", + FT_UINT8, BASE_HEX_DEC, NULL, 0, + NULL, HFILL + } + }, { &hf_woww_spline_elevation, { "Spline Elevation", "woww.spline.elevation", FT_FLOAT, BASE_NONE, NULL, 0, @@ -20546,12 +20555,6 @@ proto_register_woww(void) NULL, HFILL } }, - { &hf_woww_zone_id, - { "Zone Id", "woww.zone.id", - FT_UINT32, BASE_HEX_DEC, NULL, 0, - NULL, HFILL - } - }, { &hf_woww_zone_or_sort, { "Zone Or Sort", "woww.zone.or.sort", FT_UINT32, BASE_HEX_DEC, NULL, 0,