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

Dismissing vehicle will drop items in its inventory in current sector without asking.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2022-01-14 22:58:32 +00:00
parent 67f62736ed
commit 7c40f27359
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+8 -1
View File
@@ -12694,12 +12694,19 @@ void BeginRemoveMercFromContract( SOLDIERTYPE *pSoldier )
return; return;
} }
#endif #endif
//shadooow: it makes no sense, but if someone wants to dismiss vehicle then do not popup the department box and drop its items in current sector without asking
if (pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE)
{
StrategicRemoveMerc(pSoldier);
HandleLeavingOfEquipmentInCurrentSector(pSoldier->ubID);
return;
}
// WANNE: Nothing to do here, when we want to dismiss the robot // WANNE: Nothing to do here, when we want to dismiss the robot
BOOLEAN fAmIaRobot = AM_A_ROBOT( pSoldier ); BOOLEAN fAmIaRobot = AM_A_ROBOT( pSoldier );
// Flugente: If merc is unconscious, just fire him anyway (if talking stuff is called, this leads to a geme lock) // Flugente: If merc is unconscious, just fire him anyway (if talking stuff is called, this leads to a geme lock)
if (!fAmIaRobot && pSoldier->stats.bLife > CONSCIOUSNESS ) if (!fAmIaRobot && pSoldier->stats.bLife > CONSCIOUSNESS )
{ {
if( ( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__MERC ) || ( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__NPC ) ) if( ( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__MERC ) || ( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__NPC ) )
{ {