- New Feature: Added possibility for CIV_TEAM (e.g: Kingpin, ...) to drop ALL their stuff (like you can do for enemies and militia) (by silversurfer)

o On/Off feature in ja2_options.ini (CIVILIANS_DROP_ALL)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-06-25 06:29:02 +00:00
parent 270766a080
commit 911e255bb0
3 changed files with 11 additions and 3 deletions
+4 -1
View File
@@ -46,6 +46,7 @@
#include "Music Control.h"
#include "Campaign Types.h"
#include "text.h" // added by Flugente
#include "Vehicles.h" // added by silversurfer
#endif
#include "Animation Control.h"
@@ -994,7 +995,9 @@ BOOLEAN TurnSoldierIntoCorpse( SOLDIERTYPE *pSoldier, BOOLEAN fRemoveMerc, BOOLE
if ( pObj->exists() == true )
{
// Check if it's supposed to be dropped
if ( !( (*pObj).fFlags & OBJECT_UNDROPPABLE ) || pSoldier->bTeam == gbPlayerNum )
// silversurfer: new option to drop items from CIV_TEAM regardless of "OBJECT_UNDROPPABLE" flag
if ( !( (*pObj).fFlags & OBJECT_UNDROPPABLE ) || pSoldier->bTeam == gbPlayerNum
|| ( gGameExternalOptions.fCiviliansDropAll && pSoldier->bTeam == CIV_TEAM && !IsVehicle(pSoldier) ))
{
// and make sure that it really is a droppable item type
// if ( !(Item[ pObj->usItem ].fFlags & ITEM_DEFAULT_UNDROPPABLE) )