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

fix: carrying corpses did not raise suspicion like it should

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-08-27 20:48:39 +00:00
parent 6a05d44d85
commit 623dcca3ed
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+16 -1
View File
@@ -14440,6 +14440,10 @@ BOOLEAN SOLDIERTYPE::LooksLikeACivilian( void )
if ( bLoop >= VESTPOCKPOS && bLoop <= CPACKPOCKPOS ) if ( bLoop >= VESTPOCKPOS && bLoop <= CPACKPOCKPOS )
continue; continue;
// seriously? a corpse? of course this is suspicious!
if ( HasItemFlag(this->inv[bLoop].usItem, CORPSE) )
return FALSE;
BOOLEAN checkfurther = FALSE; BOOLEAN checkfurther = FALSE;
// further checks it item is not covert. This means that a gun that has that tag will not be detectedif if its inside a pocket! // further checks it item is not covert. This means that a gun that has that tag will not be detectedif if its inside a pocket!
if ( bLoop == HANDPOS || bLoop == SECONDHANDPOS || bLoop == GUNSLINGPOCKPOS || bLoop == HELMETPOS || bLoop == VESTPOS || bLoop == LEGPOS || bLoop == HEAD1POS || bLoop == HEAD2POS ) if ( bLoop == HANDPOS || bLoop == SECONDHANDPOS || bLoop == GUNSLINGPOCKPOS || bLoop == HELMETPOS || bLoop == VESTPOS || bLoop == LEGPOS || bLoop == HEAD1POS || bLoop == HEAD2POS )
@@ -14519,6 +14523,17 @@ BOOLEAN SOLDIERTYPE::LooksLikeACivilian( void )
// do we look like a soldier? // do we look like a soldier?
BOOLEAN SOLDIERTYPE::LooksLikeASoldier( void ) BOOLEAN SOLDIERTYPE::LooksLikeASoldier( void )
{ {
INT8 invsize = (INT8)this->inv.size();
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop) // ... for all items in our inventory ...
{
if ( this->inv[bLoop].exists() )
{
// seriously? a corpse? of course this is suspicious!
if ( HasItemFlag(this->inv[bLoop].usItem, CORPSE) )
return FALSE;
}
}
return TRUE; return TRUE;
} }
@@ -14746,7 +14761,7 @@ BOOLEAN SOLDIERTYPE::SeemsLegit( UINT8 ubObserverID )
// if we are trying to dress like a soldier, but aren't sucessful: not covert // if we are trying to dress like a soldier, but aren't sucessful: not covert
if ( this->bSoldierFlagMask & SOLDIER_COVERT_SOLDIER && !looklikeasoldier) if ( this->bSoldierFlagMask & SOLDIER_COVERT_SOLDIER && !looklikeasoldier)
{ {
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s does not look like a soldier!", this->name ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s is carrying a corpse!", this->name );
return FALSE; return FALSE;
} }