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

Radio Operators can now use their skills while using Old Inventory.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-01-17 21:02:22 +00:00
parent fd1ecb2edf
commit 3f7bbdc423
2 changed files with 42 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+40 -94
View File
@@ -15113,8 +15113,8 @@ BOOLEAN SOLDIERTYPE::IsFeedingExternal( UINT8* pubId1, UINT16* pGunSlot1, UINT1
return(isFeeding); return(isFeeding);
} }
// Flugente: return a cleaning kit from our inventory // Flugente: return first found object with a specific flag from our inventory
OBJECTTYPE* SOLDIERTYPE::GetCleaningKit( ) OBJECTTYPE* SOLDIERTYPE::GetObjectWithFlag( UINT32 aFlag )
{ {
OBJECTTYPE* pObj = NULL; OBJECTTYPE* pObj = NULL;
@@ -15123,7 +15123,7 @@ OBJECTTYPE* SOLDIERTYPE::GetCleaningKit( )
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop ) // ... for all items in our inventory ... for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop ) // ... for all items in our inventory ...
{ {
// ... if Item exists and is canteen (that can have drink points) ... // ... if Item exists and is canteen (that can have drink points) ...
if ( inv[bLoop].exists( ) == true && HasItemFlag( inv[bLoop].usItem, CLEANING_KIT ) ) if ( inv[bLoop].exists( ) == true && HasItemFlag( inv[bLoop].usItem, aFlag ) )
{ {
pObj = &(inv[bLoop]); // ... get pointer for this item ... pObj = &(inv[bLoop]); // ... get pointer for this item ...
@@ -15146,7 +15146,7 @@ void SOLDIERTYPE::CleanWeapon( BOOLEAN fCleanAll )
return; return;
} }
OBJECTTYPE* pCleaningKit = GetCleaningKit( ); OBJECTTYPE* pCleaningKit = GetObjectWithFlag( CLEANING_KIT );
if ( pCleaningKit ) if ( pCleaningKit )
{ {
@@ -15165,7 +15165,7 @@ void SOLDIERTYPE::CleanWeapon( BOOLEAN fCleanAll )
if ( (*pObj)[i]->data.bDirtLevel > DIRT_MIN_TO_CLEAN ) // ... if weapon is at least a bit dirty ... if ( (*pObj)[i]->data.bDirtLevel > DIRT_MIN_TO_CLEAN ) // ... if weapon is at least a bit dirty ...
{ {
// have to recheck for a cleaning kit, as we might have used it up if cleaning a stack of weapons // have to recheck for a cleaning kit, as we might have used it up if cleaning a stack of weapons
pCleaningKit = GetCleaningKit( ); pCleaningKit = GetObjectWithFlag( CLEANING_KIT );
if ( pCleaningKit ) if ( pCleaningKit )
{ {
@@ -17603,10 +17603,6 @@ STR16 SOLDIERTYPE::PrintSkillDesc( INT8 iSkill )
BOOLEAN SOLDIERTYPE::CanUseRadio( BOOLEAN fCheckForAP ) BOOLEAN SOLDIERTYPE::CanUseRadio( BOOLEAN fCheckForAP )
{ {
// new inventory system required, as the radio set has to be in a specific slot
if ( !UsingNewInventorySystem( ) )
return FALSE;
// only radio operators can use this equipment // only radio operators can use this equipment
if ( !NUM_SKILL_TRAITS( this, RADIO_OPERATOR_NT ) ) if ( !NUM_SKILL_TRAITS( this, RADIO_OPERATOR_NT ) )
return FALSE; return FALSE;
@@ -17615,57 +17611,28 @@ BOOLEAN SOLDIERTYPE::CanUseRadio( BOOLEAN fCheckForAP )
if ( fCheckForAP && !EnoughPoints( this, APBPConstants[AP_RADIO], 0, FALSE ) ) if ( fCheckForAP && !EnoughPoints( this, APBPConstants[AP_RADIO], 0, FALSE ) )
return FALSE; return FALSE;
// only player mercs use new inventory system // if we use the new inventory system and we are a player character, the radio set has to be in a specific slot
if ( this->bTeam == OUR_TEAM ) OBJECTTYPE* pObj = NULL;
{ if ( this->bTeam == OUR_TEAM && UsingNewInventorySystem() )
OBJECTTYPE* pObj = &(inv[CPACKPOCKPOS]); pObj = &(inv[CPACKPOCKPOS]);
if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) )
{
//search power pack
attachmentList::iterator iterend = (*pObj)[0]->attachments.end( );
for ( attachmentList::iterator iter = (*pObj)[0]->attachments.begin( ); iter != iterend; ++iter )
{
// do we have a power pack on our armor?
if ( iter->exists( ) && HasItemFlag( iter->usItem, POWER_PACK ) )
{
// Hack (or clever use of unused memory, depending on your view):
// data.bTemperature has to exist on all items, as it is used on weapons and certain attachments (barrels)
// It isn't used on armor... that's why we can use it now. The idea is that the temperature of the power pack represents its available energy.
// The cooling down represents its energy depleting.
if ( (*iter)[0]->data.bTemperature > 0.0f )
return(TRUE);
}
}
}
}
else else
{ pObj = GetObjectWithFlag( RADIO_SET );
INT8 invsize = (INT8)inv.size( ); // remember inventorysize, so we don't call size() repeatedly
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
{
if ( inv[bLoop].exists( ) )
{
OBJECTTYPE* pObj = &(inv[bLoop]);
if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) ) if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) )
{ {
//search power pack //search power pack
attachmentList::iterator iterend = (*pObj)[0]->attachments.end( ); attachmentList::iterator iterend = (*pObj)[0]->attachments.end( );
for ( attachmentList::iterator iter = (*pObj)[0]->attachments.begin( ); iter != iterend; ++iter ) for ( attachmentList::iterator iter = (*pObj)[0]->attachments.begin( ); iter != iterend; ++iter )
{ {
// do we have a power pack on our armor? // do we have a power pack?
if ( iter->exists( ) && HasItemFlag( iter->usItem, POWER_PACK ) ) if ( iter->exists( ) && HasItemFlag( iter->usItem, POWER_PACK ) )
{ {
// Hack (or clever use of unused memory, depending on your view): // Hack (or clever use of unused memory, depending on your view):
// data.bTemperature has to exist on all items, as it is used on weapons and certain attachments (barrels) // data.bTemperature has to exist on all items, as it is used on weapons and certain attachments (barrels)
// It isn't used on armor... that's why we can use it now. The idea is that the temperature of the power pack represents its available energy. // It isn't used on armor... that's why we can use it now. The idea is that the temperature of the power pack represents its available energy.
// The cooling down represents its energy depleting. // The cooling down represents its energy depleting.
if ( (*iter)[0]->data.bTemperature > 0.0f ) if ( (*iter)[0]->data.bTemperature > 0.0f )
return(TRUE); return(TRUE);
}
}
}
} }
} }
} }
@@ -17677,42 +17644,17 @@ BOOLEAN SOLDIERTYPE::UseRadio( )
{ {
BOOLEAN success = FALSE; BOOLEAN success = FALSE;
// new inventory system required, as the radio set has to be in a specific slot OBJECTTYPE* pObj = NULL;
if ( UsingNewInventorySystem( ) ) if ( this->bTeam == OUR_TEAM && UsingNewInventorySystem( ) )
pObj = &(inv[CPACKPOCKPOS]);
else
pObj = GetObjectWithFlag( RADIO_SET );
if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) )
{ {
// only player mercs use new inventory system // status % chance of success
if ( this->bTeam == OUR_TEAM ) if ( Chance( (*pObj)[0]->data.objectStatus ) )
{ success = TRUE;
// check for fail depending on status of radio set
OBJECTTYPE* pObj = &(inv[CPACKPOCKPOS]);
if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) )
{
// status % chance of success
if ( Chance( (*pObj)[0]->data.objectStatus ) )
success = TRUE;
}
}
else
{
INT8 invsize = (INT8)inv.size( ); // remember inventorysize, so we don't call size() repeatedly
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
{
if ( inv[bLoop].exists( ) )
{
OBJECTTYPE* pObj = &(inv[bLoop]);
if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) )
{
// status % chance of success
if ( Chance( (*pObj)[0]->data.objectStatus ) )
success = TRUE;
break;
}
}
}
}
} }
// even if we fail, we still use up AP, use animation an use up batteries // even if we fail, we still use up AP, use animation an use up batteries
@@ -18443,7 +18385,11 @@ void SOLDIERTYPE::DepleteActiveRadioSetEnergy( BOOLEAN fActivation, BOOLEAN fAss
// nothing to do here.. // nothing to do here..
return; return;
OBJECTTYPE* pObj = &(inv[CPACKPOCKPOS]); OBJECTTYPE* pObj = NULL;
if ( this->bTeam == OUR_TEAM && UsingNewInventorySystem( ) )
pObj = &(inv[CPACKPOCKPOS]);
else
pObj = GetObjectWithFlag( RADIO_SET );
if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) ) if ( pObj && HasItemFlag( pObj->usItem, RADIO_SET ) )
{ {
Tactical/Soldier Control.h
+2 -2
View File
@@ -1730,8 +1730,8 @@ public:
// Flugente: do we currently provide ammo (pAmmoSlot) for someone else's (pubId) gun (pGunSlot)? // Flugente: do we currently provide ammo (pAmmoSlot) for someone else's (pubId) gun (pGunSlot)?
BOOLEAN IsFeedingExternal(UINT8* pubId1, UINT16* pGunSlot1, UINT16* pAmmoSlot1, UINT8* pubId2, UINT16* pGunSlot2, UINT16* pAmmoSlot2); BOOLEAN IsFeedingExternal(UINT8* pubId1, UINT16* pGunSlot1, UINT16* pAmmoSlot1, UINT8* pubId2, UINT16* pGunSlot2, UINT16* pAmmoSlot2);
// Flugente: return a cleaning kit from our inventory // Flugente: return first found object with a specific flag from our inventory
OBJECTTYPE* GetCleaningKit(); OBJECTTYPE* GetObjectWithFlag( UINT32 aFlag );
// use cleaning kits to clean weapons in inventory. fCleanAll = TRUE: clean all weapons found, otherwise just the first one // use cleaning kits to clean weapons in inventory. fCleanAll = TRUE: clean all weapons found, otherwise just the first one
void CleanWeapon( BOOLEAN fCleanAll ); void CleanWeapon( BOOLEAN fCleanAll );