From e741a3a4eb8cc617ac9d53c3f54dfe5b439c29a5 Mon Sep 17 00:00:00 2001 From: Ramza13 <52087122+Ramza13@users.noreply.github.com> Date: Fri, 1 Oct 2021 16:51:19 -0400 Subject: [PATCH] Update monexamine.cpp --- src/monexamine.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/monexamine.cpp b/src/monexamine.cpp index b70fce8f2b5c4..d5d28db7cf720 100644 --- a/src/monexamine.cpp +++ b/src/monexamine.cpp @@ -571,7 +571,8 @@ bool monexamine::pet_menu( monster &z ) remove_bat, insert_bat, check_bat, - attack + attack, + talk_to }; uilist amenu; @@ -665,6 +666,9 @@ bool monexamine::pet_menu( monster &z ) if( z.has_flag( MF_PAY_BOT ) ) { amenu.addentry( pay, true, 'f', _( "Manage your friendship with %s" ), pet_name ); } + if( !z.type->chat_topics.empty() ) { + amenu.addentry( talk_to, true, 'c', _( "Talk to %s" ), pet_name ); + } if( !z.has_flag( MF_RIDEABLE_MECH ) ) { if( z.has_flag( MF_PET_MOUNTABLE ) && player_character.can_mount( z ) ) { amenu.addentry( mount, true, 'r', _( "Mount %s" ), pet_name ); @@ -792,6 +796,9 @@ bool monexamine::pet_menu( monster &z ) get_player_character().melee_attack( z, true ); } break; + case talk_to: + get_avatar().talk_to( get_talker_for( z ) ); + break; default: break; }