mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- Fix: new clothes are not damaged
- Fix: changing clothes in sight of enemies no longer auto-hides - Fix: opponent refresh for captured soldiers should work now - Fix: prisons must have been liberated once to be able to send prisoners there - adjusted spy trait for new animations - Fix: allied militia no longer uncovers player spies git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -61,6 +61,7 @@
|
||||
|
||||
#include "drugs and alcohol.h"
|
||||
#include "Food.h"
|
||||
#include "opplist.h"
|
||||
#endif
|
||||
|
||||
#ifdef JA2UB
|
||||
@@ -9288,6 +9289,9 @@ BOOLEAN ApplyClothes( SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj)
|
||||
|
||||
SET_PALETTEREP_ID( pSoldier->VestPal, Clothes[clothestype].vest );
|
||||
pSoldier->bSoldierFlagMask |= SOLDIER_NEW_VEST;
|
||||
|
||||
// this vest is not damaged, so remove the damaged vest flag
|
||||
pSoldier->bSoldierFlagMask &= ~SOLDIER_DAMAGED_VEST;
|
||||
}
|
||||
|
||||
if ( newpants )
|
||||
@@ -9308,6 +9312,9 @@ BOOLEAN ApplyClothes( SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj)
|
||||
|
||||
SET_PALETTEREP_ID( pSoldier->PantsPal, Clothes[clothestype].pants );
|
||||
pSoldier->bSoldierFlagMask |= SOLDIER_NEW_PANTS;
|
||||
|
||||
// these pants are not damaged, so remove the damaged pants flag
|
||||
pSoldier->bSoldierFlagMask &= ~SOLDIER_DAMAGED_PANTS;
|
||||
}
|
||||
|
||||
// Use palette from HVOBJECT, then use substitution for pants, etc
|
||||
@@ -9349,6 +9356,9 @@ BOOLEAN ApplyClothes( SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj)
|
||||
pSoldier->bSoldierFlagMask |= SOLDIER_COVERT_CIV;
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szCovertTextStr[STR_COVERT_DISGUISED_AS_CIVILIAN], pSoldier->name );
|
||||
}
|
||||
|
||||
// reevaluate sight - otherwise we could hide by changing clothes in plain sight!
|
||||
OtherTeamsLookForMan(pSoldier);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user