From da8a0e64f3a66f390b9587e29ec892d8f9dca4c8 Mon Sep 17 00:00:00 2001 From: Gtker Date: Mon, 24 Oct 2022 22:36:19 +0200 Subject: [PATCH] woww: Remove _guid from some HFs --- epan/dissectors/packet-woww.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/epan/dissectors/packet-woww.c b/epan/dissectors/packet-woww.c index c25845f849..99c54e2ba7 100644 --- a/epan/dissectors/packet-woww.c +++ b/epan/dissectors/packet-woww.c @@ -489,7 +489,7 @@ static int hf_woww_lock_id = -1; static int hf_woww_log_format = -1; static int hf_woww_logout_result = -1; static int hf_woww_logout_speed = -1; -static int hf_woww_loot_guid = -1; +static int hf_woww_loot = -1; static int hf_woww_loot_master = -1; static int hf_woww_loot_method = -1; static int hf_woww_loot_slot = -1; @@ -796,7 +796,6 @@ static int hf_woww_target = -1; static int hf_woww_target_error = -1; static int hf_woww_target_guid = -1; static int hf_woww_target_player = -1; -static int hf_woww_target_player_guid = -1; static int hf_woww_target_string = -1; static int hf_woww_targets = -1; static int hf_woww_taxi_mask_node_known = -1; @@ -10103,9 +10102,9 @@ add_body_fields(guint32 opcode, ptvcursor_add(ptv, hf_woww_guid, 8, ENC_LITTLE_ENDIAN); break; case CMSG_LOOT_MASTER_GIVE: - ptvcursor_add(ptv, hf_woww_loot_guid, 8, ENC_LITTLE_ENDIAN); + ptvcursor_add(ptv, hf_woww_loot, 8, ENC_LITTLE_ENDIAN); ptvcursor_add(ptv, hf_woww_slot_id, 1, ENC_LITTLE_ENDIAN); - ptvcursor_add(ptv, hf_woww_target_player_guid, 8, ENC_LITTLE_ENDIAN); + ptvcursor_add(ptv, hf_woww_player, 8, ENC_LITTLE_ENDIAN); break; case CMSG_LOOT_METHOD: ptvcursor_add(ptv, hf_woww_group_loot_setting, 4, ENC_LITTLE_ENDIAN); @@ -17885,8 +17884,8 @@ proto_register_woww(void) NULL, HFILL } }, - { &hf_woww_loot_guid, - { "Loot Guid", "woww.loot.guid", + { &hf_woww_loot, + { "Loot", "woww.loot", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL } @@ -19727,12 +19726,6 @@ proto_register_woww(void) NULL, HFILL } }, - { &hf_woww_target_player_guid, - { "Target Player Guid", "woww.target.player.guid", - FT_UINT64, BASE_HEX_DEC, NULL, 0, - NULL, HFILL - } - }, { &hf_woww_target_string, { "Target String", "woww.target.string", FT_STRINGZ, BASE_NONE, NULL, 0,