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

sped up reload function

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-05-19 21:58:07 +00:00
parent 310fa7d57c
commit e86b24821c
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+32 -8
View File
@@ -7637,11 +7637,14 @@ void HandleTBReloadAll( void )
UINT32 invsize = pTeamSoldier->inv.size(); UINT32 invsize = pTeamSoldier->inv.size();
for (UINT32 bLoop2 = 0; bLoop2 < invsize; ++bLoop2) for (UINT32 bLoop2 = 0; bLoop2 < invsize; ++bLoop2)
{ {
if ( (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass & IC_GUN) || (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass == IC_LAUNCHER) ) if ( (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass & (IC_GUN | IC_LAUNCHER)) )
{ {
pGun = &(pTeamSoldier->inv[bLoop2]); pGun = &(pTeamSoldier->inv[bLoop2]);
UINT16 gunmagsize = GetMagSize( pGun );
//if magazine is not full //if magazine is not full
if ( (*pGun)[0]->data.gun.ubGunShotsLeft < GetMagSize( pGun ) ) if ( (*pGun)[0]->data.gun.ubGunShotsLeft < gunmagsize )
{ {
// Search for ammo in sector // Search for ammo in sector
for ( UINT32 uiLoop = 0; uiLoop < guiNumWorldItems; ++uiLoop ) for ( UINT32 uiLoop = 0; uiLoop < guiNumWorldItems; ++uiLoop )
@@ -7664,13 +7667,17 @@ void HandleTBReloadAll( void )
{ {
RemoveItemFromPool( gWorldItems[ uiLoop ].sGridNo, uiLoop, gWorldItems[ uiLoop ].ubLevel ); RemoveItemFromPool( gWorldItems[ uiLoop ].sGridNo, uiLoop, gWorldItems[ uiLoop ].ubLevel );
} }
// if gun is full, we can stop this
if ( (*pGun)[0]->data.gun.ubGunShotsLeft >= gunmagsize )
break;
} }
} }
} }
} }
} }
//CHRISL: if not enough ammo in sector, reload using ammo carried in inventory //CHRISL: if not enough ammo in sector, reload using ammo carried in inventory
if ( (*pGun)[0]->data.gun.ubGunShotsLeft < GetMagSize( pGun ) ) if ( (*pGun)[0]->data.gun.ubGunShotsLeft < gunmagsize )
{ {
AutoReload( pTeamSoldier ); AutoReload( pTeamSoldier );
} }
@@ -7766,10 +7773,14 @@ void HandleTBReloadAll( void )
} }
} }
} }
if (IsWeaponAttached(pGun, IC_GUN)) if (IsWeaponAttached(pGun, IC_GUN))
{ {
OBJECTTYPE *pGun2 = FindAttachedWeapon(pGun, IC_GUN); OBJECTTYPE *pGun2 = FindAttachedWeapon(pGun, IC_GUN);
if ( (*pGun2)[0]->data.gun.ubGunShotsLeft < GetMagSize( pGun2 ) )
UINT16 gunmagsize2 = GetMagSize( pGun2 );
if ( (*pGun2)[0]->data.gun.ubGunShotsLeft < gunmagsize2 )
{ {
// Search for ammo in sector // Search for ammo in sector
for ( UINT32 uiLoop = 0; uiLoop < guiNumWorldItems; ++uiLoop ) for ( UINT32 uiLoop = 0; uiLoop < guiNumWorldItems; ++uiLoop )
@@ -7792,13 +7803,18 @@ void HandleTBReloadAll( void )
{ {
RemoveItemFromPool( gWorldItems[ uiLoop ].sGridNo, uiLoop, gWorldItems[ uiLoop ].ubLevel ); RemoveItemFromPool( gWorldItems[ uiLoop ].sGridNo, uiLoop, gWorldItems[ uiLoop ].ubLevel );
} }
// if gun is full, we can stop this
if ( (*pGun2)[0]->data.gun.ubGunShotsLeft >= gunmagsize2 )
break;
} }
} }
} }
} }
} }
//CHRISL: if not enough ammo in sector, reload using ammo carried in inventory //CHRISL: if not enough ammo in sector, reload using ammo carried in inventory
if ( (*pGun2)[0]->data.gun.ubGunShotsLeft < GetMagSize( pGun2 ) ) if ( (*pGun2)[0]->data.gun.ubGunShotsLeft < gunmagsize2 )
{ {
AutoReload( pTeamSoldier ); AutoReload( pTeamSoldier );
} }
@@ -7818,7 +7834,7 @@ void HandleTBReloadAll( void )
{ {
if ( OK_CONTROLLABLE_MERC( pTeamSoldier ) && pTeamSoldier->bAssignment == CurrentSquad( ) && !AM_A_ROBOT( pTeamSoldier ) ) if ( OK_CONTROLLABLE_MERC( pTeamSoldier ) && pTeamSoldier->bAssignment == CurrentSquad( ) && !AM_A_ROBOT( pTeamSoldier ) )
{ {
if ( (Item[pTeamSoldier->inv[HANDPOS].usItem].usItemClass & IC_GUN) || (Item[pTeamSoldier->inv[HANDPOS].usItem].usItemClass == IC_LAUNCHER) ) if ( (Item[pTeamSoldier->inv[HANDPOS].usItem].usItemClass & (IC_GUN | IC_LAUNCHER) ) )
{ {
if ( ( gTacticalStatus.uiFlags & INCOMBAT ) ) if ( ( gTacticalStatus.uiFlags & INCOMBAT ) )
{ {
@@ -7837,11 +7853,14 @@ void HandleTBReloadAll( void )
UINT32 invsize = pTeamSoldier->inv.size(); UINT32 invsize = pTeamSoldier->inv.size();
for (UINT32 bLoop2 = 0; bLoop2 < invsize; ++bLoop2) for (UINT32 bLoop2 = 0; bLoop2 < invsize; ++bLoop2)
{ {
if ( (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass & IC_GUN) || (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass == IC_LAUNCHER) ) if ( (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass & (IC_GUN<IC_LAUNCHER)) )
{ {
pGun = &(pTeamSoldier->inv[bLoop2]); pGun = &(pTeamSoldier->inv[bLoop2]);
UINT16 gunmagsize = GetMagSize( pGun );
//if magazine is not full //if magazine is not full
if ( (*pGun)[0]->data.gun.ubGunShotsLeft < GetMagSize( pGun ) ) if ( (*pGun)[0]->data.gun.ubGunShotsLeft < gunmagsize )
{ {
// Search for ammo in soldier inventory // Search for ammo in soldier inventory
for ( UINT32 uiLoop = 0; uiLoop < invsize; ++uiLoop ) for ( UINT32 uiLoop = 0; uiLoop < invsize; ++uiLoop )
@@ -7859,6 +7878,10 @@ void HandleTBReloadAll( void )
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2; fInterfacePanelDirty = DIRTYLEVEL2;
// if gun is full, we can stop this
if ( (*pGun)[0]->data.gun.ubGunShotsLeft >= gunmagsize )
break;
} }
} }
} }
@@ -7872,6 +7895,7 @@ void HandleTBReloadAll( void )
} }
} }
} }
void HandleTBShowCover( void ) void HandleTBShowCover( void )
{ {
ToggleEnemyView(); ToggleEnemyView();