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

- Fix: if merc cannot complain about his equipment due to being asleep or on duty, retry an hour later

Browse Source 
- Fix: in AIM bios, show max life, not life at start of game
- Fix: typo resulted in AIM mercs not refusing job because of hated mercs present when they should do so
- Dialogue clarification: QUOTE_PRE_NOT_SMART is now used for complaints about food, QUOTE_POST_NOT_SMART to refuse smoking

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-01-06 01:17:45 +00:00
parent 4ab21a08c2
commit bb6872787d
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+1 -1
View File
@@ -23164,7 +23164,7 @@ BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce
if ( Item[pObj->usItem].cigarette && pSoldier->GetBackgroundValue( BG_SMOKERTYPE ) == 2 )
{
// merc gets slightly pissed by the player even suggesting this
TacticalCharacterDialogue( pSoldier, QUOTE_PRE_NOT_SMART );
TacticalCharacterDialogue( pSoldier, QUOTE_POST_NOT_SMART );
pSoldier->aiData.bMorale = max( 0, pSoldier->aiData.bMorale - 1 );
return FALSE;