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

- Fixed EDB modifier weirdness(by Moa)

Browse Source 
- Fix: overheating modifiers on attachments weren't shown correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-18 16:17:43 +00:00
parent b643ddc7f3
commit 3fc50d46a3
5 changed files with 370 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+12 -5
View File
@@ -13953,12 +13953,10 @@ static UINT16 OldWayOfCalculatingScopeBonus(SOLDIERTYPE *pSoldier)
}
// Flugente FTW 1.2
FLOAT GetItemCooldownFactor( OBJECTTYPE * pObj )
// Flugente
FLOAT GetItemCooldownModificator( OBJECTTYPE * pObj )
{
FLOAT cooldownfactor = Item[pObj->usItem].usOverheatingCooldownFactor; // ... get item-specific cooldown factor ...
FLOAT modificator = 1.0;
FLOAT modificator = Item[pObj->usItem].overheatCooldownModificator;
if ( pObj->exists() == true )
{
@@ -13972,6 +13970,15 @@ FLOAT GetItemCooldownFactor( OBJECTTYPE * pObj )
}
}
return modificator;
}
FLOAT GetItemCooldownFactor( OBJECTTYPE * pObj )
{
FLOAT cooldownfactor = Item[pObj->usItem].usOverheatingCooldownFactor; // ... get item-specific cooldown factor ...
FLOAT modificator = 1.0f + GetItemCooldownModificator( pObj );
cooldownfactor *= modificator;
return cooldownfactor;