From 61c6972efa2879a5d348711d7bb3fc3e598680d2 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 28 Nov 2019 22:24:49 +0000 Subject: [PATCH] Complaints about sexual harassment now use separate voice lines git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8710 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Dialogue Control.h | 1 + Tactical/Soldier Control.cpp | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Tactical/Dialogue Control.h b/Tactical/Dialogue Control.h index d3be4891..4e98e1e9 100644 --- a/Tactical/Dialogue Control.h +++ b/Tactical/Dialogue Control.h @@ -360,6 +360,7 @@ enum AdditionalDialogEvents ADE_BANDAGE_RECEIVE_BEGIN, // someone bandages us, aData1 is the profile of person ADE_BANDAGE_RECEIVE_END, // someone finished bandaging us, aData1 is the profile of person ADE_ZOMBIESRISE, // a new wave of zombies is spawned from corpses + ADE_SEXUALHARASSMENT, // the player wants to take the 'strip' command further than we are comfortable with }; // We call this function from several places. It uses the dialogue functions, but calls a Lua script to know whether something, and what, should be said diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 0208e1be..eaa94e42 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -16168,12 +16168,9 @@ void SOLDIERTYPE::Strip() else { // if the player is an annoying little perv, tell them so, girls! - if ( this->ubBodyType == REGFEMALE ) - { - // sigh. We were hired by an idiot. - TacticalCharacterDialogue( this, QUOTE_IMPATIENT_QUOTE ); - this->aiData.bMorale = max( 0, this->aiData.bMorale - 1 ); - } + // Flugente: additional dialogue + AdditionalTacticalCharacterDialogue_CallsLua(this, ADE_SEXUALHARASSMENT ); + this->aiData.bMorale = max( 0, this->aiData.bMorale - 1 ); } }