o Fixed bug where +attack could trigger an infinite charge

o Fixed bug where +attack would deduct more energy for charge than +movement

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@455 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2006-05-06 21:01:20 +00:00
parent 01ead2bf70
commit bdec1fa8e1
2 changed files with 2 additions and 4 deletions

View file

@ -494,9 +494,6 @@ KeyUpForced
*/ */
void KeyUpForced (kbutton_t *b) void KeyUpForced (kbutton_t *b)
{ {
if (!(b->state & 1))
return; // still up (this should not happen)
b->state &= ~1; // now up b->state &= ~1; // now up
b->state |= 4; // impulse up b->state |= 4; // impulse up
} }

View file

@ -240,7 +240,8 @@ bool AvHMUGetEnergyCost(AvHWeaponID inWeaponID, float& outEnergyCost)
theCost = (float)BALANCE_VAR(kLeapEnergyCost); theCost = (float)BALANCE_VAR(kLeapEnergyCost);
break; break;
case AVH_ABILITY_CHARGE: case AVH_ABILITY_CHARGE:
theCost = (float)BALANCE_VAR(kChargeEnergyCost); // Charge cost deducted in pm_shared now
theCost = 0.0f; // (float)BALANCE_VAR(kChargeEnergyCost);
break; break;
} }