1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Complaints about sexual harassment now use separate voice lines

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2019-11-28 22:24:49 +00:00
parent c9025796aa
commit 61c6972efa
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.h
+1
View File
@@ -360,6 +360,7 @@ enum AdditionalDialogEvents
ADE_BANDAGE_RECEIVE_BEGIN, // someone bandages us, aData1 is the profile of person 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_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_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 // 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
Tactical/Soldier Control.cpp
+3 -6
View File
@@ -16168,12 +16168,9 @@ void SOLDIERTYPE::Strip()
else else
{ {
// if the player is an annoying little perv, tell them so, girls! // if the player is an annoying little perv, tell them so, girls!
if ( this->ubBodyType == REGFEMALE ) // Flugente: additional dialogue
{ AdditionalTacticalCharacterDialogue_CallsLua(this, ADE_SEXUALHARASSMENT );
// sigh. We were hired by an idiot. this->aiData.bMorale = max( 0, this->aiData.bMorale - 1 );
TacticalCharacterDialogue( this, QUOTE_IMPATIENT_QUOTE );
this->aiData.bMorale = max( 0, this->aiData.bMorale - 1 );
}
} }
} }